From 85a4d017f02e30bb97c14be8d52d672562b8a387 Mon Sep 17 00:00:00 2001 From: mamingshuai Date: Thu, 11 Mar 2021 18:40:44 +0800 Subject: [PATCH] update openharmony 1.0.1 --- .clang-format | 2 +- .gitignore | 2 +- BUILD.gn | 222 -- README.md | 66 + README_zh.md | 65 + ace_lite.gni | 191 ++ .../calculator/src/main/js/default/app.js | 8 - .../pages/component/canvas/canvas1/index.hml | 34 - .../pages/component/canvas/canvas2/index.hml | 34 - .../pages/component/canvas/canvas3/index.hml | 33 - .../pages/component/canvas/canvas5/index.hml | 31 - .../pages/component/canvas/canvas7/index.hml | 44 - .../pages/component/canvas/canvas8/index.hml | 37 - .../component/canvas/indexAPIAttr/index.hml | 63 - .../component/canvas/indexAPIDraw/index.hml | 53 - .../component/canvas/indexAttr/index.hml | 49 - .../canvas/indexCommonStyle/index.hml | 71 - .../component/canvas/indexEvent/index.hml | 37 - .../component/list/list/list13/list13.hml | 34 - .../pages/component/stack/stack2/stack2.hml | 35 - figures/JS应用开发框架.png | Bin 0 -> 82025 bytes figures/framework-architecture.png | Bin 0 -> 160373 bytes frameworks/BUILD.gn | 87 + CMakeLists.txt => frameworks/CMakeLists.txt | 23 +- .../examples}/airquality/src/main/config.json | 1 - .../airquality/src/main/js/default/app.js | 0 .../src/main/js/default/common/cloud.png | Bin .../main/js/default/common/cloud_green.png | Bin .../src/main/js/default/common/cloud_red.png | Bin .../main/js/default/common/cloud_yellow.png | Bin .../src/main/js/default/common/week.png | Bin .../src/main/js/default/i18n/en-US.json | 0 .../src/main/js/default/i18n/zh-CN.json | 0 .../main/js/default/pages/detail/detail.css | 0 .../main/js/default/pages/detail/detail.hml | 4 +- .../main/js/default/pages/detail/detail.js | 4 +- .../main/js/default/pages/history/history.css | 0 .../main/js/default/pages/history/history.hml | 0 .../main/js/default/pages/history/history.js | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../examples}/alarm/src/main/config.json | 0 .../alarm/src/main/js/default/app.js | 0 .../src/main/js/default/common/A016_017.png | Bin .../src/main/js/default/common/A016_018.png | Bin .../src/main/js/default/common/A016_019.png | Bin .../src/main/js/default/common/A016_020.png | Bin .../src/main/js/default/common/A016_021.png | Bin .../src/main/js/default/common/add_alarm.png | Bin .../src/main/js/default/common/alarmClock.png | Bin .../alarm/src/main/js/default/common/back.png | Bin .../src/main/js/default/common/cancel.png | Bin .../js/default/common/ic_clock_btn_off.png | Bin .../js/default/common/ic_clock_btn_on.png | Bin .../src/main/js/default/common/jiantou.png | Bin .../src/main/js/default/common/postpone.png | Bin .../js/default/pages/editAlarm/edit_alarm.css | 0 .../js/default/pages/editAlarm/edit_alarm.hml | 0 .../js/default/pages/editAlarm/edit_alarm.js | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 10 +- .../default/pages/timeArrive/time_arrive.css | 0 .../default/pages/timeArrive/time_arrive.hml | 0 .../default/pages/timeArrive/time_arrive.js | 0 .../src/main/resources/base/media/icon.png | Bin .../main/resources/base/media/icon_small.png | Bin .../calculator/src/main/js/default/app.js | 22 + .../src/main/js/default/common/calculator.js | 14 + .../src/main/js/default/common/ic_back.png | Bin .../main/js/default/common/ic_cal_delete.png | Bin .../main/js/default/common/ic_cal_devide.png | Bin .../main/js/default/common/ic_cal_equal.png | Bin .../main/js/default/common/ic_cal_minus.png | Bin .../js/default/common/ic_cal_multiply.png | Bin .../main/js/default/common/ic_cal_plus.png | Bin .../src/main/js/default/pages/index/index.css | 14 + .../src/main/js/default/pages/index/index.hml | 15 + .../src/main/js/default/pages/index/index.js | 14 + .../examples}/music/src/main/config.json | 1 - .../music/src/main/js/default/app.js | 0 .../src/main/js/default/common/ic_back.png | Bin .../main/js/default/common/ic_music_list.png | Bin .../js/default/common/ic_music_listcycle.png | Bin .../js/default/common/ic_music_listorder.png | Bin .../main/js/default/common/ic_music_mode.png | Bin .../main/js/default/common/ic_music_next.png | Bin .../main/js/default/common/ic_music_pause.png | Bin .../main/js/default/common/ic_music_play.png | Bin .../js/default/common/ic_music_previous.png | Bin .../js/default/common/ic_music_shuffle.png | Bin .../default/common/ic_music_singlecycle.png | Bin .../src/main/js/default/pages/index/index.css | 2 +- .../src/main/js/default/pages/index/index.hml | 4 +- .../src/main/js/default/pages/index/index.js | 9 +- .../src/main/resources/base/media/icon.png | Bin .../main/resources/base/media/icon_small.png | Bin .../examples}/showcase/src/main/config.json | 2 +- .../showcase/src/main/js/default/app.js | 0 .../src/main/js/default/common/js/chart.js | 0 .../src/main/js/default/common/js/general.js | 0 .../src/main/js/default/common/js/image.js | 0 .../src/main/js/default/common/js/input.js | 0 .../src/main/js/default/common/js/list.js | 0 .../src/main/js/default/common/js/marquee.js | 0 .../main/js/default/common/js/picker_view.js | 0 .../src/main/js/default/common/js/progress.js | 0 .../src/main/js/default/common/js/stack.js | 0 .../src/main/js/default/common/js/swiper.js | 0 .../src/main/js/default/common/js/text.js | 0 .../src/main/js/default/common/leftHead.png | Bin .../animation/animation1/animation1.css | 0 .../animation/animation1/animation1.hml | 0 .../animation/animation1/animation1.js | 0 .../animation/animation2/animation2.css | 0 .../animation/animation2/animation2.hml | 0 .../animation/animation2/animation2.js | 0 .../animation/animation3/animation3.css | 0 .../animation/animation3/animation3.hml | 0 .../animation/animation3/animation3.js | 0 .../animation/animation4/animation4.css | 0 .../animation/animation4/animation4.hml | 0 .../animation/animation4/animation4.js | 0 .../animation/animation5/animation5.css | 0 .../animation/animation5/animation5.hml | 0 .../animation/animation5/animation5.js | 0 .../animation/animation6/animation6.css | 0 .../animation/animation6/animation6.hml | 0 .../animation/animation6/animation6.js | 0 .../animation/animation7/animation7.css | 0 .../animation/animation7/animation7.hml | 0 .../animation/animation7/animation7.js | 0 .../pages/component/animation/index/index.css | 0 .../pages/component/animation/index/index.hml | 0 .../pages/component/animation/index/index.js | 0 .../component/animation/index1/index.css | 0 .../component/animation/index1/index.hml | 0 .../pages/component/animation/index1/index.js | 0 .../component/animation/index2/index.css | 0 .../component/animation/index2/index.hml | 0 .../pages/component/animation/index2/index.js | 0 .../pages/component/canvas/canvas1/index.css | 2 +- .../pages/component/canvas/canvas1/index.hml | 34 + .../pages/component/canvas/canvas1/index.js | 0 .../pages/component/canvas/canvas2}/index.css | 2 +- .../pages/component/canvas/canvas2/index.hml | 34 + .../pages/component/canvas/canvas2/index.js | 0 .../pages/component/canvas/canvas3}/index.css | 2 +- .../pages/component/canvas/canvas3/index.hml | 33 + .../pages/component/canvas/canvas3/index.js | 0 .../pages/component/canvas/canvas4/index.css | 4 +- .../pages/component/canvas/canvas4/index.hml | 14 +- .../pages/component/canvas/canvas4/index.js | 0 .../pages/component/canvas/canvas5/index.css | 2 +- .../pages/component/canvas/canvas5/index.hml | 31 + .../pages/component/canvas/canvas5/index.js | 0 .../pages/component/canvas/canvas6/index.css | 2 +- .../pages/component/canvas/canvas6/index.hml | 24 +- .../pages/component/canvas/canvas6/index.js | 0 .../pages/component/canvas/canvas7/index.css | 2 +- .../pages/component/canvas/canvas7/index.hml | 44 + .../pages/component/canvas/canvas7/index.js | 0 .../pages/component/canvas/canvas8/index.css | 2 +- .../pages/component/canvas/canvas8/index.hml | 37 + .../pages/component/canvas/canvas8/index.js | 0 .../pages/component/canvas/canvas9/index.css | 4 +- .../pages/component/canvas/canvas9/index.hml | 14 +- .../pages/component/canvas/canvas9/index.js | 0 .../pages/component/canvas/index/index.css | 0 .../pages/component/canvas/index/index.hml | 12 +- .../pages/component/canvas/index/index.js | 0 .../pages/component/canvas/indexAPI/index.css | 0 .../pages/component/canvas/indexAPI/index.hml | 12 +- .../pages/component/canvas/indexAPI/index.js | 0 .../component/canvas/indexAPIAttr/index.css | 0 .../component/canvas/indexAPIAttr/index.hml | 63 + .../component/canvas/indexAPIAttr/index.js | 0 .../component/canvas/indexAPIDraw/index.css | 0 .../component/canvas/indexAPIDraw/index.hml | 53 + .../component/canvas/indexAPIDraw/index.js | 0 .../component/canvas/indexAttr/index.css | 0 .../component/canvas/indexAttr/index.hml | 49 + .../pages/component/canvas/indexAttr/index.js | 0 .../canvas/indexCommonStyle/index.css | 0 .../canvas/indexCommonStyle/index.hml | 71 + .../canvas/indexCommonStyle/index.js | 0 .../component/canvas/indexEvent/index.css | 0 .../component/canvas/indexEvent/index.hml | 37 + .../component/canvas/indexEvent/index.js | 0 .../chart/barChart/barChart1/barChart1.css | 0 .../chart/barChart/barChart1/barChart1.hml | 0 .../chart/barChart/barChart1/barChart1.js | 0 .../chart/barChart/barChart2/barChart2.css | 2 - .../chart/barChart/barChart2/barChart2.hml | 4 +- .../chart/barChart/barChart2/barChart2.js | 0 .../chart/barChart/barChart3/barChart3.css | 0 .../chart/barChart/barChart3/barChart3.hml | 0 .../chart/barChart/barChart3/barChart3.js | 0 .../chart/barChart/barChart4/barChart4.css | 0 .../chart/barChart/barChart4/barChart4.hml | 0 .../chart/barChart/barChart4/barChart4.js | 0 .../chart/barChart/barChart5/barChart5.css | 0 .../chart/barChart/barChart5/barChart5.hml | 0 .../chart/barChart/barChart5/barChart5.js | 0 .../chart/barChart/barChart6/barChart6.css | 0 .../chart/barChart/barChart6/barChart6.hml | 0 .../chart/barChart/barChart6/barChart6.js | 0 .../chart/barChart/barChart7/barChart7.css | 0 .../chart/barChart/barChart7/barChart7.hml | 0 .../chart/barChart/barChart7/barChart7.js | 0 .../chart/barChart/barChart8/barChart8.css | 0 .../chart/barChart/barChart8/barChart8.hml | 0 .../chart/barChart/barChart8/barChart8.js | 0 .../component/chart/barChart/index/index.css | 0 .../component/chart/barChart/index/index.hml | 0 .../component/chart/barChart/index/index.js | 0 .../chart/barChart/indexAttr/index.css | 0 .../chart/barChart/indexAttr/index.hml | 0 .../chart/barChart/indexAttr/index.js | 0 .../chart/barChart/indexEvent/index.css | 0 .../chart/barChart/indexEvent/index.hml | 0 .../chart/barChart/indexEvent/index.js | 0 .../chart/barChart/indexStyle/index.css | 0 .../chart/barChart/indexStyle/index.hml | 0 .../chart/barChart/indexStyle/index.js | 0 .../pages/component/chart/index/index.css | 0 .../pages/component/chart/index/index.hml | 0 .../pages/component/chart/index/index.js | 0 .../component/chart/lineChart/index/index.css | 0 .../component/chart/lineChart/index/index.hml | 0 .../component/chart/lineChart/index/index.js | 0 .../chart/lineChart/indexAttr/index.css | 0 .../chart/lineChart/indexAttr/index.hml | 0 .../chart/lineChart/indexAttr/index.js | 0 .../chart/lineChart/indexEvent/index.css | 0 .../chart/lineChart/indexEvent/index.hml | 0 .../chart/lineChart/indexEvent/index.js | 0 .../chart/lineChart/indexStyle/index.css | 0 .../chart/lineChart/indexStyle/index.hml | 0 .../chart/lineChart/indexStyle/index.js | 0 .../chart/lineChart/lineChart1/lineChart1.css | 0 .../chart/lineChart/lineChart1/lineChart1.hml | 0 .../chart/lineChart/lineChart1/lineChart1.js | 0 .../chart/lineChart/lineChart2/lineChart2.css | 2 - .../chart/lineChart/lineChart2/lineChart2.hml | 6 +- .../chart/lineChart/lineChart2/lineChart2.js | 0 .../chart/lineChart/lineChart3/lineChart3.css | 0 .../chart/lineChart/lineChart3/lineChart3.hml | 0 .../chart/lineChart/lineChart3/lineChart3.js | 0 .../chart/lineChart/lineChart4/lineChart4.css | 0 .../chart/lineChart/lineChart4/lineChart4.hml | 0 .../chart/lineChart/lineChart4/lineChart4.js | 0 .../chart/lineChart/lineChart5/lineChart5.css | 0 .../chart/lineChart/lineChart5/lineChart5.hml | 0 .../chart/lineChart/lineChart5/lineChart5.js | 0 .../chart/lineChart/lineChart6/lineChart6.css | 0 .../chart/lineChart/lineChart6/lineChart6.hml | 0 .../chart/lineChart/lineChart6/lineChart6.js | 0 .../chart/lineChart/lineChart7/lineChart7.css | 0 .../chart/lineChart/lineChart7/lineChart7.hml | 0 .../chart/lineChart/lineChart7/lineChart7.js | 0 .../chart/lineChart/lineChart8/lineChart8.css | 0 .../chart/lineChart/lineChart8/lineChart8.hml | 0 .../chart/lineChart/lineChart8/lineChart8.js | 0 .../default/pages/component/div/div1/div1.css | 0 .../default/pages/component/div/div1/div1.hml | 0 .../default/pages/component/div/div1/div1.js | 0 .../pages/component/div/div10/div10.css | 0 .../pages/component/div/div10/div10.hml | 0 .../pages/component/div/div10/div10.js | 0 .../pages/component/div/div11/div11.css | 0 .../pages/component/div/div11/div11.hml | 0 .../pages/component/div/div11/div11.js | 0 .../pages/component/div/div12/div12.css | 0 .../pages/component/div/div12/div12.hml | 0 .../pages/component/div/div12/div12.js | 0 .../default/pages/component/div/div2/div2.css | 2 - .../default/pages/component/div/div2/div2.hml | 0 .../default/pages/component/div/div2/div2.js | 0 .../default/pages/component/div/div3/div3.css | 0 .../default/pages/component/div/div3/div3.hml | 0 .../default/pages/component/div/div3/div3.js | 0 .../default/pages/component/div/div4/div4.css | 0 .../default/pages/component/div/div4/div4.hml | 0 .../default/pages/component/div/div4/div4.js | 0 .../default/pages/component/div/div5/div5.css | 0 .../default/pages/component/div/div5/div5.hml | 0 .../default/pages/component/div/div5/div5.js | 0 .../default/pages/component/div/div6/div6.css | 0 .../default/pages/component/div/div6/div6.hml | 0 .../default/pages/component/div/div6/div6.js | 0 .../default/pages/component/div/div7/div7.css | 0 .../default/pages/component/div/div7/div7.hml | 0 .../default/pages/component/div/div7/div7.js | 0 .../default/pages/component/div/div8/div8.css | 0 .../default/pages/component/div/div8/div8.hml | 0 .../default/pages/component/div/div8/div8.js | 0 .../default/pages/component/div/div9/div9.css | 0 .../default/pages/component/div/div9/div9.hml | 0 .../default/pages/component/div/div9/div9.js | 0 .../pages/component/div/index/index.css | 0 .../pages/component/div/index/index.hml | 0 .../pages/component/div/index/index.js | 0 .../pages/component/div/indexAttr/index.css | 0 .../pages/component/div/indexAttr/index.hml | 0 .../pages/component/div/indexAttr/index.js | 0 .../component/div/indexCommonStyle/index.css | 0 .../component/div/indexCommonStyle/index.hml | 0 .../component/div/indexCommonStyle/index.js | 0 .../pages/component/div/indexEvent/index.css | 0 .../pages/component/div/indexEvent/index.hml | 0 .../pages/component/div/indexEvent/index.js | 0 .../component/div/indexSpecStyle/index.css | 0 .../component/div/indexSpecStyle/index.hml | 0 .../component/div/indexSpecStyle/index.js | 0 .../pages/component/image/image1/image1.css | 0 .../pages/component/image/image1/image1.hml | 4 +- .../pages/component/image/image1/image1.js | 0 .../pages/component/image/image2/image2.css | 0 .../pages/component/image/image2/image2.hml | 0 .../pages/component/image/image2/image2.js | 0 .../pages/component/image/image3/image3.css | 2 - .../pages/component/image/image3/image3.hml | 6 +- .../pages/component/image/image3/image3.js | 0 .../pages/component/image/image4/image4.css | 0 .../pages/component/image/image4/image4.hml | 0 .../pages/component/image/image4/image4.js | 0 .../pages/component/image/image5/image5.css | 0 .../pages/component/image/image5/image5.hml | 0 .../pages/component/image/image5/image5.js | 0 .../pages/component/image/image6/image6.css | 0 .../pages/component/image/image6/image6.hml | 0 .../pages/component/image/image6/image6.js | 0 .../pages/component/image/image7/image7.css | 0 .../pages/component/image/image7/image7.hml | 0 .../pages/component/image/image7/image7.js | 0 .../pages/component/image/image8/image8.css | 0 .../pages/component/image/image8/image8.hml | 0 .../pages/component/image/image8/image8.js | 0 .../pages/component/image/index/index.css | 0 .../pages/component/image/index/index.hml | 0 .../pages/component/image/index/index.js | 0 .../pages/component/image/indexAttr/index.css | 0 .../pages/component/image/indexAttr/index.hml | 0 .../pages/component/image/indexAttr/index.js | 0 .../component/image/indexEvent/index.css | 0 .../component/image/indexEvent/index.hml | 0 .../pages/component/image/indexEvent/index.js | 0 .../component/image/indexStyle/index.css | 0 .../component/image/indexStyle/index.hml | 0 .../pages/component/image/indexStyle/index.js | 0 .../pages/component/index/baseIndex/index.css | 0 .../pages/component/index/baseIndex/index.hml | 0 .../pages/component/index/baseIndex/index.js | 0 .../component/index/containerIndex/index.css | 0 .../component/index/containerIndex/index.hml | 0 .../component/index/containerIndex/index.js | 0 .../pages/component/index/formIndex/index.css | 0 .../pages/component/index/formIndex/index.hml | 0 .../pages/component/index/formIndex/index.js | 0 .../component/index/otherIndex/index.css | 0 .../component/index/otherIndex/index.hml | 0 .../pages/component/index/otherIndex/index.js | 0 .../component/input/button/attr/attr.css | 9 +- .../component/input/button/attr/attr.hml | 0 .../pages/component/input/button/attr/attr.js | 0 .../component/input/button/event/event.css | 6 - .../component/input/button/event/event.hml | 0 .../component/input/button/event/event.js | 0 .../component/input/button/index/index.css | 0 .../component/input/button/index/index.hml | 0 .../component/input/button/index/index.js | 0 .../component/input/button/style/style.css | 0 .../component/input/button/style/style.hml | 2 +- .../component/input/button/style/style.js | 0 .../component/input/checkbox/attr/attr.css | 6 - .../component/input/checkbox/attr/attr.hml | 0 .../component/input/checkbox/attr/attr.js | 0 .../component/input/checkbox/event/event.css | 14 - .../component/input/checkbox/event/event.hml | 0 .../component/input/checkbox/event/event.js | 0 .../component/input/checkbox/index/index.css | 0 .../component/input/checkbox/index/index.hml | 0 .../component/input/checkbox/index/index.js | 0 .../component/input/checkbox}/style/style.css | 4 - .../component/input/checkbox/style/style.hml | 0 .../component/input/checkbox/style/style.js | 0 .../pages/component/input/index/index.css | 0 .../pages/component/input/index/index.hml | 0 .../pages/component/input/index/index.js | 0 .../pages/component/input/radio/attr/attr.css | 6 - .../pages/component/input/radio/attr/attr.hml | 0 .../pages/component/input/radio/attr/attr.js | 0 .../component/input/radio/event/event.css | 14 - .../component/input/radio/event/event.hml | 0 .../component/input/radio/event/event.js | 0 .../component/input/radio/index/index.css | 0 .../component/input/radio/index/index.hml | 0 .../component/input/radio/index/index.js | 0 .../component/input/radio}/style/style.css | 10 - .../component/input/radio/style/style.hml | 0 .../component/input/radio/style/style.js | 0 .../pages/component/list/index/index.css | 0 .../pages/component/list/index/index.hml | 0 .../pages/component/list/index/index.js | 0 .../component/list/list-item/index/index.css | 0 .../component/list/list-item/index/index.hml | 0 .../component/list/list-item/index/index.js | 0 .../list/list-item/indexAttr/index.css | 0 .../list/list-item/indexAttr/index.hml | 0 .../list/list-item/indexAttr/index.js | 0 .../list/list-item/indexCommonStyle/index.css | 0 .../list/list-item/indexCommonStyle/index.hml | 0 .../list/list-item/indexCommonStyle/index.js | 0 .../list/list-item/indexEvent/index.css | 0 .../list/list-item/indexEvent/index.hml | 0 .../list/list-item/indexEvent/index.js | 0 .../component/list/list-item/item1/item1.css | 2 - .../component/list/list-item/item1/item1.hml | 0 .../component/list/list-item/item1/item1.js | 0 .../list/list-item/item11/item11.css | 0 .../list/list-item/item11/item11.hml | 2 +- .../component/list/list-item/item11/item11.js | 0 .../list/list-item/item12/item12.css | 0 .../list/list-item/item12/item12.hml | 2 +- .../component/list/list-item/item12/item12.js | 0 .../component/list/list-item/item3/item3.css | 2 - .../component/list/list-item/item3/item3.hml | 0 .../component/list/list-item/item3/item3.js | 0 .../component/list/list-item/item5/item5.css | 0 .../component/list/list-item/item5/item5.hml | 0 .../component/list/list-item/item5/item5.js | 0 .../component/list/list-item/item8/item8.css | 0 .../component/list/list-item/item8/item8.hml | 0 .../component/list/list-item/item8/item8.js | 0 .../component/list/list-item/item9/item9.css | 0 .../component/list/list-item/item9/item9.hml | 0 .../component/list/list-item/item9/item9.js | 0 .../pages/component/list/list/index/index.css | 0 .../pages/component/list/list/index/index.hml | 0 .../pages/component/list/list/index/index.js | 0 .../component/list/list/indexAttr/index.css | 0 .../component/list/list/indexAttr/index.hml | 0 .../component/list/list/indexAttr/index.js | 0 .../list/list/indexCommonStyle/index.css | 0 .../list/list/indexCommonStyle/index.hml | 0 .../list/list/indexCommonStyle/index.js | 0 .../component/list/list/indexEvent/index.css | 0 .../component/list/list/indexEvent/index.hml | 0 .../component/list/list/indexEvent/index.js | 0 .../list/list/indexOperation/index.css | 0 .../list/list/indexOperation/index.hml | 0 .../list/list/indexOperation/index.js | 0 .../list/list/indexSpecStyle/index.css | 0 .../list/list/indexSpecStyle/index.hml | 0 .../list/list/indexSpecStyle/index.js | 0 .../pages/component/list/list/list1/list1.css | 0 .../pages/component/list/list/list1/list1.hml | 0 .../pages/component/list/list/list1/list1.js | 0 .../component/list/list/list10/list10.css | 0 .../component/list/list/list10/list10.hml | 0 .../component/list/list/list10/list10.js | 0 .../component/list/list/list11/list11.css | 0 .../component/list/list/list11/list11.hml | 0 .../component/list/list/list11/list11.js | 0 .../component/list/list/list12/list12.css | 0 .../component/list/list/list12/list12.hml | 0 .../component/list/list/list12/list12.js | 0 .../component/list/list/list13/list13.css | 2 +- .../component/list/list/list13/list13.hml | 34 + .../component/list/list/list13/list13.js | 0 .../pages/component/list/list/list2/list2.css | 0 .../pages/component/list/list/list2/list2.hml | 0 .../pages/component/list/list/list2/list2.js | 0 .../pages/component/list/list/list3/list3.css | 2 - .../pages/component/list/list/list3/list3.hml | 0 .../pages/component/list/list/list3/list3.js | 0 .../pages/component/list/list/list4/list4.css | 0 .../pages/component/list/list/list4/list4.hml | 0 .../pages/component/list/list/list4/list4.js | 0 .../pages/component/list/list/list5/list5.css | 0 .../pages/component/list/list/list5/list5.hml | 0 .../pages/component/list/list/list5/list5.js | 0 .../pages/component/list/list/list6/list6.css | 0 .../pages/component/list/list/list6/list6.hml | 0 .../pages/component/list/list/list6/list6.js | 0 .../pages/component/list/list/list7/list7.css | 0 .../pages/component/list/list/list7/list7.hml | 0 .../pages/component/list/list/list7/list7.js | 0 .../pages/component/list/list/list8/list8.css | 0 .../pages/component/list/list/list8/list8.hml | 0 .../pages/component/list/list/list8/list8.js | 0 .../pages/component/list/list/list9/list9.css | 0 .../pages/component/list/list/list9/list9.hml | 0 .../pages/component/list/list/list9/list9.js | 0 .../pages/component/marquee/attr/attr.css | 0 .../pages/component/marquee/attr/attr.hml | 0 .../pages/component/marquee/attr/attr.js | 0 .../marquee/commonStyle/commonStyle.css | 12 - .../marquee/commonStyle/commonStyle.hml | 0 .../marquee/commonStyle/commonStyle.js | 0 .../pages/component/marquee/event/event.css | 6 - .../pages/component/marquee/event/event.hml | 0 .../pages/component/marquee/event/event.js | 0 .../pages/component/marquee/index/index.css | 0 .../pages/component/marquee/index/index.hml | 0 .../pages/component/marquee/index/index.js | 0 .../component/marquee/specStyle/specStyle.css | 0 .../component/marquee/specStyle/specStyle.hml | 0 .../component/marquee/specStyle/specStyle.js | 0 .../component/picker_view/index/index.css | 0 .../component/picker_view/index/index.hml | 0 .../component/picker_view/index/index.js | 0 .../picker_view/text_picker/index/index.css | 0 .../picker_view/text_picker/index/index.hml | 0 .../picker_view/text_picker/index/index.js | 0 .../text_picker/indexAttr/index.css | 0 .../text_picker/indexAttr/index.hml | 0 .../text_picker/indexAttr/index.js | 0 .../text_picker/indexEvent/index.css | 0 .../text_picker/indexEvent/index.hml | 0 .../text_picker/indexEvent/index.js | 0 .../text_picker/indexStyle/index.css | 0 .../text_picker/indexStyle/index.hml | 0 .../text_picker/indexStyle/index.js | 0 .../text_picker/text_picker1/text_picker1.css | 0 .../text_picker/text_picker1/text_picker1.hml | 0 .../text_picker/text_picker1/text_picker1.js | 0 .../text_picker10/text_picker10.css | 0 .../text_picker10/text_picker10.hml | 0 .../text_picker10/text_picker10.js | 0 .../text_picker/text_picker2/text_picker2.css | 2 - .../text_picker/text_picker2/text_picker2.hml | 6 +- .../text_picker/text_picker2/text_picker2.js | 0 .../text_picker/text_picker3/text_picker3.css | 0 .../text_picker/text_picker3/text_picker3.hml | 0 .../text_picker/text_picker3/text_picker3.js | 0 .../text_picker/text_picker4/text_picker4.css | 0 .../text_picker/text_picker4/text_picker4.hml | 0 .../text_picker/text_picker4/text_picker4.js | 0 .../text_picker/text_picker5/text_picker5.css | 0 .../text_picker/text_picker5/text_picker5.hml | 0 .../text_picker/text_picker5/text_picker5.js | 0 .../text_picker/text_picker6/text_picker6.css | 0 .../text_picker/text_picker6/text_picker6.hml | 0 .../text_picker/text_picker6/text_picker6.js | 0 .../text_picker/text_picker7/text_picker7.css | 0 .../text_picker/text_picker7/text_picker7.hml | 0 .../text_picker/text_picker7/text_picker7.js | 0 .../text_picker/text_picker8/text_picker8.css | 0 .../text_picker/text_picker8/text_picker8.hml | 0 .../text_picker/text_picker8/text_picker8.js | 0 .../text_picker/text_picker9/text_picker9.css | 0 .../text_picker/text_picker9/text_picker9.hml | 0 .../text_picker/text_picker9/text_picker9.js | 0 .../picker_view/time_picker/index/index.css | 0 .../picker_view/time_picker/index/index.hml | 0 .../picker_view/time_picker/index/index.js | 0 .../time_picker/indexAttr/index.css | 0 .../time_picker/indexAttr/index.hml | 0 .../time_picker/indexAttr/index.js | 0 .../time_picker/indexEvent/index.css | 0 .../time_picker/indexEvent/index.hml | 0 .../time_picker/indexEvent/index.js | 0 .../time_picker/indexStyle/index.css | 0 .../time_picker/indexStyle/index.hml | 0 .../time_picker/indexStyle/index.js | 0 .../time_picker/time_picker1/time_picker1.css | 0 .../time_picker/time_picker1/time_picker1.hml | 0 .../time_picker/time_picker1/time_picker1.js | 0 .../time_picker10/time_picker10.css | 0 .../time_picker10/time_picker10.hml | 4 +- .../time_picker10/time_picker10.js | 0 .../time_picker/time_picker2/time_picker2.css | 2 - .../time_picker/time_picker2/time_picker2.hml | 6 +- .../time_picker/time_picker2/time_picker2.js | 0 .../time_picker/time_picker3/time_picker3.css | 0 .../time_picker/time_picker3/time_picker3.hml | 0 .../time_picker/time_picker3/time_picker3.js | 0 .../time_picker/time_picker4/time_picker4.css | 0 .../time_picker/time_picker4/time_picker4.hml | 0 .../time_picker/time_picker4/time_picker4.js | 0 .../time_picker/time_picker5/time_picker5.css | 0 .../time_picker/time_picker5/time_picker5.hml | 0 .../time_picker/time_picker5/time_picker5.js | 0 .../time_picker/time_picker6/time_picker6.css | 0 .../time_picker/time_picker6/time_picker6.hml | 4 +- .../time_picker/time_picker6/time_picker6.js | 0 .../time_picker/time_picker7/time_picker7.css | 0 .../time_picker/time_picker7/time_picker7.hml | 6 +- .../time_picker/time_picker7/time_picker7.js | 0 .../time_picker/time_picker8/time_picker8.css | 0 .../time_picker/time_picker8/time_picker8.hml | 0 .../time_picker/time_picker8/time_picker8.js | 0 .../time_picker/time_picker9/time_picker9.css | 0 .../time_picker/time_picker9/time_picker9.hml | 0 .../time_picker/time_picker9/time_picker9.js | 0 .../component/progress/circle/attr/attr.css | 8 +- .../component/progress/circle/attr/attr.hml | 0 .../component/progress/circle/attr/attr.js | 0 .../component/progress/circle/event/event.css | 4 +- .../component/progress/circle/event/event.hml | 0 .../component/progress/circle/event/event.js | 0 .../component/progress/circle/index/index.css | 0 .../component/progress/circle/index/index.hml | 0 .../component/progress/circle/index/index.js | 0 .../component/progress/circle/style/style.css | 26 +- .../component/progress/circle/style/style.hml | 0 .../component/progress/circle/style/style.js | 0 .../progress/horizontal/attr/attr.css | 0 .../progress/horizontal/attr/attr.hml | 2 +- .../progress/horizontal/attr/attr.js | 0 .../progress/horizontal/event/event.css | 0 .../progress/horizontal/event/event.hml | 0 .../progress/horizontal/event/event.js | 0 .../progress/horizontal/index/index.css | 0 .../progress/horizontal/index/index.hml | 0 .../progress/horizontal/index/index.js | 0 .../progress/horizontal/style/style.css | 14 - .../progress/horizontal/style/style.hml | 0 .../progress/horizontal/style/style.js | 0 .../pages/component/progress/index/index.css | 0 .../pages/component/progress/index/index.hml | 0 .../pages/component/progress/index/index.js | 0 .../pages/component/slider/attr/attr.css | 12 - .../pages/component/slider/attr/attr.hml | 0 .../pages/component/slider/attr/attr.js | 0 .../pages/component/slider/event/event.css | 6 - .../pages/component/slider/event/event.hml | 0 .../pages/component/slider/event/event.js | 0 .../pages/component/slider/index/index.css | 0 .../pages/component/slider/index/index.hml | 0 .../pages/component/slider/index/index.js | 0 .../pages/component/slider/style/style.css | 8 - .../pages/component/slider/style/style.hml | 0 .../pages/component/slider/style/style.js | 0 .../pages/component/stack/index/index.css | 0 .../pages/component/stack/index/index.hml | 0 .../pages/component/stack/index/index.js | 0 .../pages/component/stack/indexAttr/index.css | 0 .../pages/component/stack/indexAttr/index.hml | 0 .../pages/component/stack/indexAttr/index.js | 0 .../component/stack/indexEffect/index.css | 0 .../component/stack/indexEffect/index.hml | 0 .../component/stack/indexEffect/index.js | 0 .../component/stack/indexEvent/index.css | 0 .../component/stack/indexEvent/index.hml | 0 .../pages/component/stack/indexEvent/index.js | 0 .../component/stack/indexStyle/index.css | 0 .../component/stack/indexStyle/index.hml | 0 .../pages/component/stack/indexStyle/index.js | 0 .../pages/component/stack/stack1/stack1.css | 0 .../pages/component/stack/stack1/stack1.hml | 0 .../pages/component/stack/stack1/stack1.js | 0 .../pages/component/stack/stack2/stack2.css | 2 - .../pages/component/stack/stack2/stack2.hml | 35 + .../pages/component/stack/stack2/stack2.js | 0 .../pages/component/stack/stack3/stack3.css | 0 .../pages/component/stack/stack3/stack3.hml | 0 .../pages/component/stack/stack3/stack3.js | 0 .../pages/component/stack/stack4/stack4.css | 2 - .../pages/component/stack/stack4/stack4.hml | 0 .../pages/component/stack/stack4/stack4.js | 0 .../pages/component/stack/stack5/stack5.css | 0 .../pages/component/stack/stack5/stack5.hml | 4 +- .../pages/component/stack/stack5/stack5.js | 0 .../pages/component/stack/stack6/stack6.css | 0 .../pages/component/stack/stack6/stack6.hml | 0 .../pages/component/stack/stack6/stack6.js | 0 .../pages/component/stack/stack7/stack7.css | 0 .../pages/component/stack/stack7/stack7.hml | 0 .../pages/component/stack/stack7/stack7.js | 0 .../pages/component/stack/stack8/stack8.css | 0 .../pages/component/stack/stack8/stack8.hml | 2 +- .../pages/component/stack/stack8/stack8.js | 0 .../pages/component/swiper/index/index.css | 0 .../pages/component/swiper/index/index.hml | 0 .../pages/component/swiper/index/index.js | 0 .../component/swiper/indexAttr/index.css | 0 .../component/swiper/indexAttr/index.hml | 0 .../pages/component/swiper/indexAttr/index.js | 0 .../component/swiper/indexEvent/index.css | 0 .../component/swiper/indexEvent/index.hml | 0 .../component/swiper/indexEvent/index.js | 0 .../component/swiper/indexSpecSet/index.css | 0 .../component/swiper/indexSpecSet/index.hml | 0 .../component/swiper/indexSpecSet/index.js | 0 .../component/swiper/indexStyle/index.css | 0 .../component/swiper/indexStyle/index.hml | 0 .../component/swiper/indexStyle/index.js | 0 .../component/swiper/swiper1/swiper1.css | 0 .../component/swiper/swiper1/swiper1.hml | 0 .../pages/component/swiper/swiper1/swiper1.js | 0 .../component/swiper/swiper10/swiper10.css | 0 .../component/swiper/swiper10/swiper10.hml | 0 .../component/swiper/swiper10/swiper10.js | 0 .../component/swiper/swiper11/swiper11.css | 0 .../component/swiper/swiper11/swiper11.hml | 0 .../component/swiper/swiper11/swiper11.js | 0 .../component/swiper/swiper2/swiper2.css | 0 .../component/swiper/swiper2/swiper2.hml | 0 .../pages/component/swiper/swiper2/swiper2.js | 0 .../component/swiper/swiper3/swiper3.css | 0 .../component/swiper/swiper3/swiper3.hml | 0 .../pages/component/swiper/swiper3/swiper3.js | 0 .../component/swiper/swiper4/swiper4.css | 0 .../component/swiper/swiper4/swiper4.hml | 0 .../pages/component/swiper/swiper4/swiper4.js | 0 .../component/swiper/swiper5/swiper5.css | 0 .../component/swiper/swiper5/swiper5.hml | 0 .../pages/component/swiper/swiper5/swiper5.js | 0 .../component/swiper/swiper6/swiper6.css | 0 .../component/swiper/swiper6/swiper6.hml | 0 .../pages/component/swiper/swiper6/swiper6.js | 0 .../component/swiper/swiper7/swiper7.css | 0 .../component/swiper/swiper7/swiper7.hml | 0 .../pages/component/swiper/swiper7/swiper7.js | 1 + .../component/swiper/swiper8/swiper8.css | 0 .../component/swiper/swiper8/swiper8.hml | 0 .../pages/component/swiper/swiper8/swiper8.js | 0 .../component/swiper/swiper9/swiper9.css | 0 .../component/swiper/swiper9/swiper9.hml | 0 .../pages/component/swiper/swiper9/swiper9.js | 0 .../pages/component/switch/attr/attr.css | 0 .../pages/component/switch/attr/attr.hml | 0 .../pages/component/switch/attr/attr.js | 0 .../pages/component/switch/event/event.css | 0 .../pages/component/switch/event/event.hml | 0 .../pages/component/switch/event/event.js | 0 .../pages/component/switch/index/index.css | 0 .../pages/component/switch/index/index.hml | 0 .../pages/component/switch/index/index.js | 0 .../pages/component/switch/style/style.css | 0 .../pages/component/switch/style/style.hml | 0 .../pages/component/switch/style/style.js | 0 .../pages/component/text/attr/attr.css | 0 .../pages/component/text/attr/attr.hml | 0 .../default/pages/component/text/attr/attr.js | 0 .../text/commonStyle/commonStyle.css | 12 - .../text/commonStyle/commonStyle.hml | 0 .../component/text/commonStyle/commonStyle.js | 0 .../pages/component/text/event/event.css | 0 .../pages/component/text/event/event.hml | 0 .../pages/component/text/event/event.js | 0 .../pages/component/text/index/index.css | 0 .../pages/component/text/index/index.hml | 0 .../pages/component/text/index/index.js | 0 .../component/text/specStyle/specStyle.css | 0 .../component/text/specStyle/specStyle.hml | 0 .../component/text/specStyle/specStyle.js | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 4 + .../src/main/js/default/pages/index/index.js | 6 +- .../include}/base/dft_impl.h | 20 +- .../include}/base/js_config.h | 28 +- .../include}/base/js_debugger_config.h | 62 +- frameworks/include/base/product_adapter.h | 125 + .../include}/context/js_ability.h | 24 +- .../include}/resource/video_panel_image_res.h | 0 .../packages}/runtime-core/.babelrc | 0 .../packages}/runtime-core/.editorconfig | 0 .../packages}/runtime-core/.eslintignore | 0 .../packages}/runtime-core/.eslintrc.js | 0 .../packages}/runtime-core/.gitignore | 0 .../packages}/runtime-core/.prettierrc | 0 .../runtime-core/.size-snapshot.json | 0 .../packages}/runtime-core/contribution.md | 2 +- .../packages}/runtime-core/package-lock.json | 0 .../packages}/runtime-core/package.json | 0 .../packages}/runtime-core/scripts/build.js | 0 .../packages}/runtime-core/scripts/configs.js | 0 .../runtime-core/src/__test__/index.test.js | 0 .../packages}/runtime-core/src/core/index.js | 0 .../packages}/runtime-core/src/index.js | 0 .../runtime-core/src/observer/index.js | 0 .../runtime-core/src/observer/observer.js | 0 .../runtime-core/src/observer/subject.js | 0 .../runtime-core/src/observer/utils.js | 0 .../runtime-core/src/profiler/index.js | 0 .../src}/core/animation/transition_impl.cpp | 145 +- .../src}/core/animation/transition_impl.h | 21 +- .../src}/core/async/js_async_work.cpp | 3 +- .../src}/core/async/message_queue_utils.cpp | 0 frameworks/src/core/base/ace_event_id.h | 69 + {src => frameworks/src}/core/base/ace_log.cpp | 0 {src => frameworks/src}/core/base/ace_log.h | 0 frameworks/src/core/base/ace_mem_base.cpp | 70 + .../src}/core/base/ace_version.h | 0 .../src/core/base/async_task_manager.cpp | 170 ++ frameworks/src/core/base/async_task_manager.h | 73 + frameworks/src/core/base/cache/cache_config.h | 61 + .../src/core/base/cache/cache_manager.cpp | 188 ++ .../src/core/base/cache/cache_manager.h | 92 + .../core/base/cache/test/unittest}/BUILD.gn | 27 +- .../common/cache_manager_tdd_test.cpp | 232 ++ .../unittest/common/cache_manager_tdd_test.h | 53 + .../src}/core/base/dft_impl.cpp | 17 +- frameworks/src/core/base/dfx_assist.cpp | 121 + frameworks/src/core/base/dfx_assist.h | 48 + frameworks/src/core/base/event_util.cpp | 150 ++ frameworks/src/core/base/event_util.h | 67 + .../src}/core/base/framework_min_bc.h | 6 +- .../src}/core/base/framework_min_js.h | 0 .../src}/core/base/js_debugger_config.cpp | 53 +- .../src}/core/base/js_fwk_common.cpp | 368 ++- .../src}/core/base/js_fwk_common.h | 28 +- .../src}/core/base/key_parser.cpp | 77 +- .../src}/core/base/key_parser.h | 0 {src => frameworks/src}/core/base/keys.h | 45 +- .../src/core/base/lazy_load_manager.cpp | 82 + frameworks/src/core/base/lazy_load_manager.h | 74 + .../src/core/base/lazy_load_watcher.cpp | 33 + frameworks/src/core/base/lazy_load_watcher.h | 65 + frameworks/src/core/base/locale_util.cpp | 87 + frameworks/src/core/base/locale_util.h | 46 + frameworks/src/core/base/mem_proc.cpp | 176 ++ frameworks/src/core/base/mem_proc.h | 79 + .../src}/core/base/memory_heap.cpp | 0 .../src}/core/base/non_copyable.h | 0 frameworks/src/core/base/number_parser.cpp | 98 + frameworks/src/core/base/number_parser.h | 65 + frameworks/src/core/base/product_adapter.cpp | 225 ++ .../src}/core/base/string_util.cpp | 13 +- .../src}/core/base/string_util.h | 0 .../src}/core/base/time_util.cpp | 0 {src => frameworks/src}/core/base/time_util.h | 4 +- .../components/analog_clock_component.cpp | 0 .../core/components/analog_clock_component.h | 0 .../src}/core/components/camera_component.cpp | 68 +- .../src}/core/components/camera_component.h | 22 +- .../src/core/components/canvas_component.cpp | 960 +++++++ .../src}/core/components/canvas_component.h | 95 +- .../src}/core/components/chart_component.cpp | 201 +- .../src}/core/components/chart_component.h | 6 +- .../components/circle_progress_component.cpp | 211 ++ .../components/circle_progress_component.h | 44 +- .../core/components/clock_hand_component.cpp | 1 + .../core/components/clock_hand_component.h | 2 +- .../src}/core/components/component.cpp | 850 ++++-- .../src}/core/components/component.h | 277 +- .../src}/core/components/component_factory.h | 50 +- .../src/core/components/component_utils.cpp | 88 + .../src}/core/components/component_utils.h | 7 +- .../src/core/components/div_component.cpp | 161 ++ .../src}/core/components/div_component.h | 18 +- .../src}/core/components/event_listener.cpp | 43 +- .../src}/core/components/event_listener.h | 165 +- .../components/horizon_progress_component.cpp | 131 + .../components/horizon_progress_component.h | 49 + .../components/image_animator_component.cpp | 64 +- .../components/image_animator_component.h | 8 +- .../src}/core/components/image_component.cpp | 43 +- .../src}/core/components/image_component.h | 6 +- .../components/input_button_component.cpp | 251 ++ .../core/components/input_button_component.h | 46 +- .../components/input_checkbox_component.cpp | 126 + .../components/input_checkbox_component.h | 59 + .../core/components/input_radio_component.cpp | 138 + .../core/components/input_radio_component.h | 60 + .../src}/core/components/list_adapter.cpp | 64 +- .../src}/core/components/list_adapter.h | 18 +- .../src}/core/components/list_component.cpp | 126 +- .../src}/core/components/list_component.h | 14 +- .../core/components/marquee_component.cpp | 0 .../src}/core/components/marquee_component.h | 0 .../src}/core/components/panel_view.cpp | 4 +- .../src}/core/components/panel_view.h | 1 - .../core/components/picker_view_component.cpp | 26 +- .../core/components/picker_view_component.h | 8 +- .../src/core/components/qrcode_component.cpp | 133 + .../src/core/components/qrcode_component.h | 58 + .../src}/core/components/scroll_layer.cpp | 54 +- .../src}/core/components/scroll_layer.h | 10 +- .../src}/core/components/slider_component.cpp | 161 +- .../src}/core/components/slider_component.h | 17 +- .../src/core/components/stack_component.cpp | 55 + .../src/core/components/stack_component.h | 43 + .../src}/core/components/swiper_component.cpp | 88 +- .../src}/core/components/swiper_component.h | 13 +- .../src}/core/components/switch_component.cpp | 60 +- .../src}/core/components/switch_component.h | 8 +- .../core/components/tab_bar_component.cpp | 0 .../src}/core/components/tab_bar_component.h | 0 .../core/components/tab_content_component.cpp | 0 .../core/components/tab_content_component.h | 0 .../src}/core/components/tabs_component.cpp | 4 +- .../src}/core/components/tabs_component.h | 0 .../core/components/test/unittest/BUILD.gn | 35 + .../components/test/unittest/common/BUILD.gn | 213 ++ .../test/unittest/common/arc_tdd_test.cpp | 1220 +++++++++ .../test/unittest/common/arc_tdd_test.h | 52 + .../test/unittest/common/div_tdd_test.cpp | 1189 +++++++++ .../test/unittest/common/div_tdd_test.h | 53 + .../unittest/common/event_bubble_tdd_test.cpp | 1506 +++++++++++ .../unittest/common/event_bubble_tdd_test.h | 47 + .../common/horizonprogress_tdd_test.cpp | 819 ++++++ .../common/horizonprogress_tdd_test.h | 70 + .../common/image_src_path_tdd_test.cpp | 146 ++ .../unittest/common/image_src_path_tdd_test.h | 50 + .../test/unittest/common/input_tdd_test.cpp | 1360 ++++++++++ .../test/unittest/common/input_tdd_test.h | 80 + .../unittest/common/jsbundle_tdd_test.cpp | 496 ++++ .../test/unittest/common/jsbundle_tdd_test.h | 61 + .../test/unittest/common/list_tdd_test.cpp | 270 ++ .../test/unittest/common/list_tdd_test.h | 55 + .../test/unittest/common/marquee_tdd_test.cpp | 460 ++++ .../test/unittest/common/marquee_tdd_test.h | 43 + .../test/unittest/common/opacity_tdd_test.cpp | 363 +++ .../test/unittest/common/opacity_tdd_test.h | 42 + .../test/unittest/common/percent_tdd_test.cpp | 548 ++++ .../test/unittest/common/percent_tdd_test.h | 89 + .../unittest/common/picker_view_tdd_test.cpp | 470 ++++ .../unittest/common/picker_view_tdd_test.h | 69 + .../unittest/common/radio_switch_tdd_test.cpp | 530 ++++ .../unittest/common/radio_switch_tdd_test.h | 44 + .../unittest/common/root_component_mock.cpp | 78 + .../unittest/common/root_component_mock.h | 52 + .../test/unittest/common/slider_tdd_test.cpp | 423 +++ .../test/unittest/common/slider_tdd_test.h | 37 + .../test/unittest/common/swiper_tdd_test.cpp | 577 ++++ .../test/unittest/common/swiper_tdd_test.h | 68 + .../test/unittest/common/switch_tdd_test.cpp | 235 ++ .../test/unittest/common/switch_tdd_test.h | 57 + .../common/text_tdd_exception_test.cpp | 92 + .../unittest/common/text_tdd_exception_test.h | 32 + .../test/unittest/common/text_tdd_test.cpp | 446 ++++ .../test/unittest/common/text_tdd_test.h | 37 + .../src}/core/components/text_component.cpp | 58 +- .../src}/core/components/text_component.h | 8 +- .../src}/core/components/video_component.cpp | 32 +- .../src}/core/components/video_component.h | 20 +- .../core/components/video_state_callback.h | 0 .../src}/core/components/video_view.cpp | 30 +- .../src}/core/components/video_view.h | 7 +- .../src}/core/context/ace_ability.cpp | 11 +- .../src}/core/context/ace_ability.h | 0 .../core/context/ace_event_error_code.cpp | 15 +- .../src}/core/context/ace_event_error_code.h | 11 +- .../src}/core/context/fatal_handler.cpp | 56 +- .../src}/core/context/fatal_handler.h | 15 +- .../src}/core/context/js_ability.cpp | 79 +- .../src}/core/context/js_ability_impl.cpp | 24 +- .../src}/core/context/js_ability_impl.h | 6 +- .../src}/core/context/js_app_context.cpp | 47 +- .../src}/core/context/js_app_context.h | 55 +- .../src}/core/context/js_app_environment.cpp | 19 +- .../src}/core/context/js_app_environment.h | 0 .../src}/core/context/js_framework_raw.cpp | 9 +- .../src}/core/context/js_framework_raw.h | 0 .../src}/core/context/js_profiler.cpp | 39 +- .../src}/core/context/js_profiler.h | 0 .../src}/core/context/js_timer_list.cpp | 0 .../src}/core/context/js_timer_list.h | 0 .../src/core/context/test/unittest}/BUILD.gn | 29 +- .../test/unittest/common/jsfwk_tdd_test.cpp | 454 ++++ .../test/unittest/common/jsfwk_tdd_test.h | 60 + frameworks/src/core/dialog/js_dialog.cpp | 234 ++ frameworks/src/core/dialog/js_dialog.h | 103 + .../src}/core/directive/descriptor_utils.cpp | 0 .../src}/core/directive/descriptor_utils.h | 2 +- .../directive/directive_watcher_callback.cpp | 0 .../directive/directive_watcher_callback.h | 4 +- .../src}/core/jsi/internal/jsi_internal.h | 0 {src => frameworks/src}/core/jsi/jsi.cpp | 0 .../src/core/jsi/test/unittest}/BUILD.gn | 27 +- .../common/jsi_interface_tdd_test.cpp | 1132 ++++++++ .../unittest/common/jsi_interface_tdd_test.h | 81 + .../src}/core/modules/app_module.cpp | 2 +- .../src}/core/modules/app_module.h | 0 .../src}/core/modules/dfx_module.cpp | 32 +- .../src}/core/modules/dfx_module.h | 0 frameworks/src/core/modules/dialog_module.cpp | 85 + frameworks/src/core/modules/dialog_module.h | 56 + .../src}/core/modules/maplejs/readme.txt | 0 .../src}/core/modules/module_manager.cpp | 30 +- .../src}/core/modules/module_manager.h | 26 +- .../src}/core/modules/ohos_module_config.h | 19 +- .../core/modules/presets/cjson_parser.cpp | 632 +++-- .../src/core/modules/presets/cjson_parser.h | 232 ++ .../core/modules/presets/console_log_impl.cpp | 22 +- .../core/modules/presets/console_log_impl.h | 18 +- .../core/modules/presets/console_module.cpp | 0 .../core/modules/presets/console_module.h | 0 .../presets/date_time_format_module.cpp | 731 ++++++ .../modules/presets/date_time_format_module.h | 185 ++ .../presets/feature_ability_module.cpp | 69 +- .../modules/presets/feature_ability_module.h | 0 .../src/core/modules/presets/intl_module.cpp | 41 + .../src/core/modules/presets/intl_module.h | 67 + .../core/modules/presets/jstest_module.cpp | 0 .../src}/core/modules/presets/jstest_module.h | 0 .../modules/presets/localization_module.cpp | 113 +- .../modules/presets/localization_module.h | 6 +- .../modules/presets/number_format_module.cpp | 233 ++ .../modules/presets/number_format_module.h | 90 + .../core/modules/presets/preset_module.cpp | 0 .../src}/core/modules/presets/preset_module.h | 0 .../core/modules/presets/profiler_module.cpp | 2 +- .../core/modules/presets/profiler_module.h | 0 .../core/modules/presets/render_module.cpp | 0 .../src}/core/modules/presets/render_module.h | 0 .../core/modules/presets/require_module.cpp | 0 .../core/modules/presets/require_module.h | 0 .../modules/presets/test/unittest/BUILD.gn | 31 + .../common/date_time_module_tdd_test.cpp | 2335 +++++++++++++++++ .../common/date_time_module_tdd_test.h | 113 + .../common/number_format_module_tdd_test.cpp | 785 ++++++ .../common/number_format_module_tdd_test.h | 83 + .../core/modules/presets/timer_module.cpp | 80 +- .../src}/core/modules/presets/timer_module.h | 11 +- .../core/modules/presets/version_module.cpp | 0 .../core/modules/presets/version_module.h | 0 .../src}/core/modules/router_module.cpp | 0 .../src}/core/modules/router_module.h | 0 .../src}/core/modules/sample_module.cpp | 1 + .../src}/core/modules/sample_module.h | 0 .../src/core/modules/test/unittest/BUILD.gn | 37 + .../test/unittest/common/dfx_tdd_test.cpp | 534 ++++ .../test/unittest/common/dfx_tdd_test.h | 42 + .../core/resource/video_muted_image_res.cpp | 0 .../core/resource/video_play_image_res.cpp | 0 .../src}/core/router/js_page_state.cpp | 2 +- .../src}/core/router/js_page_state.h | 0 .../core/router/js_page_state_machine.cpp | 65 +- .../src}/core/router/js_page_state_machine.h | 17 +- .../src}/core/router/js_router.cpp | 6 +- .../src}/core/router/js_router.h | 0 .../src}/core/stylemgr/app_style.cpp | 25 +- .../src}/core/stylemgr/app_style.h | 6 +- .../src}/core/stylemgr/app_style_item.cpp | 34 +- .../src}/core/stylemgr/app_style_item.h | 49 +- .../src}/core/stylemgr/app_style_list.cpp | 0 .../src}/core/stylemgr/app_style_list.h | 0 .../src}/core/stylemgr/app_style_manager.cpp | 270 +- .../src}/core/stylemgr/app_style_manager.h | 38 +- .../src}/core/stylemgr/app_style_sheet.cpp | 4 + .../src}/core/stylemgr/app_style_sheet.h | 8 +- .../src/core/stylemgr/test/unittest/BUILD.gn | 31 + .../unittest/common/stylemgr_tdd_test.cpp | 1079 ++++++++ .../test/unittest/common/stylemgr_tdd_test.h | 91 + {src => frameworks/src}/core/wrapper/js.cpp | 85 +- {src => frameworks/src}/core/wrapper/js.h | 23 +- .../targets}/default/acelite_config.h | 0 frameworks/targets/linux/acelite_config.h | 137 + .../targets}/liteos_a/acelite_config.h | 40 +- .../targets}/liteos_m/acelite_config.h | 76 +- .../targets}/platform_adapter.cpp | 10 +- .../targets}/platform_adapter.h | 0 frameworks/targets/simulator/BUILD.gn | 70 + .../targets}/simulator/acelite_config.h | 20 +- .../tools}/profiler/README.md | 0 .../tools}/profiler/js_profiler.py | 3 +- .../tools}/profiler/js_profiler_config.py | 3 +- .../tools}/snapshot/framework2char.py | 29 +- .../tools}/snapshot/jerry_bin/ReadMe.md | 0 .../tools}/snapshot/jerry_bin/build_jerry.bat | 0 .../tools}/snapshot/jerry_bin/build_jerry.sh | 5 +- .../innerkits/builtin/async/js_async_work.h | 116 + .../builtin/async/message_queue_utils.h | 150 ++ .../innerkits/builtin/base/ace_mem_base.h | 76 + .../innerkits/builtin/base/memory_heap.h | 53 + interfaces/innerkits/builtin/jsi/jsi.h | 709 +++++ interfaces/innerkits/builtin/jsi/jsi_types.h | 104 + readme.md | 3 - src/core/base/ace_mem_base.cpp | 80 - src/core/components/BUILD.gn | 45 - src/core/components/canvas_component.cpp | 672 ----- src/core/components/component_utils.cpp | 42 - src/core/components/div_component.cpp | 190 -- src/core/components/input_component.cpp | 538 ---- src/core/components/progress_component.cpp | 336 --- src/core/context/BUILD.gn | 37 - src/core/jsi/BUILD.gn | 24 - src/core/modules/BUILD.gn | 43 - src/core/modules/presets/cjson_parser.h | 192 -- src/core/router/BUILD.gn | 25 - src/core/stylemgr/BUILD.gn | 27 - src/core/wrapper/BUILD.gn | 23 - targets/linux/acelite_config.h | 51 - test/BUILD.gn | 45 + test/ace_test_config.gni | 86 + test/moduletest/common/base_test.cpp | 143 + test/moduletest/common/base_test.h | 72 + test/moduletest/common/basic_tdd_test.cpp | 233 ++ test/moduletest/common/basic_tdd_test.h | 68 + .../common/test_app/ui_auto_test/.gitignore | 1 + .../common/test_app/ui_auto_test/config.json | 158 ++ .../ui_auto_test/src/main/js/default/app.js | 23 + .../src/main/js/default/common/234.jpg | Bin 0 -> 10591 bytes .../src/main/js/default/common/a3.png | Bin 0 -> 10591 bytes .../js/default/common/asserts/numbers/0.png | Bin 0 -> 1653 bytes .../js/default/common/asserts/numbers/1.png | Bin 0 -> 588 bytes .../js/default/common/asserts/numbers/2.png | Bin 0 -> 1322 bytes .../js/default/common/asserts/numbers/3.png | Bin 0 -> 1395 bytes .../js/default/common/asserts/numbers/4.png | Bin 0 -> 871 bytes .../js/default/common/asserts/numbers/5.png | Bin 0 -> 1291 bytes .../js/default/common/asserts/numbers/6.png | Bin 0 -> 1618 bytes .../js/default/common/asserts/numbers/7.png | Bin 0 -> 1120 bytes .../js/default/common/asserts/numbers/8.png | Bin 0 -> 1840 bytes .../js/default/common/asserts/numbers/9.png | Bin 0 -> 1737 bytes .../src/main/js/default/common/goAhead.png | Bin 0 -> 615 bytes .../src/main/js/default/common/hellopng.png | Bin 0 -> 10591 bytes .../src/main/js/default/common/icon.png | Bin 0 -> 10591 bytes .../src/main/js/default/common/js/chart.js | 73 + .../src/main/js/default/common/js/general.js | 66 + .../src/main/js/default/common/js/list.js | 33 + .../main/js/default/common/js/picker_view.js | 42 + .../src/main/js/default/common/left.png | Bin 0 -> 597 bytes .../src/main/js/default/common/leftHead.png | Bin 0 -> 4502 bytes .../src/main/js/default/common/music_next.png | Bin 0 -> 1166 bytes .../src/main/js/default/common/music_play.png | Bin 0 -> 1720 bytes .../src/main/js/default/common/music_prev.png | Bin 0 -> 1195 bytes .../src/main/js/default/common/nextRow.png | Bin 0 -> 955 bytes .../src/main/js/default/common/preRow.png | Bin 0 -> 1130 bytes .../src/main/js/default/common/right.png | Bin 0 -> 746 bytes .../src/main/js/default/common/test.png | Bin 0 -> 10591 bytes .../src/main/js/default/common/xinlvBg.png | Bin 0 -> 3313 bytes .../main/js/default/common/xinlvMargin.png | Bin 0 -> 8761 bytes .../src/main/js/default/pages/arc/index.css | 30 + .../src/main/js/default/pages/arc/index.hml | 38 + .../src/main/js/default/pages/arc/index.js | 35 + .../default/pages/canvas/indexAPI/index.css | 43 + .../default/pages/canvas/indexAPI/index.hml | 59 + .../js/default/pages/canvas/indexAPI/index.js | 25 + .../pages/canvas/indexAPIArc/index.css | 32 + .../pages/canvas/indexAPIArc/index.hml | 138 + .../default/pages/canvas/indexAPIArc/index.js | 101 + .../pages/canvas/indexAPIAttr1/index.css | 32 + .../pages/canvas/indexAPIAttr1/index.hml | 106 + .../pages/canvas/indexAPIAttr1/index.js | 76 + .../pages/canvas/indexAPIAttr2/index.css | 32 + .../pages/canvas/indexAPIAttr2/index.hml | 90 + .../pages/canvas/indexAPIAttr2/index.js | 62 + .../pages/canvas/indexAPIBeginPath/index.css | 32 + .../pages/canvas/indexAPIBeginPath/index.hml | 170 ++ .../pages/canvas/indexAPIBeginPath/index.js | 167 ++ .../pages/canvas/indexAPIClosePath/index.css | 32 + .../pages/canvas/indexAPIClosePath/index.hml | 194 ++ .../pages/canvas/indexAPIClosePath/index.js | 189 ++ .../pages/canvas/indexAPIDraw1/index.css | 32 + .../pages/canvas/indexAPIDraw1/index.hml | 82 + .../pages/canvas/indexAPIDraw1/index.js | 51 + .../pages/canvas/indexAPIDraw2/index.css | 43 + .../pages/canvas/indexAPIDraw2/index.hml | 67 + .../pages/canvas/indexAPIDraw2/index.js | 26 + .../pages/canvas/indexAPILineTo/index.css | 32 + .../pages/canvas/indexAPILineTo/index.hml | 58 + .../pages/canvas/indexAPILineTo/index.js | 40 + .../pages/canvas/indexAPIMoveTo/index.css | 32 + .../pages/canvas/indexAPIMoveTo/index.hml | 58 + .../pages/canvas/indexAPIMoveTo/index.js | 40 + .../canvas/indexAPIPerformance/index.css | 32 + .../canvas/indexAPIPerformance/index.hml | 50 + .../pages/canvas/indexAPIPerformance/index.js | 170 ++ .../pages/canvas/indexAPIRect/index.css | 32 + .../pages/canvas/indexAPIRect/index.hml | 74 + .../pages/canvas/indexAPIRect/index.js | 50 + .../pages/canvas/indexAPIScenario/index.css | 32 + .../pages/canvas/indexAPIScenario/index.hml | 42 + .../pages/canvas/indexAPIScenario/index.js | 29 + .../pages/canvas/indexAPIStroke/index.css | 32 + .../pages/canvas/indexAPIStroke/index.hml | 82 + .../pages/canvas/indexAPIStroke/index.js | 62 + .../js/default/pages/chart/0304/index.css | 41 + .../js/default/pages/chart/0304/index.hml | 35 + .../main/js/default/pages/chart/0304/index.js | 59 + .../js/default/pages/chart/0506/index.css | 41 + .../js/default/pages/chart/0506/index.hml | 36 + .../main/js/default/pages/chart/0506/index.js | 53 + .../js/default/pages/chart/1819/index.css | 41 + .../js/default/pages/chart/1819/index.hml | 39 + .../main/js/default/pages/chart/1819/index.js | 54 + .../main/js/default/pages/chart/20/index.css | 42 + .../main/js/default/pages/chart/20/index.hml | 30 + .../main/js/default/pages/chart/20/index.js | 60 + .../main/js/default/pages/chart/21/index.css | 42 + .../main/js/default/pages/chart/21/index.hml | 42 + .../main/js/default/pages/chart/21/index.js | 51 + .../main/js/default/pages/chart/22/index.css | 42 + .../main/js/default/pages/chart/22/index.hml | 29 + .../main/js/default/pages/chart/22/index.js | 59 + .../main/js/default/pages/chart/23/index.css | 42 + .../main/js/default/pages/chart/23/index.hml | 31 + .../main/js/default/pages/chart/23/index.js | 40 + .../main/js/default/pages/chart/24/index.css | 42 + .../main/js/default/pages/chart/24/index.hml | 47 + .../main/js/default/pages/chart/24/index.js | 85 + .../main/js/default/pages/chart/25/index.css | 42 + .../main/js/default/pages/chart/25/index.hml | 29 + .../main/js/default/pages/chart/25/index.js | 31 + .../main/js/default/pages/chart/26/index.css | 42 + .../main/js/default/pages/chart/26/index.hml | 29 + .../main/js/default/pages/chart/26/index.js | 57 + .../main/js/default/pages/chart/27/index.css | 42 + .../main/js/default/pages/chart/27/index.hml | 31 + .../main/js/default/pages/chart/27/index.js | 44 + .../main/js/default/pages/chart/28/index.css | 42 + .../main/js/default/pages/chart/28/index.hml | 47 + .../main/js/default/pages/chart/28/index.js | 62 + .../main/js/default/pages/chart/29/index.css | 42 + .../main/js/default/pages/chart/29/index.hml | 42 + .../main/js/default/pages/chart/29/index.js | 68 + .../main/js/default/pages/chart/30/index.css | 42 + .../main/js/default/pages/chart/30/index.hml | 29 + .../main/js/default/pages/chart/30/index.js | 102 + .../default/pages/data-binding/01/index.hml | 52 + .../js/default/pages/data-binding/01/index.js | 27 + .../default/pages/data-binding/02/index.hml | 41 + .../js/default/pages/data-binding/02/index.js | 31 + .../js/default/pages/directive/01/index.hml | 53 + .../js/default/pages/directive/01/index.js | 27 + .../js/default/pages/directive/02/index.hml | 57 + .../js/default/pages/directive/02/index.js | 27 + .../js/default/pages/directive/03/index.hml | 64 + .../js/default/pages/directive/03/index.js | 31 + .../js/default/pages/directive/04/index.hml | 65 + .../js/default/pages/directive/04/index.js | 33 + .../main/js/default/pages/div/01/index.css | 45 + .../main/js/default/pages/div/01/index.hml | 37 + .../src/main/js/default/pages/div/01/index.js | 18 + .../main/js/default/pages/div/02/index.css | 45 + .../main/js/default/pages/div/02/index.hml | 54 + .../src/main/js/default/pages/div/02/index.js | 20 + .../main/js/default/pages/div/03/index.css | 45 + .../main/js/default/pages/div/03/index.hml | 44 + .../src/main/js/default/pages/div/03/index.js | 20 + .../main/js/default/pages/div/33/index.css | 52 + .../main/js/default/pages/div/33/index.hml | 51 + .../src/main/js/default/pages/div/33/index.js | 20 + .../main/js/default/pages/div/34/index.css | 44 + .../main/js/default/pages/div/34/index.hml | 109 + .../src/main/js/default/pages/div/34/index.js | 21 + .../main/js/default/pages/div/35/index.css | 51 + .../main/js/default/pages/div/35/index.hml | 53 + .../src/main/js/default/pages/div/35/index.js | 42 + .../main/js/default/pages/div/36/index.css | 45 + .../main/js/default/pages/div/36/index.hml | 44 + .../src/main/js/default/pages/div/36/index.js | 91 + .../main/js/default/pages/global/index.css | 30 + .../main/js/default/pages/global/index.hml | 29 + .../src/main/js/default/pages/global/index.js | 24 + .../default/pages/image-animator/01/index.css | 53 + .../default/pages/image-animator/01/index.hml | 62 + .../default/pages/image-animator/01/index.js | 55 + .../js/default/pages/image/01/hellopng.png | Bin 0 -> 10591 bytes .../main/js/default/pages/image/01/index.css | 37 + .../main/js/default/pages/image/01/index.hml | 32 + .../main/js/default/pages/image/01/index.js | 19 + .../main/js/default/pages/image/02/index.css | 37 + .../main/js/default/pages/image/02/index.hml | 30 + .../main/js/default/pages/image/02/index.js | 18 + .../main/js/default/pages/image/04/index.css | 37 + .../main/js/default/pages/image/04/index.hml | 30 + .../main/js/default/pages/image/04/index.js | 18 + .../main/js/default/pages/image/05/index.css | 37 + .../main/js/default/pages/image/05/index.hml | 27 + .../main/js/default/pages/image/05/index.js | 18 + .../src/main/js/default/pages/index/index.css | 54 + .../src/main/js/default/pages/index/index.hml | 87 + .../src/main/js/default/pages/index/index.js | 38 + .../default/pages/input/ButtonA028/index.css | 56 + .../default/pages/input/ButtonA028/index.hml | 26 + .../default/pages/input/ButtonA028/index.js | 46 + .../default/pages/input/ButtonB023/index.css | 45 + .../default/pages/input/ButtonB023/index.hml | 27 + .../default/pages/input/ButtonB023/index.js | 52 + .../default/pages/input/ButtonB30/index.css | 99 + .../default/pages/input/ButtonB30/index.hml | 53 + .../js/default/pages/input/ButtonB30/index.js | 75 + .../pages/input/CheckboxA029/index.css | 50 + .../pages/input/CheckboxA029/index.hml | 29 + .../default/pages/input/CheckboxA029/index.js | 44 + .../pages/input/CheckboxB025/index.css | 51 + .../pages/input/CheckboxB025/index.hml | 24 + .../default/pages/input/CheckboxB025/index.js | 32 + .../pages/input/CheckboxE026/index.css | 52 + .../pages/input/CheckboxE026/index.hml | 26 + .../default/pages/input/CheckboxE026/index.js | 45 + .../pages/input/CheckboxE027/index.css | 50 + .../pages/input/CheckboxE027/index.hml | 24 + .../default/pages/input/CheckboxE027/index.js | 30 + .../pages/input/InputEventTest024/index.css | 52 + .../pages/input/InputEventTest024/index.hml | 25 + .../pages/input/InputEventTest024/index.js | 33 + .../pages/input/RadioEventTest031/index.css | 78 + .../pages/input/RadioEventTest031/index.hml | 49 + .../pages/input/RadioEventTest031/index.js | 33 + .../main/js/default/pages/lifecycle/index.css | 30 + .../main/js/default/pages/lifecycle/index.hml | 27 + .../main/js/default/pages/lifecycle/index.js | 37 + .../default/pages/list-item/item1/index.css | 18 + .../default/pages/list-item/item1/index.hml | 38 + .../js/default/pages/list-item/item1/index.js | 24 + .../default/pages/list-item/item2/index.css | 18 + .../default/pages/list-item/item2/index.hml | 53 + .../js/default/pages/list-item/item2/index.js | 24 + .../default/pages/list-item/item3/index.css | 18 + .../default/pages/list-item/item3/index.hml | 34 + .../js/default/pages/list-item/item3/index.js | 27 + .../default/pages/list-item/item4/index.css | 18 + .../default/pages/list-item/item4/index.hml | 34 + .../js/default/pages/list-item/item4/index.js | 27 + .../js/default/pages/list/list1/index.css | 18 + .../js/default/pages/list/list1/index.hml | 30 + .../main/js/default/pages/list/list1/index.js | 32 + .../js/default/pages/list/list2/index.css | 18 + .../js/default/pages/list/list2/index.hml | 64 + .../main/js/default/pages/list/list2/index.js | 65 + .../pages/picker_view/attr006/index.hml | 43 + .../pages/picker_view/attr006/index.js | 23 + .../pages/picker_view/attr007/index.hml | 42 + .../pages/picker_view/attr007/index.js | 23 + .../pages/picker_view/attr008/index.hml | 43 + .../pages/picker_view/attr008/index.js | 23 + .../pages/picker_view/bind001/index.hml | 44 + .../pages/picker_view/bind001/index.js | 38 + .../pages/picker_view/bind002/index.hml | 45 + .../pages/picker_view/bind002/index.js | 36 + .../pages/picker_view/bind003/index.hml | 43 + .../pages/picker_view/bind003/index.js | 29 + .../pages/picker_view/bind004/index.hml | 44 + .../pages/picker_view/bind004/index.js | 35 + .../pages/picker_view/event001/index.hml | 43 + .../pages/picker_view/event001/index.js | 26 + .../pages/picker_view/event002/index.css | 22 + .../pages/picker_view/event002/index.hml | 44 + .../pages/picker_view/event002/index.js | 26 + .../pages/picker_view/event003/index.hml | 42 + .../pages/picker_view/event003/index.js | 23 + .../pages/picker_view/event004/index.css | 22 + .../pages/picker_view/event004/index.hml | 43 + .../pages/picker_view/event004/index.js | 23 + .../pages/resource/resource005/index.css | 14 + .../pages/resource/resource005/index.hml | 38 + .../pages/resource/resource005/index.js | 21 + .../pages/resource/resource007/index.css | 14 + .../pages/resource/resource007/index.hml | 38 + .../pages/resource/resource007/index.js | 21 + .../main/js/default/pages/router/01/index.css | 41 + .../main/js/default/pages/router/01/index.hml | 39 + .../main/js/default/pages/router/01/index.js | 36 + .../main/js/default/pages/router/02/index.css | 41 + .../main/js/default/pages/router/02/index.hml | 31 + .../main/js/default/pages/router/02/index.js | 43 + .../main/js/default/pages/router/03/index.css | 36 + .../main/js/default/pages/router/03/index.hml | 34 + .../main/js/default/pages/router/03/index.js | 30 + .../main/js/default/pages/router/04/index.css | 41 + .../main/js/default/pages/router/04/index.hml | 36 + .../main/js/default/pages/router/04/index.js | 29 + .../js/default/pages/router/page2/page2.css | 24 + .../js/default/pages/router/page2/page2.hml | 25 + .../js/default/pages/router/page2/page2.js | 25 + .../js/default/pages/router/page3/page3.css | 24 + .../js/default/pages/router/page3/page3.hml | 24 + .../js/default/pages/router/page3/page3.js | 21 + .../js/default/pages/scroll/scroll1/index.css | 18 + .../js/default/pages/scroll/scroll1/index.hml | 21 + .../js/default/pages/scroll/scroll1/index.js | 21 + .../js/default/pages/scroll/scroll2/index.css | 18 + .../js/default/pages/scroll/scroll2/index.hml | 21 + .../js/default/pages/scroll/scroll2/index.js | 21 + .../js/default/pages/scroll/scroll3/index.css | 18 + .../js/default/pages/scroll/scroll3/index.hml | 21 + .../js/default/pages/scroll/scroll3/index.js | 21 + .../js/default/pages/scroll/scroll4/index.css | 18 + .../js/default/pages/scroll/scroll4/index.hml | 21 + .../js/default/pages/scroll/scroll4/index.js | 21 + .../js/default/pages/scroll/scroll5/index.css | 18 + .../js/default/pages/scroll/scroll5/index.hml | 22 + .../js/default/pages/scroll/scroll5/index.js | 23 + .../js/default/pages/scroll/scroll6/index.css | 18 + .../js/default/pages/scroll/scroll6/index.hml | 22 + .../js/default/pages/scroll/scroll6/index.js | 23 + .../pages/style/StyleBaseTest001/index.css | 60 + .../pages/style/StyleBaseTest001/index.hml | 35 + .../pages/style/StyleBaseTest001/index.js | 49 + .../default/pages/swiper/SwiperA06/index.css | 14 + .../default/pages/swiper/SwiperA06/index.hml | 52 + .../default/pages/swiper/SwiperA06/index.js | 27 + .../default/pages/swiper/SwiperA15/index.css | 14 + .../default/pages/swiper/SwiperA15/index.hml | 51 + .../default/pages/swiper/SwiperA15/index.js | 29 + .../default/pages/swiper/SwiperA16/index.css | 14 + .../default/pages/swiper/SwiperA16/index.hml | 46 + .../default/pages/swiper/SwiperA16/index.js | 24 + .../default/pages/swiper/SwiperA17/index.css | 14 + .../default/pages/swiper/SwiperA17/index.hml | 50 + .../default/pages/swiper/SwiperA17/index.js | 24 + .../default/pages/swiper/SwiperA18/index.css | 14 + .../default/pages/swiper/SwiperA18/index.hml | 50 + .../default/pages/swiper/SwiperA18/index.js | 25 + .../default/pages/swiper/SwiperA20/index.css | 14 + .../default/pages/swiper/SwiperA20/index.hml | 65 + .../default/pages/swiper/SwiperA20/index.js | 29 + .../default/pages/swiper/SwiperC01/index.css | 14 + .../default/pages/swiper/SwiperC01/index.hml | 49 + .../default/pages/swiper/SwiperC01/index.js | 24 + .../default/pages/swiper/SwiperC02/index.css | 14 + .../default/pages/swiper/SwiperC02/index.hml | 51 + .../default/pages/swiper/SwiperC02/index.js | 39 + .../default/pages/swiper/SwiperE01/index.css | 14 + .../default/pages/swiper/SwiperE01/index.hml | 50 + .../default/pages/swiper/SwiperE01/index.js | 25 + .../default/pages/swiper/SwiperE02/index.css | 14 + .../default/pages/swiper/SwiperE02/index.hml | 50 + .../default/pages/swiper/SwiperE02/index.js | 24 + .../default/pages/swiper/SwiperE03/index.css | 14 + .../default/pages/swiper/SwiperE03/index.hml | 67 + .../default/pages/swiper/SwiperE03/index.js | 32 + .../default/pages/swiper/SwiperS01/index.css | 14 + .../default/pages/swiper/SwiperS01/index.hml | 52 + .../default/pages/swiper/SwiperS01/index.js | 24 + .../default/pages/swiper/SwiperS02/index.css | 14 + .../default/pages/swiper/SwiperS02/index.hml | 50 + .../default/pages/swiper/SwiperS02/index.js | 24 + .../width_radio_value_test010/index.css | 37 + .../width_radio_value_test010/index.hml | 22 + .../width_radio_value_test010/index.js | 40 + .../width_switch_value_test009/index.css | 36 + .../width_switch_value_test009/index.hml | 22 + .../width_switch_value_test009/index.js | 41 + .../default/pages/switch/SwitchA04/index.css | 14 + .../default/pages/switch/SwitchA04/index.hml | 30 + .../default/pages/switch/SwitchA04/index.js | 24 + .../default/pages/switch/SwitchE01/index.css | 14 + .../default/pages/switch/SwitchE01/index.hml | 30 + .../default/pages/switch/SwitchE01/index.js | 24 + .../default/pages/switch/SwitchE02/index.css | 14 + .../default/pages/switch/SwitchE02/index.hml | 30 + .../default/pages/switch/SwitchE02/index.js | 24 + .../default/pages/switch/SwitchE03/index.css | 14 + .../default/pages/switch/SwitchE03/index.hml | 40 + .../default/pages/switch/SwitchE03/index.js | 28 + .../default/pages/switch/SwitchE04/index.css | 14 + .../default/pages/switch/SwitchE04/index.hml | 40 + .../default/pages/switch/SwitchE04/index.js | 28 + .../default/pages/switch/SwitchS01/index.css | 14 + .../default/pages/switch/SwitchS01/index.hml | 28 + .../default/pages/switch/SwitchS01/index.js | 18 + .../default/pages/switch/SwitchS02/index.css | 14 + .../default/pages/switch/SwitchS02/index.hml | 28 + .../default/pages/switch/SwitchS02/index.js | 18 + .../src/main/res/drawable/icon.png | Bin 0 -> 10591 bytes .../src/main/res/drawable/icon_small.png | Bin 0 -> 6371 bytes .../test_app/ui_manual_test/config.json | 148 ++ .../ui_manual_test/src/main/js/default/app.js | 23 + .../src/main/js/default/common/A094_051.png | Bin 0 -> 3200 bytes .../src/main/js/default/common/A094_052.png | Bin 0 -> 2015 bytes .../src/main/js/default/common/A094_053.png | Bin 0 -> 2834 bytes .../src/main/js/default/common/A094_054.png | Bin 0 -> 2969 bytes .../src/main/js/default/common/A094_055.png | Bin 0 -> 2453 bytes .../src/main/js/default/common/A094_056.png | Bin 0 -> 2752 bytes .../src/main/js/default/common/A094_057.png | Bin 0 -> 3053 bytes .../src/main/js/default/common/A094_058.png | Bin 0 -> 2422 bytes .../src/main/js/default/common/A094_059.png | Bin 0 -> 3256 bytes .../src/main/js/default/common/A094_060.png | Bin 0 -> 3161 bytes .../src/main/js/default/common/A094_061.png | Bin 0 -> 3463 bytes .../src/main/js/default/common/A094_062.png | Bin 0 -> 2334 bytes .../src/main/js/default/common/A094_063.png | Bin 0 -> 3045 bytes .../src/main/js/default/common/A094_064.png | Bin 0 -> 3128 bytes .../src/main/js/default/common/A094_065.png | Bin 0 -> 2684 bytes .../src/main/js/default/common/A094_066.png | Bin 0 -> 3028 bytes .../src/main/js/default/common/A094_067.png | Bin 0 -> 3480 bytes .../src/main/js/default/common/goAhead.png | Bin 0 -> 615 bytes .../src/main/js/default/common/icon.png | Bin 0 -> 10591 bytes .../src/main/js/default/common/js/event.js | 33 + .../src/main/js/default/common/js/general.js | 101 + .../src/main/js/default/common/js/list.js | 32 + .../src/main/js/default/common/js/swiper.js | 17 + .../src/main/js/default/common/left.png | Bin 0 -> 597 bytes .../src/main/js/default/common/music_next.png | Bin 0 -> 1166 bytes .../src/main/js/default/common/music_play.png | Bin 0 -> 1720 bytes .../src/main/js/default/common/music_prev.png | Bin 0 -> 1195 bytes .../src/main/js/default/common/nextRow.png | Bin 0 -> 955 bytes .../src/main/js/default/common/preRow.png | Bin 0 -> 1130 bytes .../src/main/js/default/common/right.png | Bin 0 -> 746 bytes .../js/default/pages/async/async001/index.hml | 22 + .../js/default/pages/async/async001/index.js | 50 + .../pages/base/JSHeapOverFlow001/index.css | 57 + .../pages/base/JSHeapOverFlow001/index.hml | 26 + .../pages/base/JSHeapOverFlow001/index.js | 24 + .../pages/base/PercentSupport/index.css | 45 + .../pages/base/PercentSupport/index.hml | 46 + .../pages/base/PercentSupport/index.js | 72 + .../pages/base/VersionCheck001/index.css | 56 + .../pages/base/VersionCheck001/index.hml | 32 + .../pages/base/VersionCheck001/index.js | 40 + .../default/pages/camera/camera001/index.hml | 25 + .../default/pages/camera/camera001/index.js | 39 + .../default/pages/camera/camera002/index.hml | 25 + .../default/pages/camera/camera002/index.js | 27 + .../default/pages/camera/camera003/index.hml | 25 + .../default/pages/camera/camera003/index.js | 27 + .../default/pages/camera/camera004/index.hml | 25 + .../default/pages/camera/camera004/index.js | 26 + .../js/default/pages/deviceInfo/index.css | 29 + .../js/default/pages/deviceInfo/index.hml | 32 + .../main/js/default/pages/deviceInfo/index.js | 62 + .../js/default/pages/dfx/assist1/index.css | 47 + .../js/default/pages/dfx/assist1/index.hml | 25 + .../js/default/pages/dfx/assist1/index.js | 29 + .../js/default/pages/dfx/assist2/index.css | 47 + .../js/default/pages/dfx/assist2/index.hml | 25 + .../js/default/pages/dfx/assist2/index.js | 29 + .../js/default/pages/dfx/assist3/index.css | 47 + .../js/default/pages/dfx/assist3/index.hml | 25 + .../js/default/pages/dfx/assist3/index.js | 29 + .../main/js/default/pages/dfx/dfx1/index.css | 25 + .../main/js/default/pages/dfx/dfx1/index.hml | 44 + .../main/js/default/pages/dfx/dfx1/index.js | 36 + .../main/js/default/pages/dfx/dfx2/index.css | 25 + .../main/js/default/pages/dfx/dfx2/index.hml | 45 + .../main/js/default/pages/dfx/dfx2/index.js | 36 + .../main/js/default/pages/dfx/dfx3/index.css | 25 + .../main/js/default/pages/dfx/dfx3/index.hml | 45 + .../main/js/default/pages/dfx/dfx3/index.js | 36 + .../main/js/default/pages/dfx/dfx4/index.css | 22 + .../main/js/default/pages/dfx/dfx4/index.hml | 46 + .../main/js/default/pages/dfx/dfx4/index.js | 50 + .../main/js/default/pages/dfx/dfx5/index.css | 22 + .../main/js/default/pages/dfx/dfx5/index.hml | 46 + .../main/js/default/pages/dfx/dfx5/index.js | 49 + .../main/js/default/pages/dfx/dfx6/index.css | 23 + .../main/js/default/pages/dfx/dfx6/index.hml | 48 + .../main/js/default/pages/dfx/dfx6/index.js | 45 + .../main/js/default/pages/dfx/dfx7/index.css | 25 + .../main/js/default/pages/dfx/dfx7/index.hml | 42 + .../main/js/default/pages/dfx/dfx7/index.js | 36 + .../default/pages/dialog/dialog001/index.hml | 31 + .../default/pages/dialog/dialog001/index.js | 233 ++ .../js/default/pages/event/cancel/index.css | 22 + .../js/default/pages/event/cancel/index.hml | 49 + .../js/default/pages/event/cancel/index.js | 31 + .../js/default/pages/event/click/index.css | 22 + .../js/default/pages/event/click/index.hml | 48 + .../js/default/pages/event/click/index.js | 30 + .../main/js/default/pages/event/end/index.css | 22 + .../main/js/default/pages/event/end/index.hml | 49 + .../main/js/default/pages/event/end/index.js | 31 + .../main/js/default/pages/event/key/index.css | 22 + .../main/js/default/pages/event/key/index.hml | 43 + .../main/js/default/pages/event/key/index.js | 40 + .../default/pages/event/longpress/index.css | 22 + .../default/pages/event/longpress/index.hml | 49 + .../js/default/pages/event/longpress/index.js | 32 + .../js/default/pages/event/move/index.css | 22 + .../js/default/pages/event/move/index.hml | 50 + .../main/js/default/pages/event/move/index.js | 41 + .../js/default/pages/event/start/index.css | 22 + .../js/default/pages/event/start/index.hml | 49 + .../js/default/pages/event/start/index.js | 32 + .../js/default/pages/file/file01/index.hml | 62 + .../js/default/pages/file/file01/index.js | 72 + .../js/default/pages/file/file02/index.hml | 62 + .../js/default/pages/file/file02/index.js | 73 + .../js/default/pages/file/file03/index.hml | 56 + .../js/default/pages/file/file03/index.js | 55 + .../js/default/pages/file/file04/index.hml | 56 + .../js/default/pages/file/file04/index.js | 56 + .../js/default/pages/file/file05/index.hml | 56 + .../js/default/pages/file/file05/index.js | 56 + .../js/default/pages/file/file06/index.hml | 53 + .../js/default/pages/file/file06/index.js | 41 + .../js/default/pages/file/file07/index.hml | 53 + .../js/default/pages/file/file07/index.js | 40 + .../default/pages/image-animator/01/index.hml | 47 + .../default/pages/image-animator/01/index.js | 24 + .../default/pages/image-animator/02/index.hml | 58 + .../default/pages/image-animator/02/index.js | 33 + .../default/pages/image-animator/03/index.hml | 52 + .../default/pages/image-animator/03/index.js | 27 + .../default/pages/image-animator/04/index.css | 18 + .../default/pages/image-animator/04/index.hml | 81 + .../default/pages/image-animator/04/index.js | 50 + .../default/pages/image-animator/05/index.hml | 57 + .../default/pages/image-animator/05/index.js | 39 + .../default/pages/image-animator/06/index.css | 46 + .../default/pages/image-animator/06/index.hml | 61 + .../default/pages/image-animator/06/index.js | 64 + .../src/main/js/default/pages/index/index.css | 54 + .../src/main/js/default/pages/index/index.hml | 208 ++ .../src/main/js/default/pages/index/index.js | 41 + .../default/pages/input/ButtonA30/index.css | 61 + .../default/pages/input/ButtonA30/index.hml | 30 + .../js/default/pages/input/ButtonA30/index.js | 21 + .../pages/input/CheckboxImage31/index.css | 61 + .../pages/input/CheckboxImage31/index.hml | 23 + .../pages/input/CheckboxImage31/index.js | 20 + .../default/pages/list-item/item5/item5.css | 18 + .../default/pages/list-item/item5/item5.hml | 34 + .../js/default/pages/list-item/item5/item5.js | 42 + .../js/default/pages/list/list3/list3.css | 18 + .../js/default/pages/list/list3/list3.hml | 46 + .../main/js/default/pages/list/list3/list3.js | 28 + .../js/default/pages/list/list4/list4.css | 18 + .../js/default/pages/list/list4/list4.hml | 46 + .../main/js/default/pages/list/list4/list4.js | 28 + .../js/default/pages/list/list5/list5.css | 18 + .../js/default/pages/list/list5/list5.hml | 32 + .../main/js/default/pages/list/list5/list5.js | 35 + .../js/default/pages/list/list6/list6.css | 18 + .../js/default/pages/list/list6/list6.hml | 32 + .../main/js/default/pages/list/list6/list6.js | 35 + .../js/default/pages/list/list7/list7.css | 18 + .../js/default/pages/list/list7/list7.hml | 34 + .../main/js/default/pages/list/list7/list7.js | 33 + .../js/default/pages/list/list8/list8.css | 18 + .../js/default/pages/list/list8/list8.hml | 34 + .../main/js/default/pages/list/list8/list8.js | 33 + .../pages/marquee/marquee1/marquee1.css | 17 + .../pages/marquee/marquee1/marquee1.hml | 48 + .../pages/marquee/marquee1/marquee1.js | 33 + .../pages/marquee/marquee2/marquee2.css | 17 + .../pages/marquee/marquee2/marquee2.hml | 47 + .../pages/marquee/marquee2/marquee2.js | 23 + .../pages/marquee/marquee3/marquee3.css | 17 + .../pages/marquee/marquee3/marquee3.hml | 47 + .../pages/marquee/marquee3/marquee3.js | 23 + .../pages/marquee/marquee4/marquee4.css | 17 + .../pages/marquee/marquee4/marquee4.hml | 47 + .../pages/marquee/marquee4/marquee4.js | 24 + .../pages/marquee/marquee5/marquee5.css | 17 + .../pages/marquee/marquee5/marquee5.hml | 47 + .../pages/marquee/marquee5/marquee5.js | 23 + .../js/default/pages/opacity/01/index.css | 63 + .../js/default/pages/opacity/01/index.hml | 32 + .../main/js/default/pages/opacity/01/index.js | 20 + .../js/default/pages/opacity/02/index.css | 37 + .../js/default/pages/opacity/02/index.hml | 34 + .../main/js/default/pages/opacity/02/index.js | 21 + .../js/default/pages/opacity/03/index.css | 41 + .../js/default/pages/opacity/03/index.hml | 37 + .../main/js/default/pages/opacity/03/index.js | 20 + .../js/default/pages/qrcode/index/index.css | 18 + .../js/default/pages/qrcode/index/index.hml | 26 + .../js/default/pages/qrcode/index/index.js | 59 + .../pages/resource/resource001/index.css | 14 + .../pages/resource/resource001/index.hml | 38 + .../pages/resource/resource001/index.js | 23 + .../pages/resource/resource002/index.css | 14 + .../pages/resource/resource002/index.hml | 38 + .../pages/resource/resource002/index.js | 24 + .../pages/resource/resource003/index.css | 14 + .../pages/resource/resource003/index.hml | 38 + .../pages/resource/resource003/index.js | 24 + .../pages/resource/resource004/index.css | 14 + .../pages/resource/resource004/index.hml | 38 + .../pages/resource/resource004/index.js | 24 + .../pages/resource/resource006/index.css | 14 + .../pages/resource/resource006/index.hml | 41 + .../pages/resource/resource006/index.js | 23 + .../js/default/pages/slider/index/index.css | 64 + .../js/default/pages/slider/index/index.hml | 50 + .../js/default/pages/slider/index/index.js | 139 + .../js/default/pages/slider/second/second.css | 67 + .../js/default/pages/slider/second/second.hml | 39 + .../js/default/pages/slider/second/second.js | 70 + .../js/default/pages/slider/third/index.css | 34 + .../js/default/pages/slider/third/index.hml | 43 + .../js/default/pages/slider/third/index.js | 43 + .../default/pages/storage/storage01/index.hml | 50 + .../default/pages/storage/storage01/index.js | 56 + .../default/pages/storage/storage02/index.hml | 56 + .../default/pages/storage/storage02/index.js | 56 + .../default/pages/storage/storage03/index.hml | 68 + .../default/pages/storage/storage03/index.js | 102 + .../default/pages/swiper/SwiperA07/index.css | 14 + .../default/pages/swiper/SwiperA07/index.hml | 51 + .../default/pages/swiper/SwiperA07/index.js | 25 + .../default/pages/swiper/SwiperA08/index.css | 14 + .../default/pages/swiper/SwiperA08/index.hml | 51 + .../default/pages/swiper/SwiperA08/index.js | 26 + .../default/pages/swiper/SwiperA09/index.css | 14 + .../default/pages/swiper/SwiperA09/index.hml | 51 + .../default/pages/swiper/SwiperA09/index.js | 26 + .../default/pages/swiper/SwiperA10/index.css | 14 + .../default/pages/swiper/SwiperA10/index.hml | 52 + .../default/pages/swiper/SwiperA10/index.js | 26 + .../default/pages/swiper/SwiperA11/index.css | 14 + .../default/pages/swiper/SwiperA11/index.hml | 51 + .../default/pages/swiper/SwiperA11/index.js | 26 + .../default/pages/swiper/SwiperA12/index.css | 14 + .../default/pages/swiper/SwiperA12/index.hml | 52 + .../default/pages/swiper/SwiperA12/index.js | 29 + .../js/default/pages/text/text001/index.css | 103 + .../js/default/pages/text/text001/index.hml | 57 + .../js/default/pages/text/text001/index.js | 135 + .../js/default/pages/text/text002/index.css | 87 + .../js/default/pages/text/text002/index.hml | 55 + .../js/default/pages/text/text002/index.js | 108 + .../pages/timer/clearInterval08/index.css | 52 + .../pages/timer/clearInterval08/index.hml | 25 + .../pages/timer/clearInterval08/index.js | 32 + .../pages/timer/clearInterval09/index.css | 52 + .../pages/timer/clearInterval09/index.hml | 27 + .../pages/timer/clearInterval09/index.js | 36 + .../pages/timer/setInterval02/index.css | 53 + .../pages/timer/setInterval02/index.hml | 24 + .../pages/timer/setInterval02/index.js | 34 + .../pages/timer/setInterval05/index.css | 52 + .../pages/timer/setInterval05/index.hml | 26 + .../pages/timer/setInterval05/index.js | 42 + .../pages/timer/setInterval06/index.css | 52 + .../pages/timer/setInterval06/index.hml | 24 + .../pages/timer/setInterval06/index.js | 33 + .../pages/timer/setInterval07/index.css | 52 + .../pages/timer/setInterval07/index.hml | 24 + .../pages/timer/setInterval07/index.js | 33 + .../pages/timer/setTimeout01/index.css | 53 + .../pages/timer/setTimeout01/index.hml | 24 + .../default/pages/timer/setTimeout01/index.js | 25 + .../pages/timer/setTimeout03/index.css | 53 + .../pages/timer/setTimeout03/index.hml | 24 + .../default/pages/timer/setTimeout03/index.js | 30 + .../pages/timer/setTimeout04/index.css | 52 + .../pages/timer/setTimeout04/index.hml | 26 + .../default/pages/timer/setTimeout04/index.js | 39 + .../pages/timer/timerLimit10/index.css | 52 + .../pages/timer/timerLimit10/index.hml | 23 + .../default/pages/timer/timerLimit10/index.js | 37 + .../js/default/pages/transition/01/index.css | 70 + .../js/default/pages/transition/01/index.hml | 31 + .../js/default/pages/transition/01/index.js | 25 + .../default/pages/transition/0203/index.css | 79 + .../default/pages/transition/0203/index.hml | 35 + .../js/default/pages/transition/0203/index.js | 24 + .../default/pages/transition/0405/index.css | 87 + .../default/pages/transition/0405/index.hml | 37 + .../js/default/pages/transition/0405/index.js | 24 + .../default/pages/transition/0607/index.css | 79 + .../default/pages/transition/0607/index.hml | 35 + .../js/default/pages/transition/0607/index.js | 24 + .../default/pages/transition/0809/index.css | 95 + .../default/pages/transition/0809/index.hml | 39 + .../js/default/pages/transition/0809/index.js | 24 + .../default/pages/transition/1011/index.css | 73 + .../default/pages/transition/1011/index.hml | 33 + .../js/default/pages/transition/1011/index.js | 26 + .../default/pages/transition/1213/index.css | 72 + .../default/pages/transition/1213/index.hml | 33 + .../js/default/pages/transition/1213/index.js | 26 + .../default/pages/transition/1415/index.css | 73 + .../default/pages/transition/1415/index.hml | 33 + .../js/default/pages/transition/1415/index.js | 26 + .../js/default/pages/transition/16/index.css | 73 + .../js/default/pages/transition/16/index.hml | 33 + .../js/default/pages/transition/16/index.js | 26 + .../js/default/pages/transition/17/index.css | 64 + .../js/default/pages/transition/17/index.hml | 31 + .../js/default/pages/transition/17/index.js | 25 + .../js/default/pages/transition/18/index.css | 64 + .../js/default/pages/transition/18/index.hml | 31 + .../js/default/pages/transition/18/index.js | 25 + .../js/default/pages/transition/19/index.css | 77 + .../js/default/pages/transition/19/index.hml | 33 + .../js/default/pages/transition/19/index.js | 26 + .../js/default/pages/transition/20/index.css | 55 + .../js/default/pages/transition/20/index.hml | 28 + .../js/default/pages/transition/20/index.js | 24 + .../js/default/pages/transition/21/index.css | 42 + .../js/default/pages/transition/21/index.hml | 31 + .../js/default/pages/transition/21/index.js | 37 + .../js/default/pages/video/video001/index.css | 33 + .../js/default/pages/video/video001/index.hml | 33 + .../js/default/pages/video/video001/index.js | 93 + .../src/main/res/drawable/icon.png | Bin 0 -> 10591 bytes .../src/main/res/drawable/icon_small.png | Bin 0 -> 6371 bytes test/moduletest/common/test_common.h | 31 + 1770 files changed, 58745 insertions(+), 6057 deletions(-) mode change 100755 => 100644 .clang-format mode change 100755 => 100644 .gitignore delete mode 100755 BUILD.gn create mode 100644 README.md create mode 100644 README_zh.md create mode 100755 ace_lite.gni delete mode 100644 examples/calculator/src/main/js/default/app.js delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml delete mode 100755 examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml create mode 100644 figures/JS应用开发框架.png create mode 100644 figures/framework-architecture.png create mode 100755 frameworks/BUILD.gn rename CMakeLists.txt => frameworks/CMakeLists.txt (90%) rename {examples => frameworks/examples}/airquality/src/main/config.json (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/app.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/common/cloud.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/common/cloud_green.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/common/cloud_red.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/common/cloud_yellow.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/common/week.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/i18n/en-US.json (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/i18n/zh-CN.json (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/detail/detail.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/detail/detail.hml (96%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/detail/detail.js (96%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/history/history.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/history/history.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/history/history.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/airquality/src/main/js/default/pages/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/config.json (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/app.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/common/A016_017.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/A016_018.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/A016_019.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/A016_020.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/A016_021.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/add_alarm.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/common/alarmClock.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/common/back.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/cancel.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/common/ic_clock_btn_off.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/ic_clock_btn_on.png (100%) rename {examples => frameworks/examples}/alarm/src/main/js/default/common/jiantou.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/common/postpone.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/editAlarm/edit_alarm.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/editAlarm/edit_alarm.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/index/index.js (95%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/timeArrive/time_arrive.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/timeArrive/time_arrive.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/js/default/pages/timeArrive/time_arrive.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/alarm/src/main/resources/base/media/icon.png (100%) rename {examples => frameworks/examples}/alarm/src/main/resources/base/media/icon_small.png (100%) create mode 100644 frameworks/examples/calculator/src/main/js/default/app.js rename {examples => frameworks/examples}/calculator/src/main/js/default/common/calculator.js (83%) rename {examples => frameworks/examples}/calculator/src/main/js/default/common/ic_back.png (100%) rename {examples => frameworks/examples}/calculator/src/main/js/default/common/ic_cal_delete.png (100%) rename {examples => frameworks/examples}/calculator/src/main/js/default/common/ic_cal_devide.png (100%) rename {examples => frameworks/examples}/calculator/src/main/js/default/common/ic_cal_equal.png (100%) rename {examples => frameworks/examples}/calculator/src/main/js/default/common/ic_cal_minus.png (100%) rename {examples => frameworks/examples}/calculator/src/main/js/default/common/ic_cal_multiply.png (100%) rename {examples => frameworks/examples}/calculator/src/main/js/default/common/ic_cal_plus.png (100%) rename {examples => frameworks/examples}/calculator/src/main/js/default/pages/index/index.css (68%) rename {examples => frameworks/examples}/calculator/src/main/js/default/pages/index/index.hml (82%) rename {examples => frameworks/examples}/calculator/src/main/js/default/pages/index/index.js (73%) rename {examples => frameworks/examples}/music/src/main/config.json (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/app.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_back.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_list.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_listcycle.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_listorder.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_mode.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_next.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_pause.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_play.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_previous.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_shuffle.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/common/ic_music_singlecycle.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/pages/index/index.css (99%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/pages/index/index.hml (95%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/js/default/pages/index/index.js (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/resources/base/media/icon.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/music/src/main/resources/base/media/icon_small.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/config.json (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/app.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/chart.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/general.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/image.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/input.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/list.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/marquee.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/picker_view.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/progress.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/stack.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/swiper.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/js/text.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/common/leftHead.png (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation1/animation1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation1/animation1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation2/animation2.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation2/animation2.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation3/animation3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation3/animation3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation4/animation4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation4/animation4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation5/animation5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation5/animation5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation6/animation6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation6/animation6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation7/animation7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation7/animation7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index1/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index1/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index1/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index2/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index2/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/animation/index2/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas1/index.css (97%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js (100%) mode change 100755 => 100644 rename {examples/showcase/src/main/js/default/pages/component/canvas/canvas3 => frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2}/index.css (97%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js (100%) mode change 100755 => 100644 rename {examples/showcase/src/main/js/default/pages/component/canvas/canvas2 => frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3}/index.css (97%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas4/index.css (92%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas4/index.hml (53%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas5/index.css (97%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas6/index.css (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas6/index.hml (53%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas7/index.css (97%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas8/index.css (97%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas9/index.css (92%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas9/index.hml (52%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/index/index.hml (75%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.hml (70%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.css (100%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.css (100%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.css (100%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.css (100%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.css (100%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.hml (92%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.hml (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div1/div1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div1/div1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div1/div1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div10/div10.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div10/div10.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div10/div10.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div11/div11.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div11/div11.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div11/div11.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div12/div12.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div12/div12.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div12/div12.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div2/div2.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div2/div2.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div2/div2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div3/div3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div3/div3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div3/div3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div4/div4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div4/div4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div4/div4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div5/div5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div5/div5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div5/div5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div6/div6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div6/div6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div6/div6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div7/div7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div7/div7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div7/div7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div8/div8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div8/div8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div8/div8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div9/div9.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div9/div9.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/div9/div9.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image1/image1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image1/image1.hml (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image1/image1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image2/image2.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image2/image2.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image2/image2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image3/image3.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image3/image3.hml (90%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image3/image3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image4/image4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image4/image4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image4/image4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image5/image5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image5/image5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image5/image5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image6/image6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image6/image6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image6/image6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image7/image7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image7/image7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image7/image7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image8/image8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image8/image8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/image8/image8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/image/indexStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/baseIndex/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/baseIndex/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/baseIndex/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/containerIndex/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/containerIndex/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/containerIndex/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/formIndex/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/formIndex/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/formIndex/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/otherIndex/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/otherIndex/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/index/otherIndex/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/attr/attr.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/event/event.css (95%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/style/style.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/style/style.hml (99%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/button/style/style.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.css (95%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/event/event.css (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js (100%) mode change 100755 => 100644 rename {examples/showcase/src/main/js/default/pages/component/input/radio => frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox}/style/style.css (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/style/style.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/attr/attr.css (95%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/event/event.css (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/index/index.js (100%) mode change 100755 => 100644 rename {examples/showcase/src/main/js/default/pages/component/input/checkbox => frameworks/examples/showcase/src/main/js/default/pages/component/input/radio}/style/style.css (93%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/style/style.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/input/radio/style/style.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.hml (98%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.hml (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list1/list1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list1/list1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list1/list1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list10/list10.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list10/list10.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list10/list10.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list11/list11.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list11/list11.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list11/list11.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list12/list12.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list12/list12.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list12/list12.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list13/list13.css (97%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list13/list13.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list2/list2.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list2/list2.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list2/list2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list3/list3.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list3/list3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list3/list3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list4/list4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list4/list4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list4/list4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list5/list5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list5/list5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list5/list5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list6/list6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list6/list6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list6/list6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list7/list7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list7/list7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list7/list7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list8/list8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list8/list8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list8/list8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list9/list9.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list9/list9.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/list/list/list9/list9.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/attr/attr.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.css (93%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/event/event.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.hml (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.hml (92%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.hml (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.hml (92%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.hml (89%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/event/event.css (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/style/style.css (89%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/style/style.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/circle/style/style.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.hml (97%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.css (92%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/progress/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/attr/attr.css (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/event/event.css (95%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/style/style.css (95%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/style/style.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/slider/style/style.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexEffect/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexEffect/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack1/stack1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack1/stack1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack2/stack2.css (94%) mode change 100755 => 100644 create mode 100644 frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack3/stack3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack3/stack3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack4/stack4.css (94%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack4/stack4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack5/stack5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack5/stack5.hml (91%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack6/stack6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack6/stack6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack7/stack7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack7/stack7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack8/stack8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack8/stack8.hml (98%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/stack/stack8/stack8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexAttr/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexAttr/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexAttr/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexEvent/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexEvent/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexEvent/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexSpecSet/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexSpecSet/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexSpecSet/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexStyle/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexStyle/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/indexStyle/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper1/swiper1.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper1/swiper1.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper1/swiper1.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper10/swiper10.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper10/swiper10.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper10/swiper10.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper11/swiper11.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper11/swiper11.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper11/swiper11.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper2/swiper2.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper2/swiper2.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper2/swiper2.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper3/swiper3.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper3/swiper3.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper3/swiper3.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper4/swiper4.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper4/swiper4.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper4/swiper4.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper5/swiper5.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper5/swiper5.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper5/swiper5.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper6/swiper6.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper6/swiper6.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper6/swiper6.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper7/swiper7.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper7/swiper7.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper7/swiper7.js (93%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper8/swiper8.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper8/swiper8.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper8/swiper8.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper9/swiper9.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper9/swiper9.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/swiper/swiper9/swiper9.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/attr/attr.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/event/event.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/style/style.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/style/style.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/switch/style/style.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/attr/attr.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/attr/attr.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/attr/attr.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/commonStyle/commonStyle.css (93%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/commonStyle/commonStyle.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/commonStyle/commonStyle.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/event/event.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/event/event.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/event/event.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/index/index.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/index/index.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/specStyle/specStyle.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/specStyle/specStyle.hml (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/component/text/specStyle/specStyle.js (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/index/index.css (100%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/index/index.hml (90%) mode change 100755 => 100644 rename {examples => frameworks/examples}/showcase/src/main/js/default/pages/index/index.js (92%) mode change 100755 => 100644 rename {include => frameworks/include}/base/dft_impl.h (72%) rename {include => frameworks/include}/base/js_config.h (72%) mode change 100755 => 100644 rename {include => frameworks/include}/base/js_debugger_config.h (75%) mode change 100755 => 100644 create mode 100644 frameworks/include/base/product_adapter.h rename {include => frameworks/include}/context/js_ability.h (85%) rename {include => frameworks/include}/resource/video_panel_image_res.h (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/.babelrc (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/.editorconfig (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/.eslintignore (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/.eslintrc.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/.gitignore (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/.prettierrc (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/.size-snapshot.json (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/contribution.md (93%) rename {packages => frameworks/packages}/runtime-core/package-lock.json (100%) rename {packages => frameworks/packages}/runtime-core/package.json (100%) rename {packages => frameworks/packages}/runtime-core/scripts/build.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/scripts/configs.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/src/__test__/index.test.js (100%) rename {packages => frameworks/packages}/runtime-core/src/core/index.js (100%) rename {packages => frameworks/packages}/runtime-core/src/index.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/src/observer/index.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/src/observer/observer.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/src/observer/subject.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/src/observer/utils.js (100%) mode change 100755 => 100644 rename {packages => frameworks/packages}/runtime-core/src/profiler/index.js (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/animation/transition_impl.cpp (80%) rename {src => frameworks/src}/core/animation/transition_impl.h (94%) rename {src => frameworks/src}/core/async/js_async_work.cpp (98%) rename {src => frameworks/src}/core/async/message_queue_utils.cpp (100%) mode change 100755 => 100644 create mode 100644 frameworks/src/core/base/ace_event_id.h rename {src => frameworks/src}/core/base/ace_log.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/base/ace_log.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/base/ace_mem_base.cpp rename {src => frameworks/src}/core/base/ace_version.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/base/async_task_manager.cpp create mode 100755 frameworks/src/core/base/async_task_manager.h create mode 100644 frameworks/src/core/base/cache/cache_config.h create mode 100644 frameworks/src/core/base/cache/cache_manager.cpp create mode 100644 frameworks/src/core/base/cache/cache_manager.h rename {src/core/async => frameworks/src/core/base/cache/test/unittest}/BUILD.gn (53%) create mode 100755 frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.cpp create mode 100755 frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.h rename {src => frameworks/src}/core/base/dft_impl.cpp (77%) create mode 100644 frameworks/src/core/base/dfx_assist.cpp create mode 100644 frameworks/src/core/base/dfx_assist.h create mode 100755 frameworks/src/core/base/event_util.cpp create mode 100755 frameworks/src/core/base/event_util.h rename {src => frameworks/src}/core/base/framework_min_bc.h (99%) mode change 100755 => 100644 rename {src => frameworks/src}/core/base/framework_min_js.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/base/js_debugger_config.cpp (76%) mode change 100755 => 100644 rename {src => frameworks/src}/core/base/js_fwk_common.cpp (83%) rename {src => frameworks/src}/core/base/js_fwk_common.h (93%) rename {src => frameworks/src}/core/base/key_parser.cpp (91%) rename {src => frameworks/src}/core/base/key_parser.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/base/keys.h (91%) create mode 100755 frameworks/src/core/base/lazy_load_manager.cpp create mode 100755 frameworks/src/core/base/lazy_load_manager.h create mode 100755 frameworks/src/core/base/lazy_load_watcher.cpp create mode 100755 frameworks/src/core/base/lazy_load_watcher.h create mode 100755 frameworks/src/core/base/locale_util.cpp create mode 100644 frameworks/src/core/base/locale_util.h create mode 100644 frameworks/src/core/base/mem_proc.cpp create mode 100644 frameworks/src/core/base/mem_proc.h rename {src => frameworks/src}/core/base/memory_heap.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/base/non_copyable.h (100%) mode change 100755 => 100644 create mode 100644 frameworks/src/core/base/number_parser.cpp create mode 100644 frameworks/src/core/base/number_parser.h create mode 100644 frameworks/src/core/base/product_adapter.cpp rename {src => frameworks/src}/core/base/string_util.cpp (91%) mode change 100644 => 100755 rename {src => frameworks/src}/core/base/string_util.h (100%) rename {src => frameworks/src}/core/base/time_util.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/base/time_util.h (88%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/analog_clock_component.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/analog_clock_component.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/camera_component.cpp (87%) rename {src => frameworks/src}/core/components/camera_component.h (91%) create mode 100644 frameworks/src/core/components/canvas_component.cpp rename {src => frameworks/src}/core/components/canvas_component.h (62%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/chart_component.cpp (87%) rename {src => frameworks/src}/core/components/chart_component.h (95%) create mode 100644 frameworks/src/core/components/circle_progress_component.cpp rename src/core/components/progress_component.h => frameworks/src/core/components/circle_progress_component.h (56%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/clock_hand_component.cpp (99%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/clock_hand_component.h (98%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/component.cpp (66%) rename {src => frameworks/src}/core/components/component.h (69%) rename {src => frameworks/src}/core/components/component_factory.h (77%) create mode 100755 frameworks/src/core/components/component_utils.cpp rename {src => frameworks/src}/core/components/component_utils.h (84%) mode change 100755 => 100644 create mode 100644 frameworks/src/core/components/div_component.cpp rename {src => frameworks/src}/core/components/div_component.h (75%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/event_listener.cpp (67%) rename {src => frameworks/src}/core/components/event_listener.h (64%) create mode 100644 frameworks/src/core/components/horizon_progress_component.cpp create mode 100644 frameworks/src/core/components/horizon_progress_component.h rename {src => frameworks/src}/core/components/image_animator_component.cpp (86%) rename {src => frameworks/src}/core/components/image_animator_component.h (94%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/image_component.cpp (62%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/image_component.h (88%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/components/input_button_component.cpp rename src/core/components/input_component.h => frameworks/src/core/components/input_button_component.h (61%) create mode 100755 frameworks/src/core/components/input_checkbox_component.cpp create mode 100755 frameworks/src/core/components/input_checkbox_component.h create mode 100755 frameworks/src/core/components/input_radio_component.cpp create mode 100755 frameworks/src/core/components/input_radio_component.h rename {src => frameworks/src}/core/components/list_adapter.cpp (90%) rename {src => frameworks/src}/core/components/list_adapter.h (83%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/list_component.cpp (62%) rename {src => frameworks/src}/core/components/list_component.h (84%) rename {src => frameworks/src}/core/components/marquee_component.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/marquee_component.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/panel_view.cpp (98%) rename {src => frameworks/src}/core/components/panel_view.h (98%) rename {src => frameworks/src}/core/components/picker_view_component.cpp (95%) rename {src => frameworks/src}/core/components/picker_view_component.h (96%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/components/qrcode_component.cpp create mode 100755 frameworks/src/core/components/qrcode_component.h rename {src => frameworks/src}/core/components/scroll_layer.cpp (71%) rename {src => frameworks/src}/core/components/scroll_layer.h (81%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/slider_component.cpp (50%) rename {src => frameworks/src}/core/components/slider_component.h (81%) mode change 100755 => 100644 create mode 100644 frameworks/src/core/components/stack_component.cpp create mode 100644 frameworks/src/core/components/stack_component.h rename {src => frameworks/src}/core/components/swiper_component.cpp (68%) rename {src => frameworks/src}/core/components/swiper_component.h (87%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/switch_component.cpp (66%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/switch_component.h (89%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/tab_bar_component.cpp (100%) rename {src => frameworks/src}/core/components/tab_bar_component.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/tab_content_component.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/tab_content_component.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/tabs_component.cpp (98%) rename {src => frameworks/src}/core/components/tabs_component.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/components/test/unittest/BUILD.gn create mode 100755 frameworks/src/core/components/test/unittest/common/BUILD.gn create mode 100755 frameworks/src/core/components/test/unittest/common/arc_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/arc_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/div_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/div_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/input_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/input_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/list_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/marquee_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/marquee_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/opacity_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/opacity_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/percent_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/percent_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/root_component_mock.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/root_component_mock.h create mode 100755 frameworks/src/core/components/test/unittest/common/slider_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/slider_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/swiper_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/switch_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/switch_tdd_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.h create mode 100755 frameworks/src/core/components/test/unittest/common/text_tdd_test.cpp create mode 100755 frameworks/src/core/components/test/unittest/common/text_tdd_test.h rename {src => frameworks/src}/core/components/text_component.cpp (82%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/text_component.h (93%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/video_component.cpp (94%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/video_component.h (94%) rename {src => frameworks/src}/core/components/video_state_callback.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/components/video_view.cpp (93%) rename {src => frameworks/src}/core/components/video_view.h (93%) rename {src => frameworks/src}/core/context/ace_ability.cpp (90%) rename {src => frameworks/src}/core/context/ace_ability.h (100%) rename {src => frameworks/src}/core/context/ace_event_error_code.cpp (66%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/ace_event_error_code.h (86%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/fatal_handler.cpp (87%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/fatal_handler.h (83%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_ability.cpp (69%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_ability_impl.cpp (93%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_ability_impl.h (95%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_app_context.cpp (90%) rename {src => frameworks/src}/core/context/js_app_context.h (72%) rename {src => frameworks/src}/core/context/js_app_environment.cpp (88%) rename {src => frameworks/src}/core/context/js_app_environment.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_framework_raw.cpp (85%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_framework_raw.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_profiler.cpp (93%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_profiler.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_timer_list.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/context/js_timer_list.h (100%) rename {src/core/base => frameworks/src/core/context/test/unittest}/BUILD.gn (54%) create mode 100755 frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.cpp create mode 100755 frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h create mode 100755 frameworks/src/core/dialog/js_dialog.cpp create mode 100755 frameworks/src/core/dialog/js_dialog.h rename {src => frameworks/src}/core/directive/descriptor_utils.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/directive/descriptor_utils.h (98%) mode change 100755 => 100644 rename {src => frameworks/src}/core/directive/directive_watcher_callback.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/directive/directive_watcher_callback.h (94%) mode change 100755 => 100644 rename {src => frameworks/src}/core/jsi/internal/jsi_internal.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/jsi/jsi.cpp (100%) mode change 100755 => 100644 rename {src/core/directive => frameworks/src/core/jsi/test/unittest}/BUILD.gn (53%) create mode 100755 frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.cpp create mode 100755 frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.h rename {src => frameworks/src}/core/modules/app_module.cpp (98%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/app_module.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/dfx_module.cpp (91%) rename {src => frameworks/src}/core/modules/dfx_module.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/modules/dialog_module.cpp create mode 100755 frameworks/src/core/modules/dialog_module.h rename {src => frameworks/src}/core/modules/maplejs/readme.txt (100%) rename {src => frameworks/src}/core/modules/module_manager.cpp (93%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/module_manager.h (87%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/ohos_module_config.h (83%) rename {src => frameworks/src}/core/modules/presets/cjson_parser.cpp (51%) create mode 100644 frameworks/src/core/modules/presets/cjson_parser.h rename {src => frameworks/src}/core/modules/presets/console_log_impl.cpp (93%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/console_log_impl.h (87%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/console_module.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/console_module.h (100%) mode change 100755 => 100644 create mode 100644 frameworks/src/core/modules/presets/date_time_format_module.cpp create mode 100644 frameworks/src/core/modules/presets/date_time_format_module.h rename {src => frameworks/src}/core/modules/presets/feature_ability_module.cpp (90%) rename {src => frameworks/src}/core/modules/presets/feature_ability_module.h (100%) create mode 100644 frameworks/src/core/modules/presets/intl_module.cpp create mode 100644 frameworks/src/core/modules/presets/intl_module.h rename {src => frameworks/src}/core/modules/presets/jstest_module.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/jstest_module.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/localization_module.cpp (50%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/localization_module.h (94%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/modules/presets/number_format_module.cpp create mode 100644 frameworks/src/core/modules/presets/number_format_module.h rename {src => frameworks/src}/core/modules/presets/preset_module.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/preset_module.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/profiler_module.cpp (99%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/profiler_module.h (100%) rename {src => frameworks/src}/core/modules/presets/render_module.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/render_module.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/require_module.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/require_module.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/modules/presets/test/unittest/BUILD.gn create mode 100755 frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.cpp create mode 100755 frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.h create mode 100755 frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.cpp create mode 100755 frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.h rename {src => frameworks/src}/core/modules/presets/timer_module.cpp (77%) rename {src => frameworks/src}/core/modules/presets/timer_module.h (96%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/version_module.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/presets/version_module.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/router_module.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/router_module.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/sample_module.cpp (99%) mode change 100755 => 100644 rename {src => frameworks/src}/core/modules/sample_module.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/modules/test/unittest/BUILD.gn create mode 100755 frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp create mode 100755 frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h rename {src => frameworks/src}/core/resource/video_muted_image_res.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/resource/video_play_image_res.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/router/js_page_state.cpp (98%) mode change 100755 => 100644 rename {src => frameworks/src}/core/router/js_page_state.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/router/js_page_state_machine.cpp (92%) rename {src => frameworks/src}/core/router/js_page_state_machine.h (77%) mode change 100755 => 100644 rename {src => frameworks/src}/core/router/js_router.cpp (95%) rename {src => frameworks/src}/core/router/js_router.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style.cpp (95%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style.h (96%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style_item.cpp (86%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style_item.h (80%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style_list.cpp (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style_list.h (100%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style_manager.cpp (55%) rename {src => frameworks/src}/core/stylemgr/app_style_manager.h (64%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style_sheet.cpp (97%) mode change 100755 => 100644 rename {src => frameworks/src}/core/stylemgr/app_style_sheet.h (97%) mode change 100755 => 100644 create mode 100755 frameworks/src/core/stylemgr/test/unittest/BUILD.gn create mode 100755 frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.cpp create mode 100755 frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h rename {src => frameworks/src}/core/wrapper/js.cpp (74%) rename {src => frameworks/src}/core/wrapper/js.h (75%) rename {targets => frameworks/targets}/default/acelite_config.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/targets/linux/acelite_config.h rename {targets => frameworks/targets}/liteos_a/acelite_config.h (79%) rename {targets => frameworks/targets}/liteos_m/acelite_config.h (69%) rename {targets => frameworks/targets}/platform_adapter.cpp (87%) mode change 100755 => 100644 rename {targets => frameworks/targets}/platform_adapter.h (100%) mode change 100755 => 100644 create mode 100755 frameworks/targets/simulator/BUILD.gn rename {targets => frameworks/targets}/simulator/acelite_config.h (83%) rename {tools => frameworks/tools}/profiler/README.md (100%) mode change 100755 => 100644 rename {tools => frameworks/tools}/profiler/js_profiler.py (97%) mode change 100755 => 100644 rename {tools => frameworks/tools}/profiler/js_profiler_config.py (98%) mode change 100755 => 100644 rename {tools => frameworks/tools}/snapshot/framework2char.py (88%) rename {tools => frameworks/tools}/snapshot/jerry_bin/ReadMe.md (100%) rename {tools => frameworks/tools}/snapshot/jerry_bin/build_jerry.bat (100%) rename {tools => frameworks/tools}/snapshot/jerry_bin/build_jerry.sh (94%) create mode 100644 interfaces/innerkits/builtin/async/js_async_work.h create mode 100644 interfaces/innerkits/builtin/async/message_queue_utils.h create mode 100644 interfaces/innerkits/builtin/base/ace_mem_base.h create mode 100644 interfaces/innerkits/builtin/base/memory_heap.h create mode 100755 interfaces/innerkits/builtin/jsi/jsi.h create mode 100644 interfaces/innerkits/builtin/jsi/jsi_types.h delete mode 100755 readme.md delete mode 100755 src/core/base/ace_mem_base.cpp delete mode 100755 src/core/components/BUILD.gn delete mode 100755 src/core/components/canvas_component.cpp delete mode 100755 src/core/components/component_utils.cpp delete mode 100755 src/core/components/div_component.cpp delete mode 100755 src/core/components/input_component.cpp delete mode 100755 src/core/components/progress_component.cpp delete mode 100755 src/core/context/BUILD.gn delete mode 100755 src/core/jsi/BUILD.gn delete mode 100755 src/core/modules/BUILD.gn delete mode 100755 src/core/modules/presets/cjson_parser.h delete mode 100755 src/core/router/BUILD.gn delete mode 100755 src/core/stylemgr/BUILD.gn delete mode 100755 src/core/wrapper/BUILD.gn delete mode 100755 targets/linux/acelite_config.h create mode 100755 test/BUILD.gn create mode 100755 test/ace_test_config.gni create mode 100755 test/moduletest/common/base_test.cpp create mode 100755 test/moduletest/common/base_test.h create mode 100755 test/moduletest/common/basic_tdd_test.cpp create mode 100755 test/moduletest/common/basic_tdd_test.h create mode 100644 test/moduletest/common/test_app/ui_auto_test/.gitignore create mode 100755 test/moduletest/common/test_app/ui_auto_test/config.json create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/app.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/234.jpg create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/a3.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/0.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/1.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/2.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/3.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/4.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/5.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/6.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/7.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/8.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/9.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/goAhead.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/hellopng.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/icon.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/chart.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/general.js create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/list.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/picker_view.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/left.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/leftHead.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/music_next.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/music_play.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/music_prev.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/nextRow.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/preRow.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/right.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/test.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/xinlvBg.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/xinlvMargin.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.hml create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.hml create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.js create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.hml create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.js create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.hml create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.hml create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/hellopng.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.hml create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.hml create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.css create mode 100755 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.css create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.hml create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.js create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/res/drawable/icon.png create mode 100644 test/moduletest/common/test_app/ui_auto_test/src/main/res/drawable/icon_small.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/config.json create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/app.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_051.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_052.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_053.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_054.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_055.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_056.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_057.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_058.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_059.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_060.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_061.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_062.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_063.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_064.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_065.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_066.png create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_067.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/goAhead.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/icon.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/event.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/general.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/list.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/swiper.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/left.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/music_next.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/music_play.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/music_prev.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/nextRow.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/preRow.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/right.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/async/async001/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/async/async001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.css create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.hml create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.js create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.css create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.hml create mode 100755 test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.js create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/res/drawable/icon.png create mode 100644 test/moduletest/common/test_app/ui_manual_test/src/main/res/drawable/icon_small.png create mode 100755 test/moduletest/common/test_common.h diff --git a/.clang-format b/.clang-format old mode 100755 new mode 100644 index f07283e..b29ebe3 --- a/.clang-format +++ b/.clang-format @@ -122,7 +122,7 @@ PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 # 在一个字符串字面量中引入换行的penalty PenaltyBreakString: 1000 -# 对于每个在行字符数限制之外的字符的penalt +# 对于每个在行字符数限制之外的字符的penalty PenaltyExcessCharacter: 1000000 # 将函数的返回类型放到它自己的行的penalty PenaltyReturnTypeOnItsOwnLine: 60 diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index e09a3a0..bd6195f --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ x32 target/ node_modules/ -moduletest/ +frameworks/test/ diff --git a/BUILD.gn b/BUILD.gn deleted file mode 100755 index 738cb8e..0000000 --- a/BUILD.gn +++ /dev/null @@ -1,222 +0,0 @@ -#Copyright (c) 2020 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("//build/lite/config/component/lite_component.gni") -import("//build/lite/config/subsystem/aafwk/config.gni") - -declare_args() { - LOSCFG_TEST_JS_BUILD = false -} - -lite_component("jsfwk") { - features = [ ":ace_lite" ] -} - -config("ace_lite_config") { - include_dirs = [ - "//foundation/graphic/lite/interfaces/innerkits/ui", - "//foundation/graphic/lite/interfaces/innerkits/ui/dock", - "//foundation/graphic/lite/interfaces/innerkits/ui/common", - "//foundation/graphic/lite/interfaces/kits", - "//foundation/graphic/lite/interfaces/kits/config", - "//foundation/graphic/lite/interfaces/kits/surface", - "//foundation/graphic/lite/interfaces/kits/ui", - "//foundation/graphic/lite/interfaces/kits/ui/animator", - "//foundation/graphic/lite/interfaces/kits/ui/common", - "//foundation/graphic/lite/interfaces/kits/ui/components", - "//foundation/graphic/lite/interfaces/kits/ui/dfx", - "//foundation/graphic/lite/interfaces/kits/ui/events", - "//foundation/graphic/lite/interfaces/kits/ui/font", - "//foundation/graphic/lite/interfaces/kits/ui/layout", - "//foundation/graphic/lite/interfaces/kits/ui/themes", - "//foundation/graphic/lite/interfaces/kits/utils", - "//utils/native/lite/include", - "//foundation/aafwk/interfaces/kits/ability_lite", - "//foundation/aafwk/interfaces/kits/want_lite", - "//foundation/aafwk/interfaces/innerkits/abilitymgr_lite", - "//foundation/appexecfwk/interfaces/kits/bundle_lite", - "//foundation/appexecfwk/utils/bundle_lite", - "//foundation/ace/lite/tools/simulator/config", - ] - - include_dirs += [ - "//third_party/bounds_checking_function/include", - "//foundation/ace/interfaces/innerkits/builtin/async", - "//foundation/ace/interfaces/innerkits/builtin/base", - "//foundation/ace/interfaces/innerkits/builtin/jsi", - "include/context", - "include/base", - "include/modules", - "include/resource", - "src/core", - "src/core/animation", - "src/core/base", - "src/core/components", - "src/core/context", - "src/core/directive", - "src/core/router", - "src/core/jsi", - "src/core/modules", - "src/core/router", - "src/core/stylemgr", - "src/core/wrapper", - "targets", - "//kernel/liteos_a/kernel/include/", - "//kernel/liteos_a/kernel/common", - "//third_party/jerryscript/jerry-core/include", - "//third_party/jerryscript/jerry-ext/include/jerryscript-ext", - "///third_party/jerryscript/jerry-port/default/include", - "//third_party/cJSON", - "//utils/native/lite/timer_task/include/", - "//third_party/freetype/include", - ] - if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "liteos_m") { - include_dirs += [ "targets/liteos_a" ] - } else if (ohos_kernel_type == "linux") { - include_dirs += [ "targets/linux" ] - } - - ldflags = [ "-lstdc++" ] - ldflags += [ "-lpthread" ] - ldflags += [ "-Wl,-rpath-link=$ohos_root_path/$root_out_dir" ] -} - -shared_library("ace_lite") { - configs -= [ "//build/lite/config:language_cpp" ] - cflags = [ - "-Wall", - "-Wno-format", - "-Wno-format-extra-args", - ] - cflags_cc = [ "-std=c++14" ] - cflags_cc += cflags - configs += [ ":ace_lite_config" ] - - sources = [ - "src/core/animation/transition_impl.cpp", - "src/core/async/js_async_work.cpp", - "src/core/async/message_queue_utils.cpp", - "src/core/base/ace_log.cpp", - "src/core/base/ace_mem_base.cpp", - "src/core/base/js_debugger_config.cpp", - "src/core/base/js_fwk_common.cpp", - "src/core/base/key_parser.cpp", - "src/core/base/memory_heap.cpp", - "src/core/base/string_util.cpp", - "src/core/base/time_util.cpp", - "src/core/components/analog_clock_component.cpp", - "src/core/components/camera_component.cpp", - "src/core/components/canvas_component.cpp", - "src/core/components/chart_component.cpp", - "src/core/components/clock_hand_component.cpp", - "src/core/components/component.cpp", - "src/core/components/component_utils.cpp", - "src/core/components/div_component.cpp", - "src/core/components/event_listener.cpp", - "src/core/components/image_animator_component.cpp", - "src/core/components/image_component.cpp", - "src/core/components/input_component.cpp", - "src/core/components/list_adapter.cpp", - "src/core/components/list_component.cpp", - "src/core/components/marquee_component.cpp", - "src/core/components/panel_view.cpp", - "src/core/components/picker_view_component.cpp", - "src/core/components/progress_component.cpp", - "src/core/components/scroll_layer.cpp", - "src/core/components/slider_component.cpp", - "src/core/components/swiper_component.cpp", - "src/core/components/switch_component.cpp", - "src/core/components/tab_bar_component.cpp", - "src/core/components/tab_content_component.cpp", - "src/core/components/tabs_component.cpp", - "src/core/components/text_component.cpp", - "src/core/components/video_component.cpp", - "src/core/components/video_view.cpp", - "src/core/context/ace_ability.cpp", - "src/core/context/ace_event_error_code.cpp", - "src/core/context/fatal_handler.cpp", - "src/core/context/js_ability.cpp", - "src/core/context/js_ability_impl.cpp", - "src/core/context/js_app_context.cpp", - "src/core/context/js_app_environment.cpp", - "src/core/context/js_framework_raw.cpp", - "src/core/context/js_profiler.cpp", - "src/core/context/js_timer_list.cpp", - "src/core/directive/descriptor_utils.cpp", - "src/core/directive/directive_watcher_callback.cpp", - "src/core/jsi/jsi.cpp", - "src/core/modules/app_module.cpp", - "src/core/modules/dfx_module.cpp", - "src/core/modules/module_manager.cpp", - "src/core/modules/presets/cjson_parser.cpp", - "src/core/modules/presets/console_log_impl.cpp", - "src/core/modules/presets/console_module.cpp", - "src/core/modules/presets/localization_module.cpp", - - #"src/core/modules/presets/feature_ability_module.cpp", - "src/core/modules/presets/preset_module.cpp", - "src/core/modules/presets/profiler_module.cpp", - "src/core/modules/presets/render_module.cpp", - "src/core/modules/presets/require_module.cpp", - - #"src/core/modules/presets/jstest_module.cpp", - "src/core/modules/presets/timer_module.cpp", - "src/core/modules/presets/version_module.cpp", - "src/core/modules/router_module.cpp", - "src/core/modules/sample_module.cpp", - "src/core/resource/video_muted_image_res.cpp", - "src/core/resource/video_play_image_res.cpp", - "src/core/router/js_page_state.cpp", - "src/core/router/js_page_state_machine.cpp", - "src/core/router/js_router.cpp", - "src/core/stylemgr/app_style.cpp", - "src/core/stylemgr/app_style_item.cpp", - "src/core/stylemgr/app_style_list.cpp", - "src/core/stylemgr/app_style_manager.cpp", - "src/core/stylemgr/app_style_sheet.cpp", - "src/core/wrapper/js.cpp", - "targets/platform_adapter.cpp", - ] - - public_deps = [ - "//base/security/frameworks/crypto_lite/js/builtin:ace_kit_cipher", - "//foundation/graphic/lite/frameworks/surface:surface", - "//foundation/multimedia/frameworks/camera_lite:camera", - "//foundation/multimedia/frameworks/player_lite:player", - "//foundation/multimedia/interfaces/kits/player_lite/js/builtin:audio_api", - "//third_party/bounds_checking_function:libsec_shared", - "//third_party/cJSON:cjson_shared", - "//third_party/jerryscript/jerry-core:jerry-core_shared", - "//third_party/jerryscript/jerry-ext:jerry-ext_shared", - "//third_party/jerryscript/jerry-libm:jerry-libm_shared", - "//third_party/jerryscript/jerry-port/default:jerry-port-default_shared", - "//utils/native/lite/js/builtin:ace_utils_kits", - "//utils/native/lite/timer_task:ace_kit_timer", - ] - - defines = [] - - if (ohos_build_type == "debug") { - defines += [ "JS_PROFILER=1" ] - } else { - defines += [ "JS_PROFILER=0" ] - } - - if (LOSCFG_TEST_JS_BUILD) { - defines += [ "JSFWK_TEST" ] - } - - if (enable_ohos_appexecfwk_feature_ability == true) { - defines += [ "ABILITY_WINDOW_SUPPORT" ] - } -} diff --git a/README.md b/README.md new file mode 100644 index 0000000..3c84c88 --- /dev/null +++ b/README.md @@ -0,0 +1,66 @@ +# JS Application Framework + +- [Introduction](#section11660541593) +- [Directory Structure](#section1464106163817) +- [Available APIs](#section1096322014288) +- [Usage](#section1529834174016) +- [Repositories Involved](#section11683135113011) + +## Introduction + +The JS application framework is provided for you to develop OpenHarmony JavaScript applications. The following figure shows the framework architecture. + +**Figure 1** Framework architecture + +![](figures/framework-architecture.png "framework-architecture") + +The JS application framework consists of the JavaScript data binding framework, JavaScript runtime, and JavaScript framework. + +- **JavaScript data binding** + + Provides a set of basic data binding capabilities through JavaScript. + + +- **JavaScript runtime** + + Supports parsing and execution of JavaScript code. + + +- **JavaScript framework** + + Provides the framework mechanism of JavaScript APIs and components through the C++ language. + + +## Directory Structure + +The source code of the framework is stored in **/foundation/ace/ace\_engine\_lite**. The directory structure is as follows: + +``` +/foundation/ace/ace_engine_lite +├── frameworks # Framework code +│ ├── examples # Sample code +│ ├── include # Header files +│ ├── packages # JavaScript implementation +│ ├── src # Source code +│ ├── targets # Configuration files of target devices +│ └── tools # Tool code +├── interfaces # APIs exposed externally +│ └── innerkits # Header files for internal subsystems +│ └── builtin # JavaScript third-party module APIs exposed by the JS application framework +└── test # Test cases +``` + +## Available APIs + +For details about the APIs, see the [JS Application Development](https://device.harmonyos.com/en/docs/apiref/js-framework-file-0000000000616658). + +## Usage + +For details, go to the **readme** repository: + +[https://gitee.com/openharmony/docs/blob/master/docs-en/readme/js-application-framework.md](https://gitee.com/openharmony/docs/blob/master/docs-en/readme/js-application-framework.md) + +## Repositories Involved + +ace\_engine\_lite + diff --git a/README_zh.md b/README_zh.md new file mode 100644 index 0000000..49b6dc4 --- /dev/null +++ b/README_zh.md @@ -0,0 +1,65 @@ +# JS应用开发框架组件 + +- [简介](#section11660541593) +- [目录](#section1464106163817) +- [接口](#section1096322014288) +- [使用](#section1529834174016) +- [相关仓](#section11683135113011) + +## 简介 + +**JS应用开发框架**，是OpenHarmony为开发者提供的一套开发OpenHarmony JS应用的开发框架。其组成如下所示： + +**图 1** JS应用开发框架 +![](figures/JS应用开发框架.png "JS应用开发框架") + +JS应用开发框架包括JS数据绑定框架（JS Data binding）、JS运行时（JS runtime）和JS框架（JS framework）。 + +- **JS Data binding** + + JS数据绑定框架使用JavaScript语言提供一套基础的数据绑定能力。 + + +- **JS runtime** + + JS运行时用以支持JS代码的解析和执行。 + + +- **JS framework** + + JS框架部分使用C++语言提供JS API和组件的框架机制。 + + +## 目录 + +JS应用开发框架源代码在/foundation/ace/ace\_engine\_lite下，目录结构如下图所示： + +``` +/foundation/ace/ace_engine_lite +├── frameworks # 框架代码目录 +│ ├── examples # 示例代码目录 +│ ├── include # 头文件目录 +│ ├── packages # 框架JS实现存放目录 +│ ├── src # 源代码存放目录 +│ ├── targets # 各目标设备配置文件存放目录 +│ └── tools # 工具代码存放目录 +├── interfaces # 对外接口存放目录 +│ └── innerkits # 对内部子系统暴露的头文件存放目录 +│ └── builtin # JS应用框架对外暴露JS三方module API接口存放目录 +└── test # 测试用例目录 +``` + +## 接口 + +API介绍请参考[《OpenHarmony Device开发API参考》](https://device.harmonyos.com/cn/docs/develop/apiref/js-framework-file-0000000000611396) + +## 使用 + +详见： + +[https://gitee.com/openharmony/docs/blob/master/readme/JS应用开发框架README.md](https://gitee.com/openharmony/docs/blob/master/readme/JS应用开发框架README.md) + +## 相关仓 + +ace\_engine\_lite + diff --git a/ace_lite.gni b/ace_lite.gni new file mode 100755 index 0000000..680b94d --- /dev/null +++ b/ace_lite.gni @@ -0,0 +1,191 @@ +#Copyright (c) 2020 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("//build/lite/config/subsystem/aafwk/path.gni") + +ACE_LITE_PATH = "//foundation/ace/ace_engine_lite/frameworks" +GRAPHIC_LITE_PATH = "//foundation/graphic/ui" + +ace_lite_include_dirs = [ + "$GRAPHIC_LITE_PATH/interfaces/kits/config", + "$GRAPHIC_LITE_PATH/interfaces/kits/animator", + "$GRAPHIC_LITE_PATH/interfaces/kits/common", + "$GRAPHIC_LITE_PATH/interfaces/kits/components", + "$GRAPHIC_LITE_PATH/interfaces/kits/dfx", + "$GRAPHIC_LITE_PATH/interfaces/kits/events", + "$GRAPHIC_LITE_PATH/interfaces/kits/font", + "$GRAPHIC_LITE_PATH/interfaces/kits/layout", + "$GRAPHIC_LITE_PATH/interfaces/kits/themes", + "$GRAPHIC_LITE_PATH/interfaces/innerkits/common", + "//foundation/communication/ipc_lite/interfaces/kits", + "//utils/native/lite/include", + "${aafwk_lite_path}/interfaces/kits/ability_lite", + "${aafwk_lite_path}/interfaces/kits/want_lite", + "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", + "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", + "${appexecfwk_lite_path}/utils/bundle_lite", +] + +ace_lite_include_dirs += [ + "//third_party/bounds_checking_function/include", + "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async", + "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base", + "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/jsi", + "$ACE_LITE_PATH/include/context", + "$ACE_LITE_PATH/include/base", + "$ACE_LITE_PATH/include/modules", + "$ACE_LITE_PATH/include/resource", + "$ACE_LITE_PATH/src/core", + "$ACE_LITE_PATH/src/core/animation", + "$ACE_LITE_PATH/src/core/base", + "$ACE_LITE_PATH/src/core/base/cache", + "$ACE_LITE_PATH/src/core/components", + "$ACE_LITE_PATH/src/core/context", + "$ACE_LITE_PATH/src/core/directive", + "$ACE_LITE_PATH/src/core/router", + "$ACE_LITE_PATH/src/core/jsi", + "$ACE_LITE_PATH/src/core/modules", + "$ACE_LITE_PATH/src/core/router", + "$ACE_LITE_PATH/src/core/stylemgr", + "$ACE_LITE_PATH/src/core/wrapper", + "$ACE_LITE_PATH/targets", + "//kernel/liteos_a/kernel/include/", + "//kernel/liteos_a/kernel/common", + "//third_party/jerryscript/jerry-core/include", + "//third_party/jerryscript/jerry-ext/include/jerryscript-ext", + "///third_party/jerryscript/jerry-port/default/include", + "//third_party/cJSON", + "//utils/native/lite/timer_task/include/", + "//third_party/freetype/include", + "//base/global/resmgr_lite/interfaces/innerkits/include", + "//base/global/i18n_lite/interfaces/kits/i18n/include", +] + +ace_lite_include_dirs_simulator = [ + "$GRAPHIC_LITE_PATH/interfaces/kits/config", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/animator", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/common", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/components", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/dfx", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/events", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/font", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/layout", + "$GRAPHIC_LITE_PATH/interfaces/kits/ui/themes", + "$GRAPHIC_LITE_PATH/interfaces/innerkits/ui/common", + "//foundation/communication/ipc_lite/interfaces/kits", + "//base/hiviewdfx/hilog_lite/interfaces/native/kits", + "${aafwk_lite_path}/frameworks/abilitymgr_lite/include", + "//foundation/communication/ipc_lite/liteipc/include", +] + +ace_lite_sources = [ + "$ACE_LITE_PATH/src/core/animation/transition_impl.cpp", + "$ACE_LITE_PATH/src/core/async/js_async_work.cpp", + "$ACE_LITE_PATH/src/core/async/message_queue_utils.cpp", + "$ACE_LITE_PATH/src/core/base/ace_log.cpp", + "$ACE_LITE_PATH/src/core/base/ace_mem_base.cpp", + "$ACE_LITE_PATH/src/core/base/async_task_manager.cpp", + "$ACE_LITE_PATH/src/core/base/cache/cache_manager.cpp", + "$ACE_LITE_PATH/src/core/base/dfx_assist.cpp", + "$ACE_LITE_PATH/src/core/base/event_util.cpp", + "$ACE_LITE_PATH/src/core/base/js_debugger_config.cpp", + "$ACE_LITE_PATH/src/core/base/js_fwk_common.cpp", + "$ACE_LITE_PATH/src/core/base/key_parser.cpp", + "$ACE_LITE_PATH/src/core/base/lazy_load_manager.cpp", + "$ACE_LITE_PATH/src/core/base/lazy_load_watcher.cpp", + "$ACE_LITE_PATH/src/core/base/locale_util.cpp", + "$ACE_LITE_PATH/src/core/base/mem_proc.cpp", + "$ACE_LITE_PATH/src/core/base/memory_heap.cpp", + "$ACE_LITE_PATH/src/core/base/number_parser.cpp", + "$ACE_LITE_PATH/src/core/base/product_adapter.cpp", + "$ACE_LITE_PATH/src/core/base/string_util.cpp", + "$ACE_LITE_PATH/src/core/base/time_util.cpp", + "$ACE_LITE_PATH/src/core/components/analog_clock_component.cpp", + "$ACE_LITE_PATH/src/core/components/camera_component.cpp", + "$ACE_LITE_PATH/src/core/components/canvas_component.cpp", + "$ACE_LITE_PATH/src/core/components/chart_component.cpp", + "$ACE_LITE_PATH/src/core/components/circle_progress_component.cpp", + "$ACE_LITE_PATH/src/core/components/clock_hand_component.cpp", + "$ACE_LITE_PATH/src/core/components/component.cpp", + "$ACE_LITE_PATH/src/core/components/component_utils.cpp", + "$ACE_LITE_PATH/src/core/components/div_component.cpp", + "$ACE_LITE_PATH/src/core/components/event_listener.cpp", + "$ACE_LITE_PATH/src/core/components/horizon_progress_component.cpp", + "$ACE_LITE_PATH/src/core/components/image_animator_component.cpp", + "$ACE_LITE_PATH/src/core/components/image_component.cpp", + "$ACE_LITE_PATH/src/core/components/input_button_component.cpp", + "$ACE_LITE_PATH/src/core/components/input_checkbox_component.cpp", + "$ACE_LITE_PATH/src/core/components/input_radio_component.cpp", + "$ACE_LITE_PATH/src/core/components/list_adapter.cpp", + "$ACE_LITE_PATH/src/core/components/list_component.cpp", + "$ACE_LITE_PATH/src/core/components/marquee_component.cpp", + "$ACE_LITE_PATH/src/core/components/panel_view.cpp", + "$ACE_LITE_PATH/src/core/components/picker_view_component.cpp", + "$ACE_LITE_PATH/src/core/components/qrcode_component.cpp", + "$ACE_LITE_PATH/src/core/components/scroll_layer.cpp", + "$ACE_LITE_PATH/src/core/components/slider_component.cpp", + "$ACE_LITE_PATH/src/core/components/stack_component.cpp", + "$ACE_LITE_PATH/src/core/components/swiper_component.cpp", + "$ACE_LITE_PATH/src/core/components/switch_component.cpp", + "$ACE_LITE_PATH/src/core/components/tab_bar_component.cpp", + "$ACE_LITE_PATH/src/core/components/tab_content_component.cpp", + "$ACE_LITE_PATH/src/core/components/tabs_component.cpp", + "$ACE_LITE_PATH/src/core/components/text_component.cpp", + "$ACE_LITE_PATH/src/core/components/video_component.cpp", + "$ACE_LITE_PATH/src/core/components/video_view.cpp", + "$ACE_LITE_PATH/src/core/context/ace_ability.cpp", + "$ACE_LITE_PATH/src/core/context/ace_event_error_code.cpp", + "$ACE_LITE_PATH/src/core/context/fatal_handler.cpp", + "$ACE_LITE_PATH/src/core/context/js_ability.cpp", + "$ACE_LITE_PATH/src/core/context/js_ability_impl.cpp", + "$ACE_LITE_PATH/src/core/context/js_app_context.cpp", + "$ACE_LITE_PATH/src/core/context/js_app_environment.cpp", + "$ACE_LITE_PATH/src/core/context/js_framework_raw.cpp", + "$ACE_LITE_PATH/src/core/context/js_profiler.cpp", + "$ACE_LITE_PATH/src/core/context/js_timer_list.cpp", + "$ACE_LITE_PATH/src/core/dialog/js_dialog.cpp", + "$ACE_LITE_PATH/src/core/directive/descriptor_utils.cpp", + "$ACE_LITE_PATH/src/core/directive/directive_watcher_callback.cpp", + "$ACE_LITE_PATH/src/core/jsi/jsi.cpp", + "$ACE_LITE_PATH/src/core/modules/app_module.cpp", + "$ACE_LITE_PATH/src/core/modules/dfx_module.cpp", + "$ACE_LITE_PATH/src/core/modules/dialog_module.cpp", + "$ACE_LITE_PATH/src/core/modules/module_manager.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/cjson_parser.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/console_log_impl.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/console_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/date_time_format_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/intl_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/localization_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/number_format_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/preset_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/profiler_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/render_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/require_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/timer_module.cpp", + "$ACE_LITE_PATH/src/core/modules/presets/version_module.cpp", + "$ACE_LITE_PATH/src/core/modules/router_module.cpp", + "$ACE_LITE_PATH/src/core/modules/sample_module.cpp", + "$ACE_LITE_PATH/src/core/resource/video_muted_image_res.cpp", + "$ACE_LITE_PATH/src/core/resource/video_play_image_res.cpp", + "$ACE_LITE_PATH/src/core/router/js_page_state.cpp", + "$ACE_LITE_PATH/src/core/router/js_page_state_machine.cpp", + "$ACE_LITE_PATH/src/core/router/js_router.cpp", + "$ACE_LITE_PATH/src/core/stylemgr/app_style.cpp", + "$ACE_LITE_PATH/src/core/stylemgr/app_style_item.cpp", + "$ACE_LITE_PATH/src/core/stylemgr/app_style_list.cpp", + "$ACE_LITE_PATH/src/core/stylemgr/app_style_manager.cpp", + "$ACE_LITE_PATH/src/core/stylemgr/app_style_sheet.cpp", + "$ACE_LITE_PATH/src/core/wrapper/js.cpp", + "$ACE_LITE_PATH/targets/platform_adapter.cpp", +] diff --git a/examples/calculator/src/main/js/default/app.js b/examples/calculator/src/main/js/default/app.js deleted file mode 100644 index 3184448..0000000 --- a/examples/calculator/src/main/js/default/app.js +++ /dev/null @@ -1,8 +0,0 @@ -export default { - onCreate() { - console.info("Application onCreate"); - }, - onDestroy() { - console.info("Application onDestroy"); - } -}; diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml deleted file mode 100755 index a2676d9..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml +++ /dev/null @@ -1,34 +0,0 @@ - - -
- - - - - - -
- - -
- - {{ text1 }} - -
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml deleted file mode 100755 index 6302adb..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml +++ /dev/null @@ -1,34 +0,0 @@ - - -
- - - - - - -
- - -
- - {{ text1 }} - -
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml deleted file mode 100755 index 4fdb0c7..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml +++ /dev/null @@ -1,33 +0,0 @@ - - -
- - - - - - -
- -
- - {{ text1 }} - -
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml deleted file mode 100755 index 3d94e6c..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml +++ /dev/null @@ -1,31 +0,0 @@ - - -
- - - - - - - {{ text1 }} - - - {{ text2 }} - - - {{ text3 }} - -
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml deleted file mode 100755 index f5f7302..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml +++ /dev/null @@ -1,44 +0,0 @@ - - -
- - - - - - - - {{ text1 }} - - - {{ text2 }} - - - {{ text3 }} - -
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml deleted file mode 100755 index feb00db..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml +++ /dev/null @@ -1,37 +0,0 @@ - - -
- - - - - - - - - {{ text1 }} - - - {{ text2 }} - - - {{ text3 }} - -
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml deleted file mode 100755 index 77db2c5..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - canvas属性接口 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml deleted file mode 100755 index 1abc77e..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - canvas绘图接口 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml deleted file mode 100755 index 62f8bf3..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - canvas通用属性 - - - - - show - - - - - - - if - - - - - - - for - - - - - diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml deleted file mode 100755 index cfec120..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - canvas通用样式 - - - - - 背景色 - left - top - - - - - - - margin - height - width - - - - - - - border - padding - - - - - - - margin-left - margin-top - margin-right - margin-bottom - - - - - - - display - - - - - diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml b/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml deleted file mode 100755 index b760f48..0000000 --- a/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - canvas通用事件 - - - - - click - longpress - swipe - - - - - diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml b/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml deleted file mode 100755 index bee344f..0000000 --- a/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml +++ /dev/null @@ -1,34 +0,0 @@ - - -
- - - - - - - item-{{ $idx }} - - - - 点击button回到item-2 -
diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml b/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml deleted file mode 100755 index 81ddffa..0000000 --- a/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - stack已设置样式 - - - - {{text1}} - - - {{text2}} - - - {{text3}} - - diff --git a/figures/JS应用开发框架.png b/figures/JS应用开发框架.png new file mode 100644 index 0000000000000000000000000000000000000000..f9984dd8cdd1379f90a9494a57db2e7e9f5e316b GIT binary patch literal 82025 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 z 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

H{Q{9 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

- {{ updated }}:{{ udpateStatus }} + {{ updated }}:{{ updateStatus }} {{ dataSourceName }}:{{ dataSource }}
@@ -55,7 +55,7 @@ type="button" value="History" style="border-width: 3px; margin-left: 10px; border-color: #90ee90; width: 146px; height: 50px" - onclick="openHistroy" + onclick="openHistory" /> + diff --git a/examples/calculator/src/main/js/default/pages/index/index.js b/frameworks/examples/calculator/src/main/js/default/pages/index/index.js similarity index 73% rename from examples/calculator/src/main/js/default/pages/index/index.js rename to frameworks/examples/calculator/src/main/js/default/pages/index/index.js index 30fd21a..0d374ca 100644 --- a/examples/calculator/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/calculator/src/main/js/default/pages/index/index.js @@ -1,3 +1,17 @@ +/* + * Copyright (c) 2020 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 {calc, isOperator} from '../../common/calculator.js'; import app from '@system.app'; diff --git a/examples/music/src/main/config.json b/frameworks/examples/music/src/main/config.json old mode 100755 new mode 100644 similarity index 97% rename from examples/music/src/main/config.json rename to frameworks/examples/music/src/main/config.json index c312fec..cf48482 --- a/examples/music/src/main/config.json +++ b/frameworks/examples/music/src/main/config.json @@ -17,7 +17,6 @@ }, "module": { "deviceType": [ - "liteWearable", "smartVision" ], "abilities": [ diff --git a/examples/music/src/main/js/default/app.js b/frameworks/examples/music/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/app.js rename to frameworks/examples/music/src/main/js/default/app.js diff --git a/examples/music/src/main/js/default/common/ic_back.png b/frameworks/examples/music/src/main/js/default/common/ic_back.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_back.png rename to frameworks/examples/music/src/main/js/default/common/ic_back.png diff --git a/examples/music/src/main/js/default/common/ic_music_list.png b/frameworks/examples/music/src/main/js/default/common/ic_music_list.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_list.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_list.png diff --git a/examples/music/src/main/js/default/common/ic_music_listcycle.png b/frameworks/examples/music/src/main/js/default/common/ic_music_listcycle.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_listcycle.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_listcycle.png diff --git a/examples/music/src/main/js/default/common/ic_music_listorder.png b/frameworks/examples/music/src/main/js/default/common/ic_music_listorder.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_listorder.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_listorder.png diff --git a/examples/music/src/main/js/default/common/ic_music_mode.png b/frameworks/examples/music/src/main/js/default/common/ic_music_mode.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_mode.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_mode.png diff --git a/examples/music/src/main/js/default/common/ic_music_next.png b/frameworks/examples/music/src/main/js/default/common/ic_music_next.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_next.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_next.png diff --git a/examples/music/src/main/js/default/common/ic_music_pause.png b/frameworks/examples/music/src/main/js/default/common/ic_music_pause.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_pause.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_pause.png diff --git a/examples/music/src/main/js/default/common/ic_music_play.png b/frameworks/examples/music/src/main/js/default/common/ic_music_play.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_play.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_play.png diff --git a/examples/music/src/main/js/default/common/ic_music_previous.png b/frameworks/examples/music/src/main/js/default/common/ic_music_previous.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_previous.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_previous.png diff --git a/examples/music/src/main/js/default/common/ic_music_shuffle.png b/frameworks/examples/music/src/main/js/default/common/ic_music_shuffle.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_shuffle.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_shuffle.png diff --git a/examples/music/src/main/js/default/common/ic_music_singlecycle.png b/frameworks/examples/music/src/main/js/default/common/ic_music_singlecycle.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/js/default/common/ic_music_singlecycle.png rename to frameworks/examples/music/src/main/js/default/common/ic_music_singlecycle.png diff --git a/examples/music/src/main/js/default/pages/index/index.css b/frameworks/examples/music/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 99% rename from examples/music/src/main/js/default/pages/index/index.css rename to frameworks/examples/music/src/main/js/default/pages/index/index.css index 03120ba..0064160 --- a/examples/music/src/main/js/default/pages/index/index.css +++ b/frameworks/examples/music/src/main/js/default/pages/index/index.css @@ -56,7 +56,7 @@ text-align: center; } -.songer { +.singer { width: 114px; height: 42px; margin-left: 423px; diff --git a/examples/music/src/main/js/default/pages/index/index.hml b/frameworks/examples/music/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 95% rename from examples/music/src/main/js/default/pages/index/index.hml rename to frameworks/examples/music/src/main/js/default/pages/index/index.hml index f2596b7..9efaf65 --- a/examples/music/src/main/js/default/pages/index/index.hml +++ b/frameworks/examples/music/src/main/js/default/pages/index/index.hml @@ -20,7 +20,7 @@ limitations under the License. 音乐
{{curMusic.curMusicName}} - {{curMusic.songer}} + {{curMusic.singer}}
{{curMusic.playTime}} @@ -44,7 +44,7 @@ limitations under the License. {{$item.name}} - {{$item.songer}} + {{$item.singer}}
diff --git a/examples/music/src/main/js/default/pages/index/index.js b/frameworks/examples/music/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 97% rename from examples/music/src/main/js/default/pages/index/index.js rename to frameworks/examples/music/src/main/js/default/pages/index/index.js index 22cce37..df8efb9 --- a/examples/music/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/music/src/main/js/default/pages/index/index.js @@ -30,7 +30,7 @@ export default { playStatus: 2, //0:play,1:pause,2:stop curMusic: { //current music info curMusicName: "", - songer: "", + singer: "", playTime: "00:00", allTime: "00:00" }, @@ -45,6 +45,9 @@ export default { }; //update play progress audio.ontimeupdate = () => { + if (audio.duration == null || audio.duration <= 0) { + return; + } console.log("ontime update:"); this.curMusic.playTime = this.timeChange(audio.currentTime); console.log("ontime update:" + this.curMusic.playTime); @@ -126,7 +129,7 @@ export default { if (music != null) { this.playProgress = 0; this.curMusic.curMusicName = music.name; - this.curMusic.songer = music.songer; + this.curMusic.singer = music.singer; audio.src = music.src; console.log("playMusic:src:" + music.src); audio.play(); @@ -181,7 +184,7 @@ export default { console.log("ChangeSong:next" + this.curMusicIndex); } this.curMusic.curMusicName = this.musicList[this.curMusicIndex].name; - this.curMusic.songer = this.musicList[this.curMusicIndex].songer; + this.curMusic.singer = this.musicList[this.curMusicIndex].singer; this.playMusic(this.curMusicIndex); if(this.showMusicList){ this.$refs.musicList.scrollTo({ index: (this.curMusicIndex == 0?0:this.curMusicIndex-1) }); diff --git a/examples/music/src/main/resources/base/media/icon.png b/frameworks/examples/music/src/main/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/resources/base/media/icon.png rename to frameworks/examples/music/src/main/resources/base/media/icon.png diff --git a/examples/music/src/main/resources/base/media/icon_small.png b/frameworks/examples/music/src/main/resources/base/media/icon_small.png old mode 100755 new mode 100644 similarity index 100% rename from examples/music/src/main/resources/base/media/icon_small.png rename to frameworks/examples/music/src/main/resources/base/media/icon_small.png diff --git a/examples/showcase/src/main/config.json b/frameworks/examples/showcase/src/main/config.json old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/config.json rename to frameworks/examples/showcase/src/main/config.json index 3500860..d030d3b --- a/examples/showcase/src/main/config.json +++ b/frameworks/examples/showcase/src/main/config.json @@ -13,7 +13,7 @@ }, "deviceConfig": {}, "module": { - "deviceType": ["liteWearable", "smartVision"], + "deviceType": ["smartVision"], "distro": { "deliveryWithInstall": true, "moduleName": "entry", diff --git a/examples/showcase/src/main/js/default/app.js b/frameworks/examples/showcase/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/app.js rename to frameworks/examples/showcase/src/main/js/default/app.js diff --git a/examples/showcase/src/main/js/default/common/js/chart.js b/frameworks/examples/showcase/src/main/js/default/common/js/chart.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/chart.js rename to frameworks/examples/showcase/src/main/js/default/common/js/chart.js diff --git a/examples/showcase/src/main/js/default/common/js/general.js b/frameworks/examples/showcase/src/main/js/default/common/js/general.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/general.js rename to frameworks/examples/showcase/src/main/js/default/common/js/general.js diff --git a/examples/showcase/src/main/js/default/common/js/image.js b/frameworks/examples/showcase/src/main/js/default/common/js/image.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/image.js rename to frameworks/examples/showcase/src/main/js/default/common/js/image.js diff --git a/examples/showcase/src/main/js/default/common/js/input.js b/frameworks/examples/showcase/src/main/js/default/common/js/input.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/input.js rename to frameworks/examples/showcase/src/main/js/default/common/js/input.js diff --git a/examples/showcase/src/main/js/default/common/js/list.js b/frameworks/examples/showcase/src/main/js/default/common/js/list.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/list.js rename to frameworks/examples/showcase/src/main/js/default/common/js/list.js diff --git a/examples/showcase/src/main/js/default/common/js/marquee.js b/frameworks/examples/showcase/src/main/js/default/common/js/marquee.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/marquee.js rename to frameworks/examples/showcase/src/main/js/default/common/js/marquee.js diff --git a/examples/showcase/src/main/js/default/common/js/picker_view.js b/frameworks/examples/showcase/src/main/js/default/common/js/picker_view.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/picker_view.js rename to frameworks/examples/showcase/src/main/js/default/common/js/picker_view.js diff --git a/examples/showcase/src/main/js/default/common/js/progress.js b/frameworks/examples/showcase/src/main/js/default/common/js/progress.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/progress.js rename to frameworks/examples/showcase/src/main/js/default/common/js/progress.js diff --git a/examples/showcase/src/main/js/default/common/js/stack.js b/frameworks/examples/showcase/src/main/js/default/common/js/stack.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/stack.js rename to frameworks/examples/showcase/src/main/js/default/common/js/stack.js diff --git a/examples/showcase/src/main/js/default/common/js/swiper.js b/frameworks/examples/showcase/src/main/js/default/common/js/swiper.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/swiper.js rename to frameworks/examples/showcase/src/main/js/default/common/js/swiper.js diff --git a/examples/showcase/src/main/js/default/common/js/text.js b/frameworks/examples/showcase/src/main/js/default/common/js/text.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/js/text.js rename to frameworks/examples/showcase/src/main/js/default/common/js/text.js diff --git a/examples/showcase/src/main/js/default/common/leftHead.png b/frameworks/examples/showcase/src/main/js/default/common/leftHead.png old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/common/leftHead.png rename to frameworks/examples/showcase/src/main/js/default/common/leftHead.png diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index1/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index1/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index1/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index1/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index1/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index1/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index2/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index2/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index2/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index2/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/animation/index2/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/animation/index2/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.css index 37a167c..1349468 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.css @@ -18,5 +18,5 @@ height: 50px; margin-top: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml new file mode 100644 index 0000000..57cc334 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.hml @@ -0,0 +1,34 @@ + + +
+ + + + + + +
+ + +
+ + {{ text1 }} + +
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.css index 37a167c..1349468 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.css @@ -18,5 +18,5 @@ height: 50px; margin-top: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml new file mode 100644 index 0000000..7067c31 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.hml @@ -0,0 +1,34 @@ + + +
+ + + + + + +
+ + +
+ + {{ text1 }} + +
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.css index 37a167c..1349468 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.css @@ -18,5 +18,5 @@ height: 50px; margin-top: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml new file mode 100644 index 0000000..6c63498 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.hml @@ -0,0 +1,33 @@ + + +
+ + + + + + +
+ +
+ + {{ text1 }} + +
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.css old mode 100755 new mode 100644 similarity index 92% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.css index 999830a..5ecae92 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.css @@ -16,9 +16,7 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; - font-size: 30; + font-size: 30px; } .stack { diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.hml old mode 100755 new mode 100644 similarity index 53% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.hml index 0ea7e02..4d86787 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.hml @@ -14,18 +14,18 @@ limitations under the License. --> - - - + + + - - + + {{ text1 }} - + {{ text2 }} - + {{ text3 }} diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.css index 3412d2e..fbc215c --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.css @@ -18,7 +18,7 @@ height: 50px; margin-top: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; border-width: 1px; border-color: red; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml new file mode 100644 index 0000000..6b51687 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.hml @@ -0,0 +1,31 @@ + + +
+ + + + + + + {{ text1 }} + + + {{ text2 }} + + + {{ text3 }} + +
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.css index 285f457..b20c2ce --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.css @@ -18,5 +18,5 @@ height: 50px; margin-top: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.hml old mode 100755 new mode 100644 similarity index 53% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.hml index eadc0d4..cbf6c59 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.hml @@ -13,29 +13,29 @@ See the License for the specific language governing permissions and limitations under the License. --> -
- - - +
+ + + - - + + {{ text1 }}
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.css index 818750a..aae6f49 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.css @@ -18,7 +18,7 @@ height: 50px; margin-bottom: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; border-width: 1px; border-color: red; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml new file mode 100644 index 0000000..6de5625 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.hml @@ -0,0 +1,44 @@ + + +
+ + + + + + + + {{ text1 }} + + + {{ text2 }} + + + {{ text3 }} + +
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.css index 3412d2e..fbc215c --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.css @@ -18,7 +18,7 @@ height: 50px; margin-top: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; border-width: 1px; border-color: red; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml new file mode 100644 index 0000000..05319d1 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.hml @@ -0,0 +1,37 @@ + + +
+ + + + + + + + + {{ text1 }} + + + {{ text2 }} + + + {{ text3 }} + +
diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.css old mode 100755 new mode 100644 similarity index 92% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.css index 21072ca..8611914 --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.css @@ -23,8 +23,6 @@ .text { width: 400px; height: 100px; - margin-top: 10px; - margin-left: 10px; - font-size: 30; + font-size: 30px; text-overflow: ellipsis; } diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.hml old mode 100755 new mode 100644 similarity index 52% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.hml index fb6c531..735f17d --- a/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.hml @@ -14,21 +14,21 @@ limitations under the License. --> - - - + + + - + {{ text1 }} - 矩形为canvas组件 - 点击/长按/滑动canvas内部任意位置触发事件 + 矩形为canvas组件 + 点击/长按/滑动canvas内部任意位置触发事件 diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.hml old mode 100755 new mode 100644 similarity index 75% rename from examples/showcase/src/main/js/default/pages/component/canvas/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.hml index c7dc122..07697b1 --- a/examples/showcase/src/main/js/default/pages/component/canvas/index/index.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.hml @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - + + + + + + diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.hml old mode 100755 new mode 100644 similarity index 70% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.hml index a1e8587..5a5e40c --- a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.hml @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - + + + + + + diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.css diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml new file mode 100644 index 0000000..f586bce --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.hml @@ -0,0 +1,63 @@ + + + + + + + + + + + + canvas属性接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.css diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml new file mode 100644 index 0000000..6e5a13c --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.hml @@ -0,0 +1,53 @@ + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.css diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml new file mode 100644 index 0000000..584cebb --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.hml @@ -0,0 +1,49 @@ + + + + + + + + + + + + canvas通用属性 + + + + + show + + + + + + + if + + + + + + + for + + + + + diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.css diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml new file mode 100644 index 0000000..9c1aea6 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.hml @@ -0,0 +1,71 @@ + + + + + + + + + + + + canvas通用样式 + + + + + 背景色 + left + top + + + + + + + margin + height + width + + + + + + + border + padding + + + + + + + margin-left + margin-top + margin-right + margin-bottom + + + + + + + display + + + + + diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.css diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml new file mode 100644 index 0000000..83cf172 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.hml @@ -0,0 +1,37 @@ + + + + + + + + + + + + canvas通用事件 + + + + + click + longpress + swipe + + + + + diff --git a/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.css index 7a5644b..213527d --- a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.css @@ -22,7 +22,5 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.hml old mode 100755 new mode 100644 similarity index 92% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.hml index 762e7b1..b801d01 --- a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.hml @@ -15,8 +15,8 @@ limitations under the License. - - + + diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.css index 7a5644b..213527d --- a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.css @@ -22,7 +22,5 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.hml old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.hml index efae822..90dd530 --- a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.hml @@ -15,8 +15,8 @@ limitations under the License. - - + + @@ -29,4 +29,4 @@ limitations under the License. {{text3}} -
+ diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.css diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div1/div1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div1/div1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div1/div1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div1/div1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div1/div1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div1/div1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div10/div10.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div10/div10.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div10/div10.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div10/div10.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div10/div10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div10/div10.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div11/div11.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div11/div11.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div11/div11.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div11/div11.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div11/div11.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div11/div11.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div12/div12.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div12/div12.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div12/div12.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div12/div12.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div12/div12.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div12/div12.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div2/div2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/div/div2/div2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.css index 7a5644b..213527d --- a/examples/showcase/src/main/js/default/pages/component/div/div2/div2.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.css @@ -22,7 +22,5 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/div/div2/div2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div2/div2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div2/div2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div2/div2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div3/div3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div3/div3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div3/div3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div3/div3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div3/div3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div3/div3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div4/div4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div4/div4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div4/div4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div4/div4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div4/div4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div4/div4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div5/div5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div5/div5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div5/div5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div5/div5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div5/div5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div5/div5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div6/div6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div6/div6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div6/div6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div6/div6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div6/div6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div6/div6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div7/div7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div7/div7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div7/div7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div7/div7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div7/div7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div7/div7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div8/div8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div8/div8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div8/div8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div8/div8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div8/div8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div8/div8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/div9/div9.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div9/div9.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/div9/div9.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div9/div9.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/div9/div9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/div9/div9.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image1/image1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image1/image1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/image1/image1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.hml old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/image/image1/image1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.hml index 953d8f9..516e709 --- a/examples/showcase/src/main/js/default/pages/component/image/image1/image1.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.hml @@ -15,8 +15,8 @@ limitations under the License.
- - + + diff --git a/examples/showcase/src/main/js/default/pages/component/image/image1/image1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image1/image1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image2/image2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image2/image2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/image2/image2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image2/image2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/image2/image2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image2/image2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image3/image3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/image/image3/image3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.css index c56bf1d..66bbf1d --- a/examples/showcase/src/main/js/default/pages/component/image/image3/image3.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.css @@ -15,8 +15,6 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/image/image3/image3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.hml old mode 100755 new mode 100644 similarity index 90% rename from examples/showcase/src/main/js/default/pages/component/image/image3/image3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.hml index db3f5e3..8245e76 --- a/examples/showcase/src/main/js/default/pages/component/image/image3/image3.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.hml @@ -15,12 +15,12 @@ limitations under the License. - - + + {{text1}} -
+ diff --git a/examples/showcase/src/main/js/default/pages/component/image/image3/image3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image3/image3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image4/image4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image4/image4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/image4/image4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image4/image4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/image4/image4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image4/image4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image5/image5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image5/image5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/image5/image5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image5/image5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/image5/image5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image5/image5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image6/image6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image6/image6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/image6/image6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image6/image6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/image6/image6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image6/image6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image7/image7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image7/image7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/image7/image7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image7/image7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/image7/image7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image7/image7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/image8/image8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image8/image8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/image8/image8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image8/image8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/image8/image8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/image8/image8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/formIndex/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/formIndex/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.css index a842ca3..81fe2e5 --- a/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.css @@ -67,23 +67,18 @@ .two-right-div { width: 230px; height: 150px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; + flex-direction: column; } .two-div { width: 450px; height: 150px; - left: 0px; - top: 0px; } .item-attribute { @@ -92,8 +87,6 @@ } .attribute-div { - left: 0px; - top: 0px; height: 100px; width: 450px; flex-direction: row; diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/event/event.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.css old mode 100755 new mode 100644 similarity index 95% rename from examples/showcase/src/main/js/default/pages/component/input/button/event/event.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.css index 4e4ae1c..b587ee2 --- a/examples/showcase/src/main/js/default/pages/component/input/button/event/event.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.css @@ -67,23 +67,17 @@ .two-right-div { width: 230px; height: 200px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .text2 { diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/event/event.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/event/event.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/style/style.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/style/style.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.css diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/style/style.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.hml old mode 100755 new mode 100644 similarity index 99% rename from examples/showcase/src/main/js/default/pages/component/input/button/style/style.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.hml index 8ebc5e3..33d7a52 --- a/examples/showcase/src/main/js/default/pages/component/input/button/style/style.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.hml @@ -45,7 +45,7 @@ limitations under the License. width
- +
diff --git a/examples/showcase/src/main/js/default/pages/component/input/button/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/button/style/style.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.css old mode 100755 new mode 100644 similarity index 95% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.css index f46f348..976ade6 --- a/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.css @@ -67,23 +67,17 @@ .two-right-div { width: 230px; height: 150px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 150px; - left: 0px; - top: 0px; } .item-attribute { diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.css old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.css index 910baf8..1a67856 --- a/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.css @@ -76,23 +76,17 @@ .two-right-div { width: 230px; height: 200px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .item-change { @@ -101,22 +95,16 @@ } .change-div { - left: 0px; width: 450px; height: 200px; - top: 0px; } .change-left-div { - left: 10px; width: 200px; height: 200px; - top: 20px; } .change-right-div { - left: 10px; - top: 10px; width: 250px; height: 200px; flex-direction: column; @@ -130,8 +118,6 @@ } .right-div { - left: 0px; - top: 0px; width: 200px; height: 200px; } diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/input/radio/style/style.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.css index ca9e352..1845d0f --- a/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.css @@ -95,8 +95,6 @@ .three-right-div { width: 230px; height: 190px; - top: 40px; - left: 0px; } .general-stack { @@ -116,8 +114,6 @@ } .right-div { - left: 0px; - top: 0px; width: 150px; height: 200px; } diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/input/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.css old mode 100755 new mode 100644 similarity index 95% rename from examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.css index 3712436..270a2d3 --- a/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.css @@ -67,23 +67,17 @@ .two-right-div { width: 230px; height: 150px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 150px; - left: 0px; - top: 0px; } .item-attribute { diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.css old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/input/radio/event/event.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.css index eb41b4f..8510988 --- a/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.css @@ -76,23 +76,17 @@ .two-right-div { width: 230px; height: 200px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .item-change { @@ -101,22 +95,16 @@ } .change-div { - left: 0px; width: 450px; height: 150px; - top: 0px; } .change-left-div { - left: 10px; width: 200px; height: 150px; - top: 20px; } .change-right-div { - left: 10px; - top: 10px; width: 250px; height: 150px; flex-direction: column; @@ -130,8 +118,6 @@ } .right-div { - left: 0px; - top: 0px; width: 150px; height: 200px; } diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/event/event.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.css b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.css old mode 100755 new mode 100644 similarity index 93% rename from examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.css index ca9e352..762fe0e --- a/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.css @@ -60,15 +60,11 @@ .three-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .three-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } @@ -80,8 +76,6 @@ .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; flex-direction: column; } @@ -95,8 +89,6 @@ .three-right-div { width: 230px; height: 190px; - top: 40px; - left: 0px; } .general-stack { @@ -116,8 +108,6 @@ } .right-div { - left: 0px; - top: 0px; width: 150px; height: 200px; } diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/style/style.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.hml diff --git a/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.css index 31facbb..a5d9270 --- a/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.css @@ -22,8 +22,6 @@ .text { width: 400px; height: 100px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; text-overflow: ellipsis; } diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.hml old mode 100755 new mode 100644 similarity index 98% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.hml index 8f49750..06d5907 --- a/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.hml @@ -25,7 +25,7 @@ limitations under the License. background-color: #00ff00; border-width: 1px; border-color: #ffa500; - margin-left: 85; + margin-left: 85px; " > diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.hml old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.hml index 3ee0ca3..6d2dbd9 --- a/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.hml @@ -35,7 +35,7 @@ limitations under the License. " > - {{ $idx }}--{{ $item }} + {{ $idx }}--{{ $item }} diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.css index c56bf1d..66bbf1d --- a/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.css @@ -15,8 +15,6 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.css index 231d8ff..092642b --- a/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.css @@ -17,5 +17,5 @@ height: 50px; margin-top: 10px; margin-left: 10px; - font-size: 30; + font-size: 30px; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml new file mode 100644 index 0000000..95ddce9 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.hml @@ -0,0 +1,34 @@ + + +
+ + + + + + + item-{{ $idx }} + + + + 点击button回到item-2 +
diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.css index c56bf1d..66bbf1d --- a/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.css @@ -15,8 +15,6 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.css diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.hml diff --git a/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.css b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.css diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.hml diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.css b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.css old mode 100755 new mode 100644 similarity index 93% rename from examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.css index eb7dde2..6e00e0f --- a/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.css @@ -62,23 +62,17 @@ .three-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .three-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .three-right-div { width: 230px; height: 190px; - top: 40px; - left: 0px; } .item-two { @@ -89,16 +83,12 @@ .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 150px; - left: 0px; - top: 0px; } .general-stack { @@ -121,8 +111,6 @@ width: 250px; height: 200px; background-color: springgreen; - left: 0px; - top: 0px; } .show { diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.hml diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/event/event.css b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/marquee/event/event.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.css index d396d80..b13016e --- a/examples/showcase/src/main/js/default/pages/component/marquee/event/event.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.css @@ -62,23 +62,17 @@ .two-right-div { width: 230px; height: 200px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .click-text { diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/event/event.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.hml diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/event/event.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.js diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.css b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.css diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.hml diff --git a/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.css index 7a5644b..213527d --- a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.css @@ -22,7 +22,5 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.hml old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.hml index f05c83b..713a3ee --- a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.hml @@ -15,8 +15,8 @@ limitations under the License. - - + + @@ -29,4 +29,4 @@ limitations under the License. {{text3}} - + diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.hml old mode 100755 new mode 100644 similarity index 92% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.hml index 0c88404..a5f352a --- a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.hml @@ -15,8 +15,8 @@ limitations under the License.
- - + + diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.css index 7a5644b..213527d --- a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.css @@ -22,7 +22,5 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.hml old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.hml index b60fa88..069dd08 --- a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.hml @@ -15,8 +15,8 @@ limitations under the License. - - + + @@ -29,4 +29,4 @@ limitations under the License. {{text3}} -
+ diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.hml old mode 100755 new mode 100644 similarity index 92% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.hml index 9ecbc34..c1caba4 --- a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.hml @@ -15,8 +15,8 @@ limitations under the License.
- - + + diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.hml old mode 100755 new mode 100644 similarity index 89% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.hml index 1f67fca..5c9a7ec --- a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.hml @@ -15,12 +15,12 @@ limitations under the License.
- - + + - + show diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.css b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.css diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.hml diff --git a/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.css index f5649f6..d15c720 --- a/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.css @@ -71,8 +71,8 @@ center-x: 50px; center-y: 50px; radius: 50px; - start-angle: 0; - total-angle: 360; + start-angle: 0deg; + total-angle: 360deg; stroke-width: 6px; background-color: #8b8b7a; color: #ff0000; @@ -84,8 +84,8 @@ center-x: 15px; center-y: 15px; radius: 15px; - start-angle: 0; - total-angle: 360; + start-angle: 0deg; + total-angle: 360deg; stroke-width: 6px; background-color: #8b8b7a; color: #ff0000; diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.css old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.css index b5952b5..a60de29 --- a/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.css @@ -50,8 +50,8 @@ center-x: 50px; center-y: 50px; radius: 50px; - start-angle: 0; - total-angle: 360; + start-angle: 0deg; + total-angle: 360deg; } .item-click { diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.css old mode 100755 new mode 100644 similarity index 89% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.css index b85e5fb..1d8e2a9 --- a/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.css @@ -52,23 +52,17 @@ .three-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .three-left-div { width: 240px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .three-right-div { width: 230px; height: 210px; - top: 40px; - left: 0px; } .general-stack { @@ -84,8 +78,8 @@ center-x: 50px; center-y: 50px; radius: 50px; - start-angle: 0; - total-angle: 120; + start-angle: 0deg; + total-angle: 120deg; left: 20px; top: 20px; background-color: #ff0000; @@ -106,8 +100,8 @@ height: 70px; center-x: 35px; center-y: 35px; - start-angle: 0; - total-angle: 360; + start-angle: 0deg; + total-angle: 360deg; radius: 35px; stroke-width: 5px; } @@ -119,8 +113,8 @@ padding: 10px; center-x: 65px; center-y: 65px; - start-angle: 0; - total-angle: 360; + start-angle: 0deg; + total-angle: 360deg; radius: 50px; width: 130px; height: 130px; @@ -132,8 +126,8 @@ .special-style { center-x: 50px; center-y: 50px; - start-angle: 10; - total-angle: 180; + start-angle: 10deg; + total-angle: 180deg; radius: 50px; width: 100px; height: 100px; @@ -146,14 +140,10 @@ .two-right-div { width: 230px; height: 150px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; flex-direction: column; } diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.css diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.hml old mode 100755 new mode 100644 similarity index 97% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.hml index f216fc0..bb32f71 --- a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.hml @@ -40,7 +40,7 @@ limitations under the License. for="{{ listData }}" type="horizontal" percent="{{ show }}" - style="width: 100px; height: 50px; stroke-width: 5" + style="width: 100px; height: 50px; stroke-width: 5px" >
diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.css diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.css old mode 100755 new mode 100644 similarity index 92% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.css index 53adbc3..3866bfb --- a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.css @@ -52,23 +52,17 @@ .three-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .three-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .three-right-div { width: 230px; height: 190px; - top: 40px; - left: 0px; } .general-stack { @@ -131,29 +125,21 @@ .two-right-div { width: 230px; height: 150px; - top: 40px; - left: 0px; } .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; flex-direction: column; } .two-div { width: 450px; height: 150px; - left: 0px; - top: 0px; } .style-right-div { width: 250px; height: 200px; - left: 10px; - top: 10px; flex-direction: column; } diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js diff --git a/examples/showcase/src/main/js/default/pages/component/progress/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/progress/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/progress/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/progress/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.css b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.css old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/slider/attr/attr.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.css index 2929d28..0985799 --- a/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.css @@ -38,23 +38,17 @@ .two-div { width: 450px; height: 150px; - left: 0px; - top: 0px; } .two-left-div { width: 220px; height: 150px; - left: 0px; - top: 0px; flex-direction: column; } .two-right-div { width: 230px; height: 150px; - top: 40px; - left: 0px; } .item-three { @@ -65,23 +59,17 @@ .three-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .three-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .three-right-div { width: 230px; height: 190px; - top: 40px; - left: 0px; } .slider { diff --git a/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/attr/attr.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.hml diff --git a/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js diff --git a/examples/showcase/src/main/js/default/pages/component/slider/event/event.css b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.css old mode 100755 new mode 100644 similarity index 95% rename from examples/showcase/src/main/js/default/pages/component/slider/event/event.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.css index 71c47bd..d57c01f --- a/examples/showcase/src/main/js/default/pages/component/slider/event/event.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.css @@ -38,23 +38,17 @@ .two-div { width: 450px; height: 300px; - left: 0px; - top: 0px; } .two-left-div { width: 220px; height: 300px; - left: 0px; - top: 0px; flex-direction: column; } .three-right-div { width: 230px; height: 300px; - top: 40px; - left: 0px; } .slider { diff --git a/examples/showcase/src/main/js/default/pages/component/slider/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/event/event.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.hml diff --git a/examples/showcase/src/main/js/default/pages/component/slider/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/event/event.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.js diff --git a/examples/showcase/src/main/js/default/pages/component/slider/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/slider/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/slider/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/slider/style/style.css b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.css old mode 100755 new mode 100644 similarity index 95% rename from examples/showcase/src/main/js/default/pages/component/slider/style/style.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.css index 8c5adfc..39d737e --- a/examples/showcase/src/main/js/default/pages/component/slider/style/style.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.css @@ -53,8 +53,6 @@ .two-right-div { width: 230px; height: 150px; - top: 40px; - left: 0px; } .item-three { @@ -65,23 +63,17 @@ .three-div { width: 450px; height: 200px; - left: 0px; - top: 0px; } .three-left-div { width: 220px; height: 200px; - left: 0px; - top: 0px; flex-direction: column; } .three-right-div { width: 230px; height: 190px; - top: 40px; - left: 0px; } .slider { diff --git a/examples/showcase/src/main/js/default/pages/component/slider/style/style.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/style/style.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.hml diff --git a/examples/showcase/src/main/js/default/pages/component/slider/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/slider/style/style.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/index/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/index/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/index/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/index/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.css index 7a5644b..213527d --- a/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.css @@ -22,7 +22,5 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml new file mode 100644 index 0000000..da246b0 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.hml @@ -0,0 +1,35 @@ + + + + + + + + + + stack已设置样式 + + + + {{text1}} + + + {{text2}} + + + {{text3}} + + diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.css old mode 100755 new mode 100644 similarity index 94% rename from examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.css index 1426740..31cb152 --- a/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.css +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.css @@ -15,7 +15,5 @@ .text { width: 200px; height: 50px; - margin-top: 10px; - margin-left: 10px; font-size: 30px; } diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.hml old mode 100755 new mode 100644 similarity index 91% rename from examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.hml index dad4463..67f6be9 --- a/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.hml @@ -15,8 +15,8 @@ limitations under the License.
- - + + diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.hml old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.hml diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.css b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.css old mode 100755 new mode 100644 similarity index 100% rename from examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.css rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.css diff --git a/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.hml old mode 100755 new mode 100644 similarity index 98% rename from examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.hml rename to frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.hml index acaeaa3..5e477fe --- a/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.hml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -
+
+ + + + diff --git a/examples/showcase/src/main/js/default/pages/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 92% rename from examples/showcase/src/main/js/default/pages/index/index.js rename to frameworks/examples/showcase/src/main/js/default/pages/index/index.js index 8a0740e..83b3754 --- a/examples/showcase/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/index/index.js @@ -13,9 +13,13 @@ * limitations under the License. */ import { backPage, routePage } from "../../common/js/general"; +import app from '@system.app'; export default { changeComponent1: routePage("pages/component/index/containerIndex/index").changePage, changeComponent2: routePage("pages/component/index/baseIndex/index").changePage, changeComponent3: routePage("pages/component/index/formIndex/index").changePage, - changeComponent4: routePage("pages/component/index/otherIndex/index").changePage + changeComponent4: routePage("pages/component/index/otherIndex/index").changePage, + exit(){ + app.terminate(); + } }; diff --git a/include/base/dft_impl.h b/frameworks/include/base/dft_impl.h similarity index 72% rename from include/base/dft_impl.h rename to frameworks/include/base/dft_impl.h index e5dcd60..bd9b7af 100755 --- a/include/base/dft_impl.h +++ b/frameworks/include/base/dft_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -18,13 +18,20 @@ #include "acelite_config.h" -#ifdef OHOS_ACELITE_PRODUCT_WATCH +#if (defined(OHOS_ACELITE_PRODUCT_WATCH)) || (defined(CHANGE_START_PAGE)) #include "memory_heap.h" namespace OHOS { namespace ACELite { typedef void (*PageReplacedCallback)(const char *path, int state); +struct Param { + const char *routerParam = nullptr; + const char *path = nullptr; +}; + +typedef void (*PageInfoFunc)(const Param param); + class DftImpl final : public MemoryHeap { public: static DftImpl *GetInstance(); @@ -36,15 +43,17 @@ public: */ void RegisterPageReplaced(PageReplacedCallback handler); + void RegisterPageChangedCallback(PageInfoFunc pageInfoFunc); + /** * @fn DftImpl::CallbackPageReplaced() * * @brief Call the path handler if it's set */ - void CallbackPageReplaced(int state); + void CallbackPageReplaced(int state, const char *param = nullptr); private: - DftImpl() : pageReplacedCallback_(nullptr) {} + DftImpl() : pageReplacedCallback_(nullptr), pageInfoFunc_(nullptr) {} ~DftImpl() = default; @@ -56,8 +65,9 @@ private: char *GetPagePath(); PageReplacedCallback pageReplacedCallback_; + PageInfoFunc pageInfoFunc_; }; } // namespace ACELite } // namespace OHOS #endif // OHOS_ACELITE_PRODUCT_WATCH -#endif // OHOS_ACELITE_DFT_IMPL_H \ No newline at end of file +#endif // OHOS_ACELITE_DFT_IMPL_H diff --git a/include/base/js_config.h b/frameworks/include/base/js_config.h old mode 100755 new mode 100644 similarity index 72% rename from include/base/js_config.h rename to frameworks/include/base/js_config.h index 0c9e5d8..e7c0257 --- a/include/base/js_config.h +++ b/frameworks/include/base/js_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -20,34 +20,12 @@ /* * Usage: - * #if ENABLED(SECURE_C_FUNCTION) - * #if DISABLED(SECURE_C_FUNCTION) - * #if ENABLED(SECURE_C_FUNCTION) && DISABLED(LOG_OUTPUT) - * #if ENABLED(SECURE_C_FUNCTION) || ENABLED(LOG_OUTPUT) + * #if DISABLED(LOG_OUTPUT) + * #if ENABLED(LOG_OUTPUT) */ #define ENABLED(CONFIGURATION) ((CONFIGURATION) == 1) #define DISABLED(CONFIGURATION) ((CONFIGURATION) != 1) -/** - * Enable secure C functions on real device, and disable on PC simulator for - * windows sdk version issue. - * - * Allowed values: - * 0: Disable the secure C functions. - * 1: Enable the secure C functions. - * - * Default: 1 on real device and 0 on PC simulator. - */ -#if (!defined _WIN32) && (!defined _WIN64) -#ifndef SECURE_C_FUNCTION -#define SECURE_C_FUNCTION 1 // modify here for real device case -#endif -#else -#ifndef SECURE_C_FUNCTION -#define SECURE_C_FUNCTION 0 // modify here for PC simulator case -#endif -#endif - /** * Enable/Disable JS framework runtime performance measurement. * diff --git a/include/base/js_debugger_config.h b/frameworks/include/base/js_debugger_config.h old mode 100755 new mode 100644 similarity index 75% rename from include/base/js_debugger_config.h rename to frameworks/include/base/js_debugger_config.h index 3afe749..134ea33 --- a/include/base/js_debugger_config.h +++ b/frameworks/include/base/js_debugger_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -25,8 +25,16 @@ */ namespace OHOS { namespace ACELite { -enum DebugProtocol { TCP, SERIAL }; -enum DebugChannel { WEBSOCKET, RAWPACKET }; +// the protocol type the engine supports +enum DebugProtocol : uint8_t { + TCP, + SERIAL +}; +// the protocol channel type the engine supports +enum DebugChannel : uint8_t { + WEBSOCKET, + RAWPACKET +}; const uint16_t DEFAULT_PORT = 5001; // default port struct DebuggerConfig : public MemoryHeap { DebugProtocol protocol; // use tcp as default @@ -34,18 +42,28 @@ struct DebuggerConfig : public MemoryHeap { uint32_t heapSize; // the JS heap size want to setup, count in bytes uint16_t port; // used for tcp, default is 5001 bool startDebuggerServer; // default is false - bool logToFile; // default print to stdout bool snapshotMode; // if run in snapshot mode - char *logFilePath; // the log file path DebuggerConfig() : protocol(TCP), channel(WEBSOCKET), heapSize(0), port(DEFAULT_PORT), startDebuggerServer(false), - logToFile(false), - snapshotMode(false), - logFilePath(nullptr) + snapshotMode(false) + { + } + DebuggerConfig(DebugProtocol debugProtocol, + DebugChannel debugChannel, + uint32_t size, + uint16_t debuggerPort, + bool startServer, + bool isSnapshotMode) + : protocol(debugProtocol), + channel(debugChannel), + heapSize(size), + port(debuggerPort), + startDebuggerServer(startServer), + snapshotMode(isSnapshotMode) { } }; @@ -64,27 +82,10 @@ public: * * @return an instance of debugger */ - static Debugger &GetInstance() - { - static Debugger instance; - return instance; - } - Debugger() -#if ENABLED(ENGINE_DEBUGGER) - : consoleLogFileHandler_(nullptr), -#ifdef JS_ENGINE_EXTERNAL_CONTEXT - engineContext_(nullptr), -#endif // JS_ENGINE_EXTERNAL_CONTEXT - debuggerStarted_(false) -#endif // ENABLED(ENGINE_DEBUGGER) - {} + static Debugger &GetInstance(); + Debugger() = default; ~Debugger() = default; - /** - * @brief Configure related debugger - */ - void ConfigDebugger(); - /** * @brief Get state of the debugger * @@ -132,13 +133,12 @@ public: void ReleaseJSContext(); private: #if ENABLED(ENGINE_DEBUGGER) - FILE *consoleLogFileHandler_; #ifdef JS_ENGINE_EXTERNAL_CONTEXT - void *engineContext_; + void *engineContext_ = nullptr; #endif // JS_ENGINE_EXTERNAL_CONTEXT - bool debuggerStarted_; + bool debuggerStarted_ = false; + DebuggerConfig debuggerConfig_ = {TCP, WEBSOCKET, 0, DEFAULT_PORT, false, false}; #endif // ENABLED(ENGINE_DEBUGGER) - DebuggerConfig debuggerConfig_; }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/include/base/product_adapter.h b/frameworks/include/base/product_adapter.h new file mode 100644 index 0000000..ed60067 --- /dev/null +++ b/frameworks/include/base/product_adapter.h @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_ACE_DFX_ADAPTER_H +#define OHOS_ACELITE_ACE_DFX_ADAPTER_H + +#include +#include "jsi_types.h" + +namespace OHOS { +namespace ACELite { +/** + * This handler type is so specific for product, should be designed from OS dfx level. + */ +typedef void (*EventPrintHandler)(uint8_t info1, uint8_t info2, uint8_t info3, uint8_t info4); +typedef void (*ErrCodePrintHandler)(uint8_t info1, uint8_t info2, uint8_t info3, uint16_t info4); + +/** + * The hook for outputing user's console log. + */ +typedef void (*JSLogOutputHandler)(uint8_t level, const char *content); + +/** + * The wrapper data structure for get native memory pool info. + */ +struct NativeMemInfo { + uint32_t totalSize; /* mem pool total size */ + uint32_t freeSize; /* total free size */ +}; + +/** + * Native memory pool info getter. + */ +typedef void (*NativeMemInfoGetter)(NativeMemInfo *memInfo); + +/** + * Product modules hook. + */ +typedef Module* (*ProductModulesGetter)(uint16_t& moduleCount); + +/** + * Private modules hook. + */ +typedef PrivateModule* (*PrivateModulesGetter)(uint16_t& moduleCount); + +/** + * The hook for terminating ability. + */ +typedef void (*TerminateAbilityHandler)(uint32_t token, bool forceStop); + +/** + * As all the UI event handling is driven by the render tick, and to make sure the the event handling is + * in JS task, the HAL layer will transfer the TE event into the loop of JS task, when JS application go forground. + */ +typedef void (*RenderTEHandler)(); +typedef void (*VoidFuncHook)(); + +/** + * The wrapper data structure for get native memory pool info. + */ +struct TEHandlingHooks { + RenderTEHandler renderTEHandler; + VoidFuncHook renderEndHandler; +}; + +enum TEDispatchingResult : uint8_t { + REFUSED = 0, // not on forground, will refuse TE, vsync should send it to other + ACCEPTED, // on forground, and TE event is received successfully + ACCEPT_FAILED, // on forground, but TE event can not be received, vsync should be retried to send to ACE again +}; + +/** + * The wrapper class for some product feature implementation, since some interfaces are provided by specific product. + */ +class ProductAdapter final { +public: + ProductAdapter(const ProductAdapter &) = delete; + ProductAdapter &operator=(const ProductAdapter &) = delete; + ProductAdapter(ProductAdapter &&) = delete; + ProductAdapter &operator=(ProductAdapter &&) = delete; + ProductAdapter() = delete; + ~ProductAdapter() = delete; + + // initialization functions + static void InitTraceHandlers(EventPrintHandler eventHandler, ErrCodePrintHandler errCodeHandler); + static void InitAceTags(uint8_t *aceTags, uint8_t tagCount); + static void InitConsoleNativeHandler(JSLogOutputHandler handler); + static void InitNativeMemPoolHook(NativeMemInfoGetter getter); + static void InitExtraModulesGetter(ProductModulesGetter productModuleGetter, + PrivateModulesGetter privateModuleGetter); + static void RegTerminatingHandler(TerminateAbilityHandler handler); + static void RegTEHandlers(const TEHandlingHooks &teHandlingHooks); + static TEDispatchingResult DispatchTEMessage(); + static void SetDefaultFontStyle(const char *defaultFontFamily, uint8_t defaultFontSize); + static void SetScreenSize(uint16_t width, uint16_t height); + + // wrapper functions, for ace internal calling + static void PrintEventTrace(uint8_t info2, uint8_t info3, uint8_t info4); + static void PrintErrCode(uint8_t info2, uint16_t rfu); + static void OutputJSConsoleLog(uint8_t level, const char *content); + static void GetNativeMemInfo(NativeMemInfo *memInfo); + static void SendTerminatingRequest(uint32_t token, bool forceStop); + static bool IsTEHandlersRegisted(); + static void ProcessOneTE(); + static void NotifyRenderEnd(); + static const char *GetDefaultFontFamilyName(); + static uint8_t GetDefaultFontSize(); + static void UpdateShowingState(bool forground); + static void GetScreenSize(uint16_t &width, uint16_t &height); +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_ACE_DFX_ADAPTER_H diff --git a/include/context/js_ability.h b/frameworks/include/context/js_ability.h similarity index 85% rename from include/context/js_ability.h rename to frameworks/include/context/js_ability.h index 8cb34b3..dc1671d 100755 --- a/include/context/js_ability.h +++ b/frameworks/include/context/js_ability.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -23,12 +23,6 @@ namespace OHOS { namespace ACELite { -/** - * As all the UI event handling is driven by the render tick, and to make sure the the event handling is - * in JS task, the HAL layer will transfer the TE event into the loop of JS task, when JS application go forground. - */ -typedef int32_t (*RenderTickHandler)(); - class JSAbility final : public MemoryHeap { public: JSAbility(const JSAbility &) = delete; @@ -57,7 +51,7 @@ public: * the JS framework and eval abilityPath/src/index.js as well * @param [in] the ability path to bundle name and token of this ability */ - void Launch(const char *abilityPath, const char *bundleName, uint16_t token); + void Launch(const char *abilityPath, const char *bundleName, uint16_t token, const char *pageInfo = nullptr); /** * @fn JSAbility::Show() @@ -101,13 +95,6 @@ public: */ void ForceDestroy(); - /** - * @fn JSAbility::RegisterTEHandler() - * - * @brief Register render tick event handler - */ - static void RegisterTEHandler(RenderTickHandler handler); - /** * @fn JSAbility::HandleRenderTick() * @@ -115,6 +102,13 @@ public: */ void HandleRenderTick(); + /** + * @fn JSAbility::LazyLoadHandleRenderTick() + * + * @brief Call the lazy load tick if it's set + */ + static void LazyLoadHandleRenderTick(void *data); + private: // the holder of JS runtime and user' JS related environment void *jsAbilityImpl_; diff --git a/include/resource/video_panel_image_res.h b/frameworks/include/resource/video_panel_image_res.h old mode 100755 new mode 100644 similarity index 100% rename from include/resource/video_panel_image_res.h rename to frameworks/include/resource/video_panel_image_res.h diff --git a/packages/runtime-core/.babelrc b/frameworks/packages/runtime-core/.babelrc old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/.babelrc rename to frameworks/packages/runtime-core/.babelrc diff --git a/packages/runtime-core/.editorconfig b/frameworks/packages/runtime-core/.editorconfig old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/.editorconfig rename to frameworks/packages/runtime-core/.editorconfig diff --git a/packages/runtime-core/.eslintignore b/frameworks/packages/runtime-core/.eslintignore old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/.eslintignore rename to frameworks/packages/runtime-core/.eslintignore diff --git a/packages/runtime-core/.eslintrc.js b/frameworks/packages/runtime-core/.eslintrc.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/.eslintrc.js rename to frameworks/packages/runtime-core/.eslintrc.js diff --git a/packages/runtime-core/.gitignore b/frameworks/packages/runtime-core/.gitignore old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/.gitignore rename to frameworks/packages/runtime-core/.gitignore diff --git a/packages/runtime-core/.prettierrc b/frameworks/packages/runtime-core/.prettierrc old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/.prettierrc rename to frameworks/packages/runtime-core/.prettierrc diff --git a/packages/runtime-core/.size-snapshot.json b/frameworks/packages/runtime-core/.size-snapshot.json old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/.size-snapshot.json rename to frameworks/packages/runtime-core/.size-snapshot.json diff --git a/packages/runtime-core/contribution.md b/frameworks/packages/runtime-core/contribution.md similarity index 93% rename from packages/runtime-core/contribution.md rename to frameworks/packages/runtime-core/contribution.md index 8d43fbf..02d9f02 100644 --- a/packages/runtime-core/contribution.md +++ b/frameworks/packages/runtime-core/contribution.md @@ -27,7 +27,7 @@ > cd packages/runtime-core/build/ > ./../../../tools/snapshot/jerry_bin/linux/jerry-snapshot generate -o framework.min.bc ./framework.min.js - ## 5. Update the JS and sanpshot array in C++ code + ## 5. Update the JS and snapshot array in C++ code > cd tools/snapshot/ > python framework2char.py diff --git a/packages/runtime-core/package-lock.json b/frameworks/packages/runtime-core/package-lock.json similarity index 100% rename from packages/runtime-core/package-lock.json rename to frameworks/packages/runtime-core/package-lock.json diff --git a/packages/runtime-core/package.json b/frameworks/packages/runtime-core/package.json similarity index 100% rename from packages/runtime-core/package.json rename to frameworks/packages/runtime-core/package.json diff --git a/packages/runtime-core/scripts/build.js b/frameworks/packages/runtime-core/scripts/build.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/scripts/build.js rename to frameworks/packages/runtime-core/scripts/build.js diff --git a/packages/runtime-core/scripts/configs.js b/frameworks/packages/runtime-core/scripts/configs.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/scripts/configs.js rename to frameworks/packages/runtime-core/scripts/configs.js diff --git a/packages/runtime-core/src/__test__/index.test.js b/frameworks/packages/runtime-core/src/__test__/index.test.js similarity index 100% rename from packages/runtime-core/src/__test__/index.test.js rename to frameworks/packages/runtime-core/src/__test__/index.test.js diff --git a/packages/runtime-core/src/core/index.js b/frameworks/packages/runtime-core/src/core/index.js similarity index 100% rename from packages/runtime-core/src/core/index.js rename to frameworks/packages/runtime-core/src/core/index.js diff --git a/packages/runtime-core/src/index.js b/frameworks/packages/runtime-core/src/index.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/src/index.js rename to frameworks/packages/runtime-core/src/index.js diff --git a/packages/runtime-core/src/observer/index.js b/frameworks/packages/runtime-core/src/observer/index.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/src/observer/index.js rename to frameworks/packages/runtime-core/src/observer/index.js diff --git a/packages/runtime-core/src/observer/observer.js b/frameworks/packages/runtime-core/src/observer/observer.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/src/observer/observer.js rename to frameworks/packages/runtime-core/src/observer/observer.js diff --git a/packages/runtime-core/src/observer/subject.js b/frameworks/packages/runtime-core/src/observer/subject.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/src/observer/subject.js rename to frameworks/packages/runtime-core/src/observer/subject.js diff --git a/packages/runtime-core/src/observer/utils.js b/frameworks/packages/runtime-core/src/observer/utils.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/src/observer/utils.js rename to frameworks/packages/runtime-core/src/observer/utils.js diff --git a/packages/runtime-core/src/profiler/index.js b/frameworks/packages/runtime-core/src/profiler/index.js old mode 100755 new mode 100644 similarity index 100% rename from packages/runtime-core/src/profiler/index.js rename to frameworks/packages/runtime-core/src/profiler/index.js diff --git a/src/core/animation/transition_impl.cpp b/frameworks/src/core/animation/transition_impl.cpp similarity index 80% rename from src/core/animation/transition_impl.cpp rename to frameworks/src/core/animation/transition_impl.cpp index 3f0afec..6b31fd4 100755 --- a/src/core/animation/transition_impl.cpp +++ b/frameworks/src/core/animation/transition_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -12,16 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "transition_impl.h" +#include "transition_impl.h" #include -#if ENABLED(SECURE_C_FUNCTION) -#include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) #include "ace_log.h" #include "ace_mem_base.h" #include "easing_equation.h" #include "root_view.h" +#include "securec.h" namespace OHOS { namespace ACELite { @@ -40,6 +38,7 @@ void TransitionImpl::Init() void TransitionImpl::Callback(UIView* view) { + (void)(view); if (animator_ == nullptr) { return; } @@ -56,27 +55,27 @@ void TransitionImpl::Callback(UIView* view) void TransitionImpl::Start() { - if (animator_) { - uint8_t state = animator_->GetState(); - if (((state == Animator::STOP) || (state == Animator::PAUSE)) && (params_.during > 0)) { - RecordViewStatus(); - InitTransitionParams(); - animator_->Start(); - } - } else { + if (animator_ == nullptr) { HILOG_INFO(HILOG_MODULE_ACE, "animator not initial or has been started"); + return; + } + uint8_t state = animator_->GetState(); + if (((state == Animator::STOP) || (state == Animator::PAUSE)) && (params_.during > 0)) { + RecordViewStatus(); + InitTransitionParams(); + animator_->Start(); } } void TransitionImpl::Stop() const { - if (animator_) { - uint8_t state = animator_->GetState(); - if (state == Animator::START || state == Animator::RUNNING) { - animator_->Stop(); - } - } else { + if (animator_ == nullptr) { HILOG_INFO(HILOG_MODULE_ACE, "animator not initial or is not running"); + return; + } + uint8_t state = animator_->GetState(); + if (state == Animator::START || state == Animator::RUNNING) { + animator_->Stop(); } } @@ -106,7 +105,7 @@ void TransitionImpl::InitTransitionParamsStyle() widthSrc_ = params_.width_from; } if (params_.opacity_from >= 0 && params_.opacity_to >= 0) { - isTransitionSet_[GeneralType::IS_OPCITY_TRANSITION_SET] = true; + isTransitionSet_[GeneralType::IS_OPACITY_TRANSITION_SET] = true; opacitySrc_ = (params_.opacity_from <= OPA_OPAQUE) ? params_.opacity_from : OPA_OPAQUE; params_.opacity_to = (params_.opacity_to <= OPA_OPAQUE) ? params_.opacity_to : OPA_OPAQUE; } @@ -123,6 +122,7 @@ void TransitionImpl::InitTransitionParamsStyle() void TransitionImpl::InitTransitionParamsTransform() { if (params_.transformType == nullptr) { + HILOG_INFO(HILOG_MODULE_ACE, "transformType not set"); return; } if (!strcmp(params_.transformType, TRANSITION_TRANSFORM_X)) { @@ -201,9 +201,9 @@ void TransitionImpl::RotateAroundCenterPoint(int16_t angle) TransformMap transMap(view_->GetOrigRect()); const int circleRate = 360; angle = angle % circleRate; - uint8_t halfVal = 2; - pivot_.x_ = view_->GetWidth() / halfVal; - pivot_.y_ = view_->GetHeight() / halfVal; + float halfVal = 2.0f; + pivot_.x_ = (view_->GetWidth() - 1) / halfVal; + pivot_.y_ = (view_->GetHeight() - 1) / halfVal; transMap.Rotate((angle), pivot_); view_->SetTransformMap(transMap); } @@ -239,7 +239,7 @@ void TransitionImpl::Perform(int32_t elapsedTime) PerformTransition(params_.width_from, params_.width_to, TransitionType::WIDTH, widthSrc_, elapsedTime); } - if (isTransitionSet_[GeneralType::IS_OPCITY_TRANSITION_SET]) { + if (isTransitionSet_[GeneralType::IS_OPACITY_TRANSITION_SET]) { PerformTransition(params_.opacity_from, params_.opacity_to, TransitionType::OPACITY, opacitySrc_, elapsedTime); } @@ -247,7 +247,7 @@ void TransitionImpl::Perform(int32_t elapsedTime) PerformTransitionBgColorLinear(elapsedTime); } - if (fill_ == OptionsFill::FNONE && timeArrivaled_) { + if ((fill_ == OptionsFill::FNONE) && timeArrivaled_) { RecoveryViewStatus(view_->GetRect()); } @@ -282,88 +282,83 @@ void TransitionImpl::PerformTransition(int16_t from, int16_t& updateAttrValue, int32_t elapsedTime) { - bool needUpdate = true; - if (timeArrivaled_) { updateAttrValue = to; } else { - int16_t prefectchedValue = 0; - prefectchedValue = GetNextFrameValue(from, to, elapsedTime); - int16_t diffDistance = prefectchedValue - updateAttrValue; + int16_t prefetchedValue = 0; + prefetchedValue = GetNextFrameValue(from, to, elapsedTime); + int16_t diffDistance = prefetchedValue - updateAttrValue; if (((diffDistance < 1) && (diffDistance > -1)) || (elapsedTime > params_.during)) { - needUpdate = false; - } else { - updateAttrValue = static_cast(prefectchedValue); + return; } + updateAttrValue = static_cast(prefetchedValue); } - if (needUpdate) { - Rect invalidatedArea = view_->GetRect(); - - switch (transitionType) { - case TransitionType::TTRANSLATE_X: - view_->SetPosition((updateAttrValue + viewStatus_.x), viewStatus_.y); - break; - case TransitionType::TTRANSLATE_Y: - view_->SetPosition(viewStatus_.x, (updateAttrValue + viewStatus_.y)); - break; - case TransitionType::TROTATE: { - RotateAroundCenterPoint(updateAttrValue); - break; - } - case TransitionType::HEIGHT: - view_->SetHeight(updateAttrValue); - break; - case TransitionType::WIDTH: - view_->SetWidth(updateAttrValue); - break; - case TransitionType::OPACITY: { - double rate = (double)updateAttrValue / ALPHA_MAX; - view_->SetStyle(STYLE_BACKGROUND_OPA, viewStatus_.rectOpacity * rate); - view_->SetStyle(STYLE_IMAGE_OPA, viewStatus_.imageOpacity * rate); - view_->SetStyle(STYLE_LINE_OPA, viewStatus_.lineOpacity * rate); - view_->SetStyle(STYLE_TEXT_OPA, viewStatus_.textOpacity * rate); - break; - } - default: - HILOG_INFO(HILOG_MODULE_ACE, "animation nothing to do."); - break; + Rect invalidatedArea = view_->GetRect(); + switch (transitionType) { + case TransitionType::TTRANSLATE_X: + view_->SetPosition((updateAttrValue + viewStatus_.x), viewStatus_.y); + break; + case TransitionType::TTRANSLATE_Y: + view_->SetPosition(viewStatus_.x, (updateAttrValue + viewStatus_.y)); + break; + case TransitionType::TROTATE: { + RotateAroundCenterPoint(updateAttrValue); + break; } - - invalidatedArea.Join(invalidatedArea, view_->GetRect()); - view_->InvalidateRect(invalidatedArea); + case TransitionType::HEIGHT: + view_->SetHeight(updateAttrValue); + break; + case TransitionType::WIDTH: + view_->SetWidth(updateAttrValue); + break; + case TransitionType::OPACITY: { + double rate = (double)updateAttrValue / ALPHA_MAX; + view_->SetStyle(STYLE_BACKGROUND_OPA, viewStatus_.rectOpacity * rate); + view_->SetStyle(STYLE_IMAGE_OPA, viewStatus_.imageOpacity * rate); + view_->SetStyle(STYLE_LINE_OPA, viewStatus_.lineOpacity * rate); + view_->SetStyle(STYLE_TEXT_OPA, viewStatus_.textOpacity * rate); + break; + } + default: + HILOG_INFO(HILOG_MODULE_ACE, "animation nothing to do."); + break; } + + invalidatedArea.Join(invalidatedArea, view_->GetRect()); + view_->InvalidateRect(invalidatedArea); } int8_t TransitionImpl::GetNumIterations(const char* iterations) { + int8_t min = 1; + int8_t max = 127; + if (iterations == nullptr) { + return min; + } if (!strcmp(iterations, "infinite")) { return TransitionImpl::ITERATIONS_INFINITY; } - - int8_t min = 1; - int8_t max = 127; long value = strtol(iterations, nullptr, DEC); if ((value < min) || (value > max)) { HILOG_ERROR(HILOG_MODULE_ACE, "animation iterations should set between 1 and 127"); return min; - } else { - return (int8_t)value; } + return (int8_t)value; } bool TransitionImpl::IsEndWith(const char* src, const char* end) { - if (src == nullptr || end == nullptr) { + if ((src == nullptr) || (end == nullptr)) { return false; } size_t strLen = strlen(src); size_t endLen = strlen(end); - if (strLen < endLen || strLen == 0 || endLen == 0) { + if ((strLen < endLen) || (strLen == 0) || (endLen == 0)) { return false; } - while ((endLen > 0) && (strLen > 0)) { + while (endLen > 0) { if (src[strLen - 1] != end[endLen - 1]) { return false; } diff --git a/src/core/animation/transition_impl.h b/frameworks/src/core/animation/transition_impl.h similarity index 94% rename from src/core/animation/transition_impl.h rename to frameworks/src/core/animation/transition_impl.h index 864feb1..fb669f5 100755 --- a/src/core/animation/transition_impl.h +++ b/frameworks/src/core/animation/transition_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -23,9 +23,9 @@ namespace OHOS { namespace ACELite { -enum EasingType { LINEAR, EASE_IN, EASE_OUT, EASE_IN_OUT, EEND }; +enum EasingType : uint8_t { LINEAR, EASE_IN, EASE_OUT, EASE_IN_OUT, EEND }; -enum OptionsFill { FNONE, FORWARDS }; +enum OptionsFill : uint8_t { FNONE, FORWARDS }; struct TransitionParams { /* animation execution time (ms), default is 0, means no animation effect. */ @@ -91,17 +91,22 @@ struct ViewStatus { oriRect(), background_color() {}; }; -enum TransformType { TRANSLATE_X, TRANSLATE_Y, ROTATE, NONE }; // rotate only support image +enum TransformType : uint8_t { + TRANSLATE_X, + TRANSLATE_Y, + ROTATE, // rotate only support image + NONE +}; -enum GeneralType { +enum GeneralType : uint8_t { IS_HEIGHT_TRANSITION_SET, IS_WIDTH_TRANSITION_SET, IS_BACKGROUND_COLOR_TRANSITION_SET, - IS_OPCITY_TRANSITION_SET, + IS_OPACITY_TRANSITION_SET, END }; -enum TransitionType { +enum TransitionType : uint8_t { TTRANSLATE_X, TTRANSLATE_Y, TROTATE, @@ -183,7 +188,7 @@ private: TransitionParams& params_; int8_t oriIteration_; Animator* animator_; - Vector2 pivot_; + Vector2 pivot_; int16_t xSrc_; int16_t ySrc_; int16_t rotateSrc_; diff --git a/src/core/async/js_async_work.cpp b/frameworks/src/core/async/js_async_work.cpp similarity index 98% rename from src/core/async/js_async_work.cpp rename to frameworks/src/core/async/js_async_work.cpp index 6765bd7..f1cd37c 100755 --- a/src/core/async/js_async_work.cpp +++ b/frameworks/src/core/async/js_async_work.cpp @@ -90,7 +90,8 @@ bool JsAsyncWork::DispatchAsyncWorkInner(AsyncWorkHandler workHandler, AsyncHand bool ret = DispatchToLoop(ASYNCWORK, static_cast(asyncWork)); if (!ret) { - HILOG_ERROR(HILOG_MODULE_ACE, "JsAsyncWork:DispatchAsyncWork failed!, handler[%p]", asyncWork->workHandler); + HILOG_ERROR(HILOG_MODULE_ACE, "JsAsyncWork:DispatchAsyncWork failed!, handler[%{private}p]", + asyncWork->workHandler); delete(asyncWork); asyncWork = nullptr; } diff --git a/src/core/async/message_queue_utils.cpp b/frameworks/src/core/async/message_queue_utils.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/async/message_queue_utils.cpp rename to frameworks/src/core/async/message_queue_utils.cpp diff --git a/frameworks/src/core/base/ace_event_id.h b/frameworks/src/core/base/ace_event_id.h new file mode 100644 index 0000000..90e1e71 --- /dev/null +++ b/frameworks/src/core/base/ace_event_id.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_ACE_EVENT_ID_H +#define OHOS_ACELITE_ACE_EVENT_ID_H + +// ACE framework event codes +#define MT_ACE_RELEASE_HISTORY_PAGE 0x01 +#define MT_ACE_FEATUREABILITY 0x08 +#define MT_ACE_FEATUREABILITY_SUBSCRIBEMSG 0x00 +#define MT_ACE_FEATUREABILITY_UNSUBSCRIBEMSG 0x01 + +// ACE framework error codes +#define EXCE_ACE_FWK_LAUNCH_FAILED 0x01 +#define EXCE_ACE_ROUTER_REPLACE_FAILED 0x02 +#define EXCE_ACE_ASYNC_WORK_FAILED 0x03 +#define EXCE_ACE_LOCALIZATION_FAILED 0x04 +#define EXCE_ACE_ENGINE_RUNTIME_ERROR 0x05 + +// ACE framework error code : engine runtime error +#define EXCE_ACE_JS_HEAP_OOM 0x0001 +#define EXCE_ACE_JS_REF_COUNT_LIMIT 0x0002 +#define EXCE_ACE_JS_DISABLED_BYTE_CODE 0x0003 +#define EXCE_ACE_JS_FAILED_INTERNAL_ASSERTION 0x0004 + +// ACE framework error code : fwk launch error +#define EXCE_ACE_INVALID_APP_PATH 0x0001 +#define EXCE_ACE_INVALID_BUNDLE_NAME 0x0002 +#define EXCE_ACE_INIT_FWK_FAILED 0x0003 +#define EXCE_ACE_APP_ENTRY_MISSING 0x0004 +#define EXCE_ACE_APP_ENTRY_FILE_TOO_HUGE 0x0005 +#define EXCE_ACE_APP_ALREADY_LAUNCHED 0x0006 +#define EXCE_ACE_APP_INDEX_MISSING 0x0007 +#define EXCE_ACE_APP_FILE_TOO_HUGE 0x0008 +#define EXCE_ACE_APP_FILE_READ_FAILED 0x0009 +#define EXCE_ACE_APP_JS_EVAL_FAILED 0x000A +#define EXCE_ACE_APP_NO_RENDER_FUNC 0x000B +#define EXCE_ACE_APP_RENDER_FAILED 0x000C + +// ACE framework error code : router replace +#define EXCE_ACE_ROUTER_REPLACE_BIND_URI_FAILED 0x0001 +#define EXCE_ACE_PAGE_INDEX_MISSING 0x0002 +#define EXCE_ACE_PAGE_FILE_TOO_HUGE 0x0003 +#define EXCE_ACE_PAGE_FILE_READ_FAILED 0x0004 +#define EXCE_ACE_PAGE_JS_EVAL_FAILED 0x0005 +#define EXCE_ACE_PAGE_NO_RENDER_FUNC 0x0006 +#define EXCE_ACE_PAGE_RENDER_FAILED 0x0007 + +// ACE framework error code : async work +#define EXCE_ACE_ASYNC_WORK_DISPATCH_FAILED 0x0001 + +// ACE framework error code : localization +#define EXCE_ACE_LOCALIZATION_SYSTEM_LANGUAGE_NOT_INITIALIZED 0x0001 +#define EXCE_ACE_LOCALIZATION_CJSON_CREATE_FAILED 0x0002 +#define EXCE_ACE_LOCALIZATION_VALUE_FAILED 0x0003 + +#endif // OHOS_ACELITE_ACE_EVENT_ID_H \ No newline at end of file diff --git a/src/core/base/ace_log.cpp b/frameworks/src/core/base/ace_log.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/ace_log.cpp rename to frameworks/src/core/base/ace_log.cpp diff --git a/src/core/base/ace_log.h b/frameworks/src/core/base/ace_log.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/ace_log.h rename to frameworks/src/core/base/ace_log.h diff --git a/frameworks/src/core/base/ace_mem_base.cpp b/frameworks/src/core/base/ace_mem_base.cpp new file mode 100755 index 0000000..9552526 --- /dev/null +++ b/frameworks/src/core/base/ace_mem_base.cpp @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2020-2021 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. + */ +#include "ace_mem_base.h" + +#include +#include "cache_manager.h" + +namespace OHOS { +namespace ACELite { +/** + * @brief g_customHookSet + * Record the memory hooks used for ACE, only can be setup once when system start-up. + * The standard memory allocating methods are used as default. + */ +static ACEMemHooks g_memoryHooks = {malloc, free, calloc}; +/** + * @brief g_customHookSet flag for representing if the customer hooks are set + */ +static bool g_customHookSet = false; + +void InitMemHooks(const ACEMemHooks &hooks) +{ + if (g_customHookSet) { + // only can be configured once + return; + } + if ((hooks.malloc_func == nullptr) || (hooks.free_func == nullptr)) { + // the malloc and free must be given + return; + } + g_memoryHooks.malloc_func = hooks.malloc_func; + g_memoryHooks.free_func = hooks.free_func; + g_memoryHooks.calloc_func = hooks.calloc_func; + // set the flag + g_customHookSet = true; +} + +void InitCacheBuf(uintptr_t bufAddress, size_t bufSize) +{ + CacheManager::GetInstance().SetupCacheMemInfo(bufAddress, bufSize); +} + +void *ace_malloc(size_t size) +{ + return g_memoryHooks.malloc_func(size); +} + +void *ace_calloc(size_t num, size_t size) +{ + return (g_memoryHooks.calloc_func != nullptr) ? (g_memoryHooks.calloc_func(num, size)) : nullptr; +} + +void ace_free(void *ptr) +{ + g_memoryHooks.free_func(ptr); +} +} // namespace ACELite +} // namespace OHOS diff --git a/src/core/base/ace_version.h b/frameworks/src/core/base/ace_version.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/ace_version.h rename to frameworks/src/core/base/ace_version.h diff --git a/frameworks/src/core/base/async_task_manager.cpp b/frameworks/src/core/base/async_task_manager.cpp new file mode 100755 index 0000000..5f0d4e1 --- /dev/null +++ b/frameworks/src/core/base/async_task_manager.cpp @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "async_task_manager.h" +#include "ace_log.h" +#include "fatal_handler.h" + +#if (defined(__LINUX__) || defined(__LITEOS_A__)) +#define TRY_LOCK() \ + { \ + pthread_mutex_lock(&lock_); \ + } + +#define TRY_UNLOCK() \ + { \ + pthread_mutex_unlock(&lock_); \ + } +#elif defined(__LITEOS_M__) +#define TRY_LOCK() \ + { \ + LOS_TaskLock(); \ + } +#define TRY_UNLOCK() \ + { \ + LOS_TaskUnlock(); \ + } +#else +#define TRY_LOCK() \ + { \ + } +#define TRY_UNLOCK() \ + { \ + } +#endif + +namespace OHOS { +namespace ACELite { +AsyncTaskManager::AsyncTaskManager() + : head_(nullptr), + tail_(nullptr), +#if (defined(__LINUX__) || defined(__LITEOS_A__)) + lock_(PTHREAD_MUTEX_INITIALIZER), +#endif + uniqueTaskID_(0), + front_(true) +{ +#if (defined(__LINUX__) || defined(__LITEOS_A__)) + pthread_mutex_init(&lock_, nullptr); +#endif +} + +AsyncTaskManager::~AsyncTaskManager() +{ + while (head_ != nullptr) { + AsyncTask *task = head_; + head_ = head_->next; + delete task; + task = nullptr; + } + tail_ = nullptr; +} + +AsyncTaskManager &AsyncTaskManager::GetInstance() +{ + static AsyncTaskManager instance; + return instance; +} + +void AsyncTaskManager::Init() +{ + Task::Init(); +} + +void AsyncTaskManager::Callback() +{ + if (!front_) { + return; + } + + while (head_ != nullptr) { + AsyncTask *task = head_; + task->handler(task->data); + if (head_ == tail_) { + tail_ = nullptr; + } + head_ = head_->next; + delete task; + task = nullptr; + } +} + +uint16_t AsyncTaskManager::Dispatch(AsyncTaskHandler handler, void *data) +{ + if (handler == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "AsyncTaskManager::Dispatch failed: handler is null."); + return DISPATCH_FAILURE; + } + if (FatalHandler::GetInstance().IsFatalErrorHitted()) { + HILOG_ERROR(HILOG_MODULE_ACE, "AsyncTaskManager::Dispatch failed: Fatal error is hitted."); + return DISPATCH_FAILURE; + } + TRY_LOCK(); + auto *task = new AsyncTask(); + if (task == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "AsyncTaskManager::Dispatch failed: out of memory."); + TRY_UNLOCK(); + return DISPATCH_FAILURE; + } + task->handler = handler; + task->data = data; + task->id = (++uniqueTaskID_); + task->next = nullptr; + if (head_ == nullptr) { + head_ = task; + tail_ = task; + } else { + tail_->next = task; + tail_ = task; + } + TRY_UNLOCK(); + return uniqueTaskID_; +} + +void AsyncTaskManager::Cancel(uint16_t taskID) +{ + if (DISPATCH_FAILURE == taskID) { + HILOG_ERROR(HILOG_MODULE_ACE, "AsyncTaskManager::Cancel failed: invalid task ID."); + return; + } + TRY_LOCK(); + AsyncTask *node = head_; + AsyncTask *prev = nullptr; + while (node != nullptr) { + if (node->id == taskID) { + if (prev == nullptr) { + head_ = head_->next; + } else { + prev->next = node->next; + if (node == tail_) { + tail_ = prev; + } + } + delete node; + node = nullptr; + break; + } + prev = node; + node = node->next; + } + TRY_UNLOCK(); +} + +void AsyncTaskManager::SetFront(bool front) +{ + front_ = front; +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/async_task_manager.h b/frameworks/src/core/base/async_task_manager.h new file mode 100755 index 0000000..7d8a0a9 --- /dev/null +++ b/frameworks/src/core/base/async_task_manager.h @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_ASYNC_TASK_MANAGER_H +#define OHOS_ACELITE_ASYNC_TASK_MANAGER_H + +#if (defined(__LINUX__) || defined(__LITEOS_A__)) +#include +#elif defined(__LITEOS_M__) +#include "los_task.h" +#endif + +#include "common/task_manager.h" +#include "memory_heap.h" +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +using AsyncTaskHandler = void (*)(void *); + +struct AsyncTask final : public MemoryHeap { + uint16_t id; + AsyncTaskHandler handler; + void *data; + AsyncTask *next; +}; + +constexpr uint16_t DISPATCH_FAILURE = 0; + +class AsyncTaskManager final : public Task { +public: + ACE_DISALLOW_COPY_AND_MOVE(AsyncTaskManager); + + static AsyncTaskManager &GetInstance(); + + virtual void Init() override; + + virtual void Callback() override; + + uint16_t Dispatch(AsyncTaskHandler handler, void *data); + + void Cancel(uint16_t taskID); + + void SetFront(bool front); + +private: + AsyncTaskManager(); + + ~AsyncTaskManager(); + + AsyncTask *head_; + AsyncTask *tail_; +#if (defined(__LINUX__) || defined(__LITEOS_A__)) + pthread_mutex_t lock_; +#endif + uint16_t uniqueTaskID_; + bool front_; +}; +} // namespace ACELite +} // namespace OHOS +#endif \ No newline at end of file diff --git a/frameworks/src/core/base/cache/cache_config.h b/frameworks/src/core/base/cache/cache_config.h new file mode 100644 index 0000000..0c8c9f1 --- /dev/null +++ b/frameworks/src/core/base/cache/cache_config.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_CACHE_CONFIG_H +#define OHOS_ACELITE_CACHE_CONFIG_H + +#include + +namespace OHOS { +namespace ACELite { +/** + * The magic number used at the beginning of every cache memory area. + */ +constexpr uint8_t MAGIC_NUMBER_LENGTH = 4; // count in bytes +constexpr uint32_t CACHE_MEM_MAGIC_NUMBER = 0xCCCCCCCC; + +constexpr uint8_t ALIGNMENT_SIZE = 8; + +/** + * Every cache user can not use more than the max length buffer. + * Count in KB. + */ +constexpr uint8_t CACHE_UNIT_MAX_KBS = 128; // max 128KB +constexpr uint32_t CACHE_UNIT_MAX_BYTES = CACHE_UNIT_MAX_KBS * 1024; + +/** + * Define the purpose of the specific cache memory range. + */ +enum CacheUser : uint8_t { + USER_LOCALICATION, + USER_PAGE_FILE, + USER_MAX_COUNT +}; + +/** + * Records the cache requester info. + */ +struct CacheUnit { + // the cache unit owner + CacheUser cacheUser_; + // the required min buffer length, count in KB, max is 255KB + uint8_t minLength_; + // constructors + CacheUnit() : cacheUser_(USER_MAX_COUNT), minLength_(CACHE_UNIT_MAX_KBS) {} + CacheUnit(CacheUser user, uint8_t length) : cacheUser_(user), minLength_(length) {} +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_CACHE_CONFIG_H \ No newline at end of file diff --git a/frameworks/src/core/base/cache/cache_manager.cpp b/frameworks/src/core/base/cache/cache_manager.cpp new file mode 100644 index 0000000..32d663a --- /dev/null +++ b/frameworks/src/core/base/cache/cache_manager.cpp @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "cache_manager.h" + +#include "ace_log.h" +#include "securec.h" + +namespace OHOS { +namespace ACELite { +/** + * This table will decide the cache usage distribution. If one module want to use cache functionality, + * it must config here first. The cache manager will assign buffer according to the actual whole + * buffer rang, if the buffer supplement is rich, every cache user might be assigned one buffer + * rang bigger than its lowest requirement. + * + * NOTE: the user must not be duplicated in this list + */ +const CacheUnit CacheManager::DEFAULT_CONFIG_TABLE[] = { + {USER_LOCALICATION, 16}, // localication key-value cache, lowest 16KB +}; + +CacheManager::CacheManager() : cacheState_(STATE_NORMAL) +{ + configTable_ = DEFAULT_CONFIG_TABLE; + configTableLen_ = sizeof(DEFAULT_CONFIG_TABLE) / sizeof(CacheUnit); + ResetDistributedInfo(); +} + +CacheManager &CacheManager::GetInstance() +{ + static CacheManager cacheManager; + return cacheManager; +} + +void CacheManager::ResetDistributedInfo() +{ + wholeCacheMemInfo_.cacheStartAddr = 0; + wholeCacheMemInfo_.cacheLength = 0; + if (EOK != + memset_s(cacheUnitInfo_, sizeof(CacheMemInfo) * USER_MAX_COUNT, 0, sizeof(CacheMemInfo) * USER_MAX_COUNT)) { + HILOG_ERROR(HILOG_MODULE_ACE, "reset cache info failed"); + } +} + +void CacheManager::SetConfigTable(const CacheUnit *table, size_t count) +{ + if (cacheState_ == STATE_SUCCESS) { + // reset + cacheState_ = STATE_NORMAL; + ResetDistributedInfo(); + } + configTable_ = table; + configTableLen_ = count; +} + +void CacheManager::SetupCacheMemInfo(uintptr_t startAddr, size_t length) +{ + // only can be setup once + if (cacheState_ == STATE_SUCCESS) { + return; + } + // try to distribute the whole buffer, and if the buffer length can not meet the lowest requirement, just give up + cacheState_ = DistributeCacheRange(startAddr, length); + if (cacheState_ != STATE_SUCCESS) { + return; + } + wholeCacheMemInfo_.cacheStartAddr = startAddr; + wholeCacheMemInfo_.cacheLength = length; +} + +CacheSetupState CacheManager::DistributeCacheRange(uintptr_t startAddr, size_t totalBytes) +{ + if (configTableLen_ == 0 || configTable_ == nullptr) { + // no user, return normal as no one cares + return STATE_NORMAL; + } + if (startAddr == 0 || totalBytes == 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "error cache buffer rang!"); + return STATE_FAILURE; + } + // count in KB + size_t lowestRequirement = 0; + size_t index = 0; + while (index < configTableLen_) { + lowestRequirement = lowestRequirement + configTable_[index].minLength_; + index++; + } + constexpr uint16_t bytesOneKB = 1024; + size_t totalKBs = totalBytes / bytesOneKB; + if (lowestRequirement > totalKBs) { + // the given buffer is less than the lowest requirement + HILOG_ERROR(HILOG_MODULE_ACE, "the cache buffer length can not meet the lowest requirement!"); + return STATE_FAILURE; + } + + index = 0; + // will put one magic number at the begin and end of every buffer + constexpr uint8_t magicNumberCount = 2; + size_t offset = 0; + while (index < configTableLen_) { + size_t requestBytes = (configTable_[index].minLength_ * bytesOneKB) + (MAGIC_NUMBER_LENGTH * magicNumberCount); + uintptr_t startPos = startAddr + offset; + cacheUnitInfo_[configTable_[index].cacheUser_].cacheStartAddr = startPos; + cacheUnitInfo_[configTable_[index].cacheUser_].cacheLength = requestBytes; + // set magic number + *(reinterpret_cast(startPos)) = CACHE_MEM_MAGIC_NUMBER; + *(reinterpret_cast(startPos + requestBytes - MAGIC_NUMBER_LENGTH)) = CACHE_MEM_MAGIC_NUMBER; + offset = offset + requestBytes; + index++; + } + return STATE_SUCCESS; +} + +bool CacheManager::IsEnvReady(CacheUser user) const +{ + if (cacheState_ != STATE_SUCCESS) { + return false; + } + return ((user < USER_MAX_COUNT) && (cacheUnitInfo_[user].cacheStartAddr != 0)); +} + +uintptr_t CacheManager::GetCacheBufAddress(CacheUser user) const +{ + if (!IsEnvReady(user)) { + return 0; + } + return cacheUnitInfo_[user].cacheStartAddr + MAGIC_NUMBER_LENGTH; +} + +size_t CacheManager::GetCacheBufLength(CacheUser user) const +{ + if (!IsEnvReady(user)) { + return 0; + } + return cacheUnitInfo_[user].cacheLength; +} + +bool CacheManager::IsCacheOverflow(CacheUser user) const +{ + if (!IsEnvReady(user)) { + return false; + } + // get head and tail magic number + uint32_t *bufferHead = reinterpret_cast(cacheUnitInfo_[user].cacheStartAddr); + uint32_t headMagicNumber = reinterpret_cast(*(bufferHead)); + uint32_t *bufferTail = reinterpret_cast(cacheUnitInfo_[user].cacheStartAddr + + cacheUnitInfo_[user].cacheLength - MAGIC_NUMBER_LENGTH); + uint32_t tailMagicNumber = reinterpret_cast(*(bufferTail)); + // if the head magic number was over write, it means someone else overflow this area + if (headMagicNumber != CACHE_MEM_MAGIC_NUMBER) { + HILOG_ERROR(HILOG_MODULE_ACE, "the cache buffer[%d] was overflown by someone else?", user); + return true; + } + // if the tail magic number was over write, it means the user itself overflow this area + if (tailMagicNumber != CACHE_MEM_MAGIC_NUMBER) { + HILOG_ERROR(HILOG_MODULE_ACE, "the cache buffer[%d] was overflown by self?", user); + return true; + } + return false; +} + +bool CacheManager::IsWholeCacheHealthy() const +{ + if (cacheState_ != STATE_SUCCESS) { + return false; + } + for (int i = 0; i < USER_MAX_COUNT; i++) { + if (IsCacheOverflow(CacheUser(i))) { + return false; + } + } + return true; +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/cache/cache_manager.h b/frameworks/src/core/base/cache/cache_manager.h new file mode 100644 index 0000000..49a2376 --- /dev/null +++ b/frameworks/src/core/base/cache/cache_manager.h @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_CACHE_MANAGER_H +#define OHOS_ACELITE_CACHE_MANAGER_H + +#include "cache_config.h" + +#include +#include +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +/** + * The structure used for recording the cache memory detail information. + */ +struct CacheMemInfo { + // the cache memory start address, including the magic number at beginning + uintptr_t cacheStartAddr; + // count in bytes, and the max capability is 4M, including the maginc number at the beginning and ending + size_t cacheLength; +}; + +enum CacheSetupState : uint8_t { + STATE_NORMAL, // the cache is not initialized ever, or no user is configured + STATE_SUCCESS, // the cache was initialized and distributed to all users successfully + STATE_FAILURE, // the cache was tried be initialized but failed to distributed to all users +}; + +/** + * This is one singleton instance for cache memory management. It can be used + * out of the applications' lifecycle. It records the memory area for all kinds + * of caching purpose in the frameworks. If the cache memory rang is not setup, + * the cache functionality will not work. + */ +class CacheManager final { +public: + static CacheManager &GetInstance(); + void SetupCacheMemInfo(uintptr_t startAddr, size_t length); + uintptr_t GetCacheBufAddress(CacheUser user) const; + size_t GetCacheBufLength(CacheUser user) const; + bool IsCacheAvailable(CacheUser user) const; + bool IsCacheOverflow(CacheUser user) const; + bool IsWholeCacheHealthy() const; + /** + * @brief SetConfigTable give the config table from outside, call this function carefully + * @param table the config table + * @param count the actual user count + */ + void SetConfigTable(const CacheUnit *table, size_t count); + +private: + ACE_DISALLOW_COPY_AND_MOVE(CacheManager); + CacheManager(); + ~CacheManager() = default; + /** + * @brief ResetDistributedInfo clean up all assigned buffer info + */ + void ResetDistributedInfo(); + /** + * @brief DistributeCacheRange called once to assign proper memory rang to all the user in the config table + * @param startAddr the entire cache buffer start address + * @param length the entire cache length + * @return the result of the assignment process, if the memory size can not meet the lowest request, the process + * will return false as failure + */ + CacheSetupState DistributeCacheRange(uintptr_t startAddr, size_t length); + bool IsEnvReady(CacheUser user) const; + CacheMemInfo wholeCacheMemInfo_; + CacheMemInfo cacheUnitInfo_[USER_MAX_COUNT]; // count in bytes + const CacheUnit *configTable_; + size_t configTableLen_; + CacheSetupState cacheState_; + static const CacheUnit DEFAULT_CONFIG_TABLE[]; +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_CACHE_MANAGER_H \ No newline at end of file diff --git a/src/core/async/BUILD.gn b/frameworks/src/core/base/cache/test/unittest/BUILD.gn similarity index 53% rename from src/core/async/BUILD.gn rename to frameworks/src/core/base/cache/test/unittest/BUILD.gn index 4e95508..3780b5d 100755 --- a/src/core/async/BUILD.gn +++ b/frameworks/src/core/base/cache/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -#Copyright (c) 2020 Huawei Device Co., Ltd. +#Copyright (c) 2021 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 @@ -9,16 +9,19 @@ #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. +#limitations under the License. -source_set("async") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "js_async_work.cpp", - "message_queue_utils.cpp", - ] - include_dirs = [ - ] +import("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +unittest("js_frameworks_test_cache_manager") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "common/cache_manager_tdd_test.cpp" ] + deps = ace_test_deps +} + +group("cache_manager_unittest") { + deps = [ ":js_frameworks_test_cache_manager" ] } diff --git a/frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.cpp b/frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.cpp new file mode 100755 index 0000000..190446d --- /dev/null +++ b/frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.cpp @@ -0,0 +1,232 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "cache_manager_tdd_test.h" + +#include "ace_mem_base.h" + +namespace OHOS { +namespace ACELite { +const CacheUnit CacheManagerTddTest::TEST_CONFIG_TABLE[] = { + {USER_LOCALICATION, 16}, // localication key-value cache, lowest 16KB +}; + +void CacheManagerTddTest::SetUp() +{ + const size_t count = 1; + CacheManager::GetInstance().SetConfigTable(TEST_CONFIG_TABLE, count); +} + +/** + * @tc.name: CacheDistributeTest001 + * @tc.desc: Verify the cache distribution process + * @tc.require: AR000F8FOG + */ +HWTEST_F(CacheManagerTddTest, CacheDistribute001, TestSize.Level1) +{ + /** + * @tc.steps: step1. prepare cache buffer + */ + const size_t totalSize = 20 * 1024; // 20KB + char *buffer = static_cast(ace_malloc(sizeof(char) * totalSize)); + if (buffer == nullptr) { + return; + } + /** + * @tc.steps: step2. trigger the cache setup + */ + uintptr_t startAddr = reinterpret_cast(buffer); + CacheManager::GetInstance().SetupCacheMemInfo(startAddr, totalSize); + /** + * @tc.steps: step3. verify the result + */ + uintptr_t localicationPos = CacheManager::GetInstance().GetCacheBufAddress(CacheUser::USER_LOCALICATION); + size_t localicationBufSize = CacheManager::GetInstance().GetCacheBufLength(CacheUser::USER_LOCALICATION); + const uintptr_t targetPos = startAddr + MAGIC_NUMBER_LENGTH; + const size_t unit = 1024; + const uint8_t magicNumberCount = 2; + const uint8_t localicationMin = 16; + const size_t targetLength = (localicationMin * unit) + (magicNumberCount * MAGIC_NUMBER_LENGTH); + EXPECT_EQ(localicationPos, targetPos); + EXPECT_EQ(localicationBufSize, targetLength); + ace_free(buffer); + buffer = nullptr; +} + +/** + * @tc.name: CacheDistributeTest002 + * @tc.desc: Verify the cache distribution process + * @tc.require: AR000F8FOG + */ +HWTEST_F(CacheManagerTddTest, CacheDistribute002, TestSize.Level1) +{ + /** + * @tc.steps: step1. prepare cache buffer + */ + const size_t totalSize = 20 * 1024; // 40KB + char *buffer = static_cast(ace_malloc(sizeof(char) * totalSize)); + if (buffer == nullptr) { + return; + } + const uint8_t pageFileBufLength = 6; + const uint8_t localicationBufLength = 8; + const CacheUnit customerCacheUnitTable[] = { + {USER_PAGE_FILE, pageFileBufLength}, + {USER_LOCALICATION, localicationBufLength}, + }; + /** + * @tc.steps: step2. trigger the cache setup + */ + const size_t count = 2; + CacheManager::GetInstance().SetConfigTable(customerCacheUnitTable, count); + uintptr_t startAddr = reinterpret_cast(buffer); + CacheManager::GetInstance().SetupCacheMemInfo(startAddr, totalSize); + /** + * @tc.steps: step3. verify the result + */ + uintptr_t bufferPos = CacheManager::GetInstance().GetCacheBufAddress(CacheUser::USER_LOCALICATION); + size_t bufSize = CacheManager::GetInstance().GetCacheBufLength(CacheUser::USER_LOCALICATION); + const size_t unit = 1024; + const uint8_t magicNumberCount = 2; + uintptr_t targetPos = + startAddr + (pageFileBufLength * unit) + (magicNumberCount * MAGIC_NUMBER_LENGTH) + MAGIC_NUMBER_LENGTH; + const size_t targetLength = (localicationBufLength * unit) + (magicNumberCount * MAGIC_NUMBER_LENGTH); + EXPECT_EQ(bufferPos, targetPos); + EXPECT_EQ(bufSize, targetLength); + ace_free(buffer); + buffer = nullptr; +} + +/** + * @tc.name: CacheDistributeTest003 + * @tc.desc: Verify the cache distribution process + * @tc.require: AR000F8FOG + */ +HWTEST_F(CacheManagerTddTest, CacheDistribute003, TestSize.Level1) +{ + /** + * @tc.steps: step1. prepare cache buffer + */ + const size_t totalSize = 2 * 1024; // 2KB + char *buffer = static_cast(ace_malloc(sizeof(char) * totalSize)); + if (buffer == nullptr) { + return; + } + + /** + * @tc.steps: step2. trigger the cache setup + */ + uintptr_t startAddr = reinterpret_cast(buffer); + CacheManager::GetInstance().SetupCacheMemInfo(startAddr, totalSize); + /** + * @tc.steps: step3. verify the result + */ + uintptr_t localPos = CacheManager::GetInstance().GetCacheBufAddress(CacheUser::USER_LOCALICATION); + size_t localBufSize = CacheManager::GetInstance().GetCacheBufLength(CacheUser::USER_LOCALICATION); + EXPECT_EQ(localPos, 0); + EXPECT_EQ(localBufSize, 0); + ace_free(buffer); + buffer = nullptr; +} + +/** + * @tc.name: CacheDistributeTest004 + * @tc.desc: Verify the cache distribution process + * @tc.require: AR000F8FOG + */ +HWTEST_F(CacheManagerTddTest, CacheDistribute004, TestSize.Level1) +{ + /** + * @tc.steps: step1. prepare cache buffer + */ + const size_t totalSize = 20 * 1024; // 20KB + char *buffer = static_cast(ace_malloc(sizeof(char) * totalSize)); + if (buffer == nullptr) { + return; + } + + /** + * @tc.steps: step2. trigger the cache setup + */ + uintptr_t startAddr = reinterpret_cast(buffer); + CacheManager::GetInstance().SetupCacheMemInfo(startAddr, totalSize); + /** + * @tc.steps: step3. verify the result + */ + uintptr_t bufStartPos = CacheManager::GetInstance().GetCacheBufAddress(CacheUser::USER_LOCALICATION); + size_t bufLength = CacheManager::GetInstance().GetCacheBufLength(CacheUser::USER_LOCALICATION); + uint32_t headMagicNumber = *(uint32_t *)(bufStartPos - MAGIC_NUMBER_LENGTH); + EXPECT_EQ(headMagicNumber, CACHE_MEM_MAGIC_NUMBER); + const uint8_t magicNumberCount = 2; + uint32_t tailMagicNumber = *(uint32_t *)(bufStartPos + bufLength - (magicNumberCount * MAGIC_NUMBER_LENGTH)); + EXPECT_EQ(tailMagicNumber, CACHE_MEM_MAGIC_NUMBER); + ace_free(buffer); + buffer = nullptr; +} + +/** + * @tc.name: CacheDistributeTest005 + * @tc.desc: Verify the cache distribution process and overflow checking + * @tc.require: AR000F8FOG + */ +HWTEST_F(CacheManagerTddTest, CacheDistribute005, TestSize.Level1) +{ + /** + * @tc.steps: step1. prepare cache buffer + */ + const size_t totalSize = 20 * 1024; // 20KB + char *buffer = static_cast(ace_malloc(sizeof(char) * totalSize)); + if (buffer == nullptr) { + return; + } + + /** + * @tc.steps: step2. trigger the cache setup + */ + uintptr_t startAddr = reinterpret_cast(buffer); + CacheManager::GetInstance().SetupCacheMemInfo(startAddr, totalSize); + size_t bufLength = CacheManager::GetInstance().GetCacheBufLength(CacheUser::USER_LOCALICATION); + if (bufLength < MAGIC_NUMBER_LENGTH) { + ace_free(buffer); + buffer = nullptr; + return; + } + /** + * @tc.steps: step3. overflow the cache head and tail + */ + buffer[0] = 0x11; + size_t tailPos = bufLength - MAGIC_NUMBER_LENGTH; + buffer[tailPos] = 0x22; + EXPECT_TRUE(CacheManager::GetInstance().IsCacheOverflow(CacheUser::USER_LOCALICATION)); + EXPECT_FALSE(CacheManager::GetInstance().IsWholeCacheHealthy()); + ace_free(buffer); + buffer = nullptr; +} + +/** + * used for debugging TDD implementation on simulator + */ +void CacheManagerTddTest::RunTests() +{ +#ifndef TDD_ASSERTIONS + CacheDistribute001(); + CacheDistribute002(); + CacheDistribute003(); + CacheDistribute004(); + CacheDistribute005(); +#endif // TDD_ASSERTIONS +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.h b/frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.h new file mode 100755 index 0000000..ddbaff6 --- /dev/null +++ b/frameworks/src/core/base/cache/test/unittest/common/cache_manager_tdd_test.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_CACHE_MANAGER_TDD_TEST_H +#define OHOS_ACELITE_CACHE_MANAGER_TDD_TEST_H + +#include "acelite_config.h" +#include "cache_config.h" +#include "cache_manager.h" +#ifdef TDD_ASSERTIONS +#include +#include +#endif +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class CacheManagerTddTest : public testing::Test { +#else +class CacheManagerTddTest { +#endif +public: + CacheManagerTddTest() = default; + ~CacheManagerTddTest() = default; + void SetUp(); + void CacheDistribute001(); + void CacheDistribute002(); + void CacheDistribute003(); + void CacheDistribute004(); + void CacheDistribute005(); + void RunTests(); + +private: + static const CacheUnit TEST_CONFIG_TABLE[]; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_CACHE_MANAGER_TDD_TEST_H \ No newline at end of file diff --git a/src/core/base/dft_impl.cpp b/frameworks/src/core/base/dft_impl.cpp similarity index 77% rename from src/core/base/dft_impl.cpp rename to frameworks/src/core/base/dft_impl.cpp index 2815504..fa97af2 100755 --- a/src/core/base/dft_impl.cpp +++ b/frameworks/src/core/base/dft_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,7 +15,7 @@ #include "dft_impl.h" -#ifdef OHOS_ACELITE_PRODUCT_WATCH +#if (defined(OHOS_ACELITE_PRODUCT_WATCH))||(defined(CHANGE_START_PAGE)) #include "ace_log.h" #include "js_app_context.h" @@ -57,13 +57,24 @@ void DftImpl::RegisterPageReplaced(PageReplacedCallback handler) pageReplacedCallback_ = handler; } -void DftImpl::CallbackPageReplaced(int state) +void DftImpl::RegisterPageChangedCallback(PageInfoFunc pageInfoFunc) +{ + pageInfoFunc_ = pageInfoFunc; +} + +void DftImpl::CallbackPageReplaced(int state, const char *param) { if (pageReplacedCallback_ != nullptr) { char *currentPath = DftImpl::GetPagePath(); pageReplacedCallback_(currentPath, state); ACE_FREE(currentPath); } + if ((pageInfoFunc_ != nullptr) && (param != nullptr)) { + Param value; + value.routerParam = param; + value.path = JsAppContext::GetInstance()->GetCurrentJsPath(); + pageInfoFunc_(value); + } } } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/base/dfx_assist.cpp b/frameworks/src/core/base/dfx_assist.cpp new file mode 100644 index 0000000..ed2fff9 --- /dev/null +++ b/frameworks/src/core/base/dfx_assist.cpp @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "dfx_assist.h" +#include "ace_log.h" +#include "jerryscript-core.h" +#include "presets/console_log_impl.h" + +namespace OHOS { +namespace ACELite { +void DfxAssist::DumpErrorCode(const jerry_value_t errorValue) +{ + const uint16_t errorMsgMaxLength = 128; + if (!jerry_is_feature_enabled(JERRY_FEATURE_ERROR_MESSAGES)) { + return; + } + + jerry_value_t errValue = jerry_get_value_from_error(errorValue, false); + jerry_value_t errStrVal = jerry_value_to_string(errValue); + jerry_release_value(errValue); + + if (jerry_value_is_error(errStrVal)) { + /* Avoid recursive error throws. */ + HILOG_ERROR(HILOG_MODULE_ACE, "[Error value to string failed]"); + jerry_release_value(errStrVal); + return; + } + + jerry_size_t errStrSize = jerry_get_utf8_string_size(errStrVal); + if (errStrSize >= errorMsgMaxLength) { + HILOG_ERROR(HILOG_MODULE_ACE, "[Error message too long]"); + jerry_release_value(errStrVal); + return; + } + + jerry_char_t *errStrBuffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (errStrSize + 1))); + if (errStrBuffer == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc memory failed!"); + jerry_release_value(errStrVal); + return; + } + jerry_size_t stringEnd = jerry_string_to_utf8_char_buffer(errStrVal, errStrBuffer, errStrSize); + errStrBuffer[stringEnd] = '\0'; + // output to platform trace + HILOG_ERROR(HILOG_MODULE_ACE, " [JS Error]: %s", reinterpret_cast(errStrBuffer)); + // output to user console + LogString(LogLevel::LOG_LEVEL_ERR, "[JS Exception]: "); + LogString(LogLevel::LOG_LEVEL_ERR, reinterpret_cast(errStrBuffer)); + // output line separator to trigger trace output + LogString(LogLevel::LOG_LEVEL_ERR, "\n"); + ace_free(errStrBuffer); + errStrBuffer = nullptr; + jerry_release_value(errStrVal); +} + +void DfxAssist::DumpErrorMessage(const jerry_value_t errorValue) +{ + const uint16_t stackMsgMaxLength = 256; + const uint8_t arrMaxLength = 32; + jerry_value_t stackStr = jerry_create_string((const jerry_char_t *) "stack"); + jerry_value_t errorVal = jerry_get_value_from_error(errorValue, false); + + jerry_value_t backtraceVal = jerry_get_property(errorVal, stackStr); + jerry_release_value(stackStr); + jerry_release_value(errorVal); + + if (jerry_value_is_error(backtraceVal) || !(jerry_value_is_array(backtraceVal))) { + jerry_release_value(backtraceVal); + return; + } + + uint32_t length = jerry_get_array_length(backtraceVal); + if (length == 0) { + jerry_release_value(backtraceVal); + return; + } + if (length > arrMaxLength) { + length = arrMaxLength; + } + + jerry_char_t *errStrBuffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (stackMsgMaxLength))); + if (errStrBuffer == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc memory failed!"); + jerry_release_value(backtraceVal); + return; + } + HILOG_ERROR(HILOG_MODULE_ACE, "[Exception backtrace]:"); + for (uint8_t i = 0; i < length; i++) { + jerry_value_t itemVal = jerry_get_property_by_index(backtraceVal, i); + jerry_size_t strSize = 0; + if (!jerry_value_is_error(itemVal) && jerry_value_is_string(itemVal)) { + strSize = jerry_get_utf8_string_size(itemVal); + } + + if (strSize >= stackMsgMaxLength) { + HILOG_ERROR(HILOG_MODULE_ACE, "%u: [Backtrace string too long]", i); + } else { + jerry_size_t stringEnd = jerry_string_to_utf8_char_buffer(itemVal, errStrBuffer, strSize); + errStrBuffer[stringEnd] = '\0'; + HILOG_ERROR(HILOG_MODULE_ACE, "%u: %s", i, reinterpret_cast(errStrBuffer)); + } + jerry_release_value(itemVal); + } + ace_free(errStrBuffer); + errStrBuffer = nullptr; + jerry_release_value(backtraceVal); +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/dfx_assist.h b/frameworks/src/core/base/dfx_assist.h new file mode 100644 index 0000000..e960ad8 --- /dev/null +++ b/frameworks/src/core/base/dfx_assist.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_DFX_ASSIST_H +#define OHOS_ACELITE_DFX_ASSIST_H + +#include "acelite_config.h" +#include "js_app_context.h" +#include "memory_heap.h" +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +class DfxAssist final : public MemoryHeap { +public: + DfxAssist() = default; + + ~DfxAssist() = default; + + /** + * @fn DfxAssist::DumpErrorCode() + * + * @brief dump js error error code + */ + void DumpErrorCode(const jerry_value_t errorValue); + + /** + * @fn DfxAssist::DumpErrorMessage() + * + * @brief dump js stack error message + */ + void DumpErrorMessage(const jerry_value_t errorValue); +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_DFX_ASSIST_H diff --git a/frameworks/src/core/base/event_util.cpp b/frameworks/src/core/base/event_util.cpp new file mode 100755 index 0000000..3da9381 --- /dev/null +++ b/frameworks/src/core/base/event_util.cpp @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "event_util.h" +#include "ace_log.h" +#include "async_task_manager.h" + +namespace OHOS { +namespace ACELite { +constexpr char ATTR_TYPE[] = "type"; +constexpr char ATTR_TARGET[] = "target"; +constexpr char ATTR_CURRENT_TARGET[] = "currentTarget"; +constexpr char ATTR_TIMESTAMP[] = "timestamp"; +constexpr char ATTR_GLOBAL_X[] = "globalX"; +constexpr char ATTR_GLOBAL_Y[] = "globalY"; +constexpr char ATTR_DIRECTION[] = "direction"; +constexpr char ATTR_DIRECTION_RIGHT[] = "right"; +constexpr char ATTR_DIRECTION_LEFT[] = "left"; +constexpr char ATTR_DIRECTION_UP[] = "up"; +constexpr char ATTR_DIRECTION_DOWN[] = "down"; +const char *EventUtil::EVENT_CLICK = "click"; +const char *EventUtil::EVENT_LONGPRESS = "longpress"; +const char *EventUtil::EVENT_SWIPE = "swipe"; + +void CallbackExecutor(void *data) +{ + if (data == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "failed to execute the callback function of event."); + return; + } + + auto *params = static_cast(data); + if (!JSFunction::Is(params->fn)) { + HILOG_ERROR(HILOG_MODULE_ACE, "failed to execute the callback function of event."); + delete params; + params = nullptr; + return; + } + constexpr uint8_t argsLength = 1; + JSValue args[argsLength] = {params->arg}; + JSRelease(JSFunction::Call(params->fn, params->vm, args, argsLength)); + JSRelease(params->arg); + delete params; + params = nullptr; +} + +JSValue EventUtil::CreateEvent(const char *type, UIView &view, const Event &event) +{ + // create a JAVASCRIPT plain object that is used as the input parameter of + // the callback function for click or longpress event. + JSValue arg = JSObject::Create(); + // set the 'type' attribute value + JSObject::SetString(arg, ATTR_TYPE, type); + // set the 'target' attribute value + UIView *target = nullptr; + UIView *currentTarget = nullptr; + Point point = event.GetCurrentPos(); + view.GetTargetView(point, ¤tTarget, &target); + JSObject::Set(arg, ATTR_TARGET, GetElementByUIView(target)); + // set the 'currentTarget' attribute value + JSObject::Set(arg, ATTR_CURRENT_TARGET, GetElementByUIView(currentTarget)); + // set the 'timestamp' attribute value + JSObject::SetNumber(arg, ATTR_TIMESTAMP, event.GetTimeStamp()); + // set the 'globalX' attribute + JSObject::SetNumber(arg, ATTR_GLOBAL_X, point.x); + // set the 'globalY' attribute + JSObject::SetNumber(arg, ATTR_GLOBAL_Y, point.y); + return arg; +} +JSValue EventUtil::CreateSwipeEvent(UIView &view, const DragEvent &event) +{ + // create a JAVASCRIPT plain object that is used as the input parameter of + // the event callback function. + JSValue arg = EventUtil::CreateEvent(EVENT_SWIPE, view, event); + // set the 'direction' attribute for the input parameter of the swipe event callback function. + switch (event.GetDragDirection()) { + case DragEvent::DIRECTION_LEFT_TO_RIGHT: { + JSObject::SetString(arg, ATTR_DIRECTION, ATTR_DIRECTION_RIGHT); + break; + } + case DragEvent::DIRECTION_RIGHT_TO_LEFT: { + JSObject::SetString(arg, ATTR_DIRECTION, ATTR_DIRECTION_LEFT); + break; + } + case DragEvent::DIRECTION_TOP_TO_BOTTOM: { + JSObject::SetString(arg, ATTR_DIRECTION, ATTR_DIRECTION_DOWN); + break; + } + case DragEvent::DIRECTION_BOTTOM_TO_TOP: { + JSObject::SetString(arg, ATTR_DIRECTION, ATTR_DIRECTION_UP); + break; + } + default: { + HILOG_ERROR(HILOG_MODULE_ACE, "failed to set direction attribute for event argument."); + break; + } + } + return arg; +} +void EventUtil::InvokeCallback(JSValue vm, JSValue callback, JSValue event) +{ + auto *params = new CallbackParams(); + if (params == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "fail to invoke event callback."); + return; + } + params->vm = vm; + params->fn = callback; + params->arg = event; + // The views may be destroyed or recreated in conditional or list rendering. + // If we directly call the event callback function, the program will crash. + if (DISPATCH_FAILURE == AsyncTaskManager::GetInstance().Dispatch(CallbackExecutor, static_cast(params))) { + HILOG_ERROR(HILOG_MODULE_ACE, "EventUtil::InvokeCallback failed: Async task dispatch failure."); + delete params; + params = nullptr; + JSRelease(event); + } +} +JSValue EventUtil::GetElementByUIView(UIView *view) +{ + if (view == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "fail to get element by UI view."); + return JSUndefined::Create(); + } + UIView::ViewExtraMsg *extraMsg = view->GetExtraMsg(); + if (extraMsg == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "fail to get element by UI view."); + return JSUndefined::Create(); + } + JSValue *elementPtr = reinterpret_cast(extraMsg->elementPtr); + if (elementPtr == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "fail to get element by UI view."); + return JSUndefined::Create(); + } + return *elementPtr; +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/event_util.h b/frameworks/src/core/base/event_util.h new file mode 100755 index 0000000..e4fa6d0 --- /dev/null +++ b/frameworks/src/core/base/event_util.h @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_EVENT_UTIL_H +#define OHOS_ACELITE_EVENT_UTIL_H + +#include "non_copyable.h" +#include "ui_view.h" +#include "wrapper/js.h" + +namespace OHOS { +namespace ACELite { +struct CallbackParams : public MemoryHeap { + JSValue vm; + JSValue fn; + JSValue arg; +}; +class EventUtil final : public MemoryHeap { +public: + ACE_DISALLOW_COPY_AND_MOVE(EventUtil); + + /** + * @brief Create a JAVASCRIPT plain object that is used as the input parameter of + * the callback function for click or longpress event. + */ + static JSValue CreateEvent(const char *type, UIView &view, const Event &event); + + /** + * @brief Create a JAVASCRIPT plain object that is used as the input parameter of + * the callback function for swipe event. + */ + static JSValue CreateSwipeEvent(UIView &view, const DragEvent &event); + + /** + * @brief Invoke the callback function of event. + */ + static void InvokeCallback(JSValue vm, JSValue callback, JSValue event); + + static const char *EVENT_CLICK; + static const char *EVENT_LONGPRESS; + static const char *EVENT_SWIPE; + +private: + EventUtil() {} + ~EventUtil() {} + + /** + * @brief Get the DOM element that is reference to view + */ + static JSValue GetElementByUIView(UIView *view); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_EVENT_UTIL_H diff --git a/src/core/base/framework_min_bc.h b/frameworks/src/core/base/framework_min_bc.h old mode 100755 new mode 100644 similarity index 99% rename from src/core/base/framework_min_bc.h rename to frameworks/src/core/base/framework_min_bc.h index f29b227..6c357d5 --- a/src/core/base/framework_min_bc.h +++ b/frameworks/src/core/base/framework_min_bc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,13 +15,15 @@ // AUTO GENERATED, PLEASE DO NOT EDIT DIRECTLY +#include + #ifndef ACELITE_FRAMEWORK_RAW_BUFFER #error THIS FILE CAN ONLY BE INCLUDED BY RAW BUFFER CPP #endif #ifndef OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER #define OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER -const char g_frameworkBCBuffer[] = +const uint8_t g_frameworkBCBuffer[] = { 0x4a, 0x52, 0x52, 0x59, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, diff --git a/src/core/base/framework_min_js.h b/frameworks/src/core/base/framework_min_js.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/framework_min_js.h rename to frameworks/src/core/base/framework_min_js.h diff --git a/src/core/base/js_debugger_config.cpp b/frameworks/src/core/base/js_debugger_config.cpp old mode 100755 new mode 100644 similarity index 76% rename from src/core/base/js_debugger_config.cpp rename to frameworks/src/core/base/js_debugger_config.cpp index dc1488c..ec0a912 --- a/src/core/base/js_debugger_config.cpp +++ b/frameworks/src/core/base/js_debugger_config.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -23,6 +23,12 @@ namespace OHOS { namespace ACELite { +Debugger &Debugger::GetInstance() +{ + static Debugger instance; + return instance; +} + #if ENABLED(ENGINE_DEBUGGER) bool Debugger::IsDebuggerEnabled() { @@ -32,7 +38,6 @@ bool Debugger::IsDebuggerEnabled() void Debugger::ConfigEngineDebugger(DebuggerConfig &config) { debuggerConfig_ = config; - ConfigDebugger(); } void Debugger::StartDebugger() @@ -54,12 +59,9 @@ void Debugger::StartDebugger() jerryx_debugger_after_connect(protocol && connected); debuggerStarted_ = true; } + void Debugger::TearDownDebugger() { - if (consoleLogFileHandler_ != nullptr) { - fclose(consoleLogFileHandler_); - consoleLogFileHandler_ = nullptr; - } if ((!debuggerConfig_.startDebuggerServer) || !(jerry_is_feature_enabled(JERRY_FEATURE_DEBUGGER))) { return; } @@ -68,41 +70,14 @@ void Debugger::TearDownDebugger() debuggerStarted_ = false; } -void Debugger::ConfigDebugger() -{ - if (consoleLogFileHandler_ != nullptr) { - fclose(consoleLogFileHandler_); - consoleLogFileHandler_ = nullptr; - } - - if ((debuggerConfig_.logToFile)) { - if ((debuggerConfig_.logFilePath != nullptr) && (strlen(debuggerConfig_.logFilePath) > 0)) { - consoleLogFileHandler_ = fopen(debuggerConfig_.logFilePath, "w+"); - if (consoleLogFileHandler_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "can not open the console log output file"); - } - } - } -} - void Debugger::Output(const char * const str) { - // if debugger enabled, get config from debugger config - if (consoleLogFileHandler_ != nullptr) { - int res = fputs(str, consoleLogFileHandler_); - if (res == EOF) { - // write file error - HILOG_ERROR(HILOG_MODULE_ACE, "write log file failed"); - } - } // print out the log into stdout anyway printf("%s", str); } + void Debugger::FlushOutput() { - if (consoleLogFileHandler_ != nullptr) { - fflush(consoleLogFileHandler_); - } fflush(stdout); } @@ -150,29 +125,33 @@ bool Debugger::IsDebuggerEnabled() { return true; } + void Debugger::ConfigEngineDebugger(DebuggerConfig &config) { UNUSED(config); } + void Debugger::StartDebugger() { } + void Debugger::TearDownDebugger() { } -void Debugger::ConfigDebugger() -{ -} + void Debugger::Output(const char * const str) { UNUSED(str); } + void Debugger::FlushOutput() { } + void Debugger::SetupJSContext() { } + void Debugger::ReleaseJSContext() { } diff --git a/src/core/base/js_fwk_common.cpp b/frameworks/src/core/base/js_fwk_common.cpp similarity index 83% rename from src/core/base/js_fwk_common.cpp rename to frameworks/src/core/base/js_fwk_common.cpp index 4d411ab..9683239 100755 --- a/src/core/base/js_fwk_common.cpp +++ b/frameworks/src/core/base/js_fwk_common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -13,32 +13,33 @@ * limitations under the License. */ #include "js_fwk_common.h" +#include +#include +#include +#include +#include +#if ((defined(__WIN32)) || (defined(__WIN64))) +#include +#endif #include "ace_event_error_code.h" #include "ace_log.h" #include "ace_mem_base.h" #include "component.h" #include "component_utils.h" +#include "dfx_assist.h" #include "fatal_handler.h" -#include "file.h" #include "js_app_context.h" #include "js_app_environment.h" #include "js_profiler.h" #if ENABLED(CONSOLE_LOG_OUTPUT) #include "presets/console_module.h" #endif -#if ENABLED(SECURE_C_FUNCTION) -#include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) #include "presets/console_log_impl.h" +#include "product_adapter.h" +#include "securec.h" #include "task_manager.h" -#if defined(__LITEOS__) -#include -#include -#include -#endif - -#if ((defined __LITEOS__) || (defined __linux__) || (defined SCREENRESOLUTION_CMAKE)) +#if ((defined __LITEOS__) || (defined __linux__) || (defined SCREENSIZE_SPECIFIED)) #include #endif @@ -90,6 +91,19 @@ int16_t JerryGetIntegerProperty(jerry_value_t object, const char * const name) return result; } +bool JerryGetBoolProperty(jerry_value_t object, const char * const name, bool &outValue) +{ + jerry_value_t value = jerryx_get_property_str(object, name); + if (!jerry_value_is_boolean(value)) { + jerry_release_value(value); + HILOG_ERROR(HILOG_MODULE_ACE, "js value is not bool."); + return false; + } + outValue = jerry_value_to_boolean(value); + jerry_release_value(value); + return true; +} + void JerrySetFuncProperty(jerry_value_t object, const char * const name, jerry_external_handler_t handler) { if (name == nullptr || !strlen(name)) { @@ -116,57 +130,56 @@ char *MallocStringOf(jerry_value_t source) char *MallocStringOf(jerry_value_t source, uint16_t *strLength) { - if (strLength == nullptr) { + if ((IS_UNDEFINED(source)) || (strLength == nullptr)) { return nullptr; } + *strLength = 0; - if (IS_UNDEFINED(source)) { - return nullptr; - } - jerry_value_t target; - if (jerry_value_is_symbol(source)) { - target = jerry_get_symbol_descriptive_string(source); - } else { - target = jerry_value_to_string(source); - } - if (IS_ERROR_VALUE(target)) { - HILOG_ERROR(HILOG_MODULE_ACE, "jerry_value_to_string failed, can not continue to generate char buffer"); - jerry_release_value(target); - return nullptr; - } - jerry_size_t size = jerry_get_string_size(target); - if (size == 0) { - jerry_release_value(target); - // return empty char instead of nullptr, so caller can free safely if source is JS empty string - char *emptyStr = static_cast(ace_malloc(sizeof(char))); - if (emptyStr == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc buffer failed for empty str"); - return nullptr; + bool success = false; + jerry_value_t target = UNDEFINED; + jerry_char_t *buffer = nullptr; + jerry_size_t length = 0; + do { + if (jerry_value_is_symbol(source)) { + target = jerry_get_symbol_descriptive_string(source); + } else { + target = jerry_value_to_string(source); } - emptyStr[0] = '\0'; - return emptyStr; - } - if (size >= UINT16_MAX) { - jerry_release_value(target); - return nullptr; - } - jerry_char_t *buffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (size + 1))); - if (buffer == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc buffer for convert jerry string failed"); - jerry_release_value(target); - return nullptr; - } - jerry_size_t length = jerry_string_to_char_buffer(target, buffer, size); - if ((length == 0) || (length >= UINT16_MAX) || (length > size)) { - HILOG_ERROR(HILOG_MODULE_ACE, "jerry string to char buffer failed, target size[%d]", size); - jerry_release_value(target); - ace_free(buffer); - buffer = nullptr; - return nullptr; - } - // end character - buffer[length] = '\0'; + if (IS_ERROR_VALUE(target)) { + HILOG_ERROR(HILOG_MODULE_ACE, "jerry_value_to_string failed, can not continue to generate char buffer"); + break; + } + + jerry_size_t size = jerry_get_string_size(target); + if (size >= UINT16_MAX) { + break; + } + buffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (size + 1))); + if (buffer == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc buffer for convert jerry string failed"); + break; + } + if (size == 0) { + // if here got matched, it means the JS string is empty itself + success = true; + break; + } + + length = jerry_string_to_char_buffer(target, buffer, size); + if ((length == 0) || (length >= UINT16_MAX) || (length > size)) { + HILOG_ERROR(HILOG_MODULE_ACE, "jerry string to char buffer failed, target size[%d]", size); + break; + } + success = true; + } while (0); + jerry_release_value(target); + if (!success) { + ACE_FREE(buffer); + return nullptr; + } + // successful scenario, add end character + buffer[length] = '\0'; *strLength = length; return reinterpret_cast(buffer); } @@ -240,43 +253,12 @@ jerry_value_t WatcherCallbackFunc(const jerry_value_t func, // print out error information from jerry value void PrintErrorMessage(const jerry_value_t errorValue) { - const uint8_t errorMsgMaxLength = 128; - if (!jerry_is_feature_enabled(JERRY_FEATURE_ERROR_MESSAGES)) { - return; - } - - jerry_value_t errValue = jerry_get_value_from_error(errorValue, false); - jerry_value_t errStrVal = jerry_value_to_string(errValue); - jerry_release_value(errValue); - - if (jerry_value_is_error(errStrVal)) { - /* Avoid recursive error throws. */ - HILOG_ERROR(HILOG_MODULE_ACE, "[Error value to string failed]"); - jerry_release_value(errStrVal); - return; - } - - jerry_size_t errStrSize = jerry_get_utf8_string_size(errStrVal); - if (errStrSize >= errorMsgMaxLength) { - HILOG_ERROR(HILOG_MODULE_ACE, "[Error message too long]"); - jerry_release_value(errStrVal); - return; - } - - jerry_char_t errStrBuffer[errorMsgMaxLength]; - jerry_size_t stringEnd = jerry_string_to_utf8_char_buffer(errStrVal, errStrBuffer, errStrSize); - errStrBuffer[stringEnd] = 0; - // output to platform trace - HILOG_ERROR(HILOG_MODULE_ACE, " [JS Error]: %s", reinterpret_cast(errStrBuffer)); - // output to user console - LogString(LogLevel::LOG_LEVEL_ERR, "[JS Exception]: "); - LogString(LogLevel::LOG_LEVEL_ERR, reinterpret_cast(errStrBuffer)); - // output line seperator to trigger trace output - LogString(LogLevel::LOG_LEVEL_ERR, "\n"); + DfxAssist dfxAssist; + dfxAssist.DumpErrorCode(errorValue); + dfxAssist.DumpErrorMessage(errorValue); #if ENABLED(ENGINE_DEBUGGER) FlushOutput(); #endif - jerry_release_value(errStrVal); } // wrapper function for jerry_call_function @@ -286,7 +268,7 @@ jerry_value_t CallJSFunction(const jerry_value_t func, jerry_size_t argsCount) { jerry_value_t ret = jerry_call_function(func, context, args, argsCount); - // trace out error infomation if the result contains error + // trace out error information if the result contains error if (jerry_value_is_error(ret)) { PrintErrorMessage(ret); } @@ -422,16 +404,15 @@ static size_t AppendTwoPath(char * const first, uint8_t startIndex, const char * size_t copiedLength = 0; // we dont append '/' at the first index - bool sepNeeded = (first[startIndex - 1] != PATH_SEPERATOR); + bool sepNeeded = (first[startIndex - 1] != PATH_SEPARATOR); if (sepNeeded) { - first[startIndex] = PATH_SEPERATOR; + first[startIndex] = PATH_SEPARATOR; copiedLength++; startIndex++; } - if (sec[0] == PATH_SEPERATOR) { + if (sec[0] == PATH_SEPARATOR) { if (secLength > 1) { - // we have make sure '/' appened to the target already, skip it if (memcpy_s(first + startIndex, (destSize - startIndex), (sec + 1), (secLength - 1)) != 0) { HILOG_ERROR(HILOG_MODULE_ACE, "append path error"); return 0; @@ -470,7 +451,7 @@ char *RelocateFilePath(const char *appRootPath, const char *subPath, const char HILOG_ERROR(HILOG_MODULE_ACE, "input path or fileName is too long"); return nullptr; } - // alawys consume subPath does not have '/' + // always consume subPath does not have '/' const uint8_t addedLength = 2; size_t totalLength = appRootPathLength + subPathLength + fileNameLength + addedLength; char *fullPath = static_cast(ace_malloc(totalLength + 1)); @@ -505,7 +486,7 @@ char *RelocateFilePathRelative(const char * const appRootPath, const char * cons if (jsPath == nullptr) { return nullptr; } - const char * const ret = strrchr(jsPath, RESOURCE_SEPERATOR); + const char * const ret = strrchr(jsPath, RESOURCE_SEPARATOR); if (ret == nullptr) { return nullptr; } @@ -567,7 +548,7 @@ char *RelocateJSSourceFilePath(const char * const appRootPath, const char * cons char *ReadJSFile(const char * const appPath, const char * const jsFileName) { uint32_t contentLength = 0; - return ReadJSFile(appPath, jsFileName, &contentLength); + return ReadJSFile(appPath, jsFileName, contentLength); } /** @@ -578,17 +559,10 @@ bool IsFileExisted(const char * const filePath) if (filePath == nullptr) { return false; } -#if defined(__LITEOS__) - struct stat info; + struct stat info = {0}; if (stat(filePath, &info) != 0) { return false; } -#else - FileStatInfo fileStat; - if (FileStat(filePath, &fileStat) != 0) { - return false; - } -#endif return true; } @@ -600,109 +574,103 @@ int32_t GetFileSize(const char * const filePath) if (filePath == nullptr) { return 0; } -#if defined(__LITEOS__) - struct stat info; - info.st_size = 0; + struct stat info = {0}; int32_t ret = stat(filePath, &info); - if ((ret != 0) || (info.st_size == 0)) { - HILOG_ERROR(HILOG_MODULE_ACE, "file [%s], file.size =%lld", filePath, info.st_size); - } - return info.st_size; -#else - FileStatInfo fileStat; - fileStat.size = 0; - int32_t ret = FileStat(filePath, &fileStat); - if ((ret == FILE_RET_FAIL) || (fileStat.size == 0)) { + if (ret < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "file doesn't exit or it's empty, [%s]", filePath); } - return fileStat.size; -#endif + return info.st_size; } static int32_t OpenFileInternal(const char * const orgFullPath, bool binary = false) { -#if defined(__LITEOS__) + const char *path = orgFullPath; +#ifndef __LITEOS_M__ // no path canonicalization on M core char fullPath[PATH_MAX + 1] = {0}; +#if ((defined(__WIN32)) || (defined(__WIN64))) + if (!PathCanonicalize(fullPath, orgFullPath)) { + return -1; + } +#else if (realpath(orgFullPath, fullPath) == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "realpath handle failed, [%s]", orgFullPath); - return FILE_RET_FAIL; + return -1; } - return open(fullPath, O_RDONLY, S_IREAD | S_IWRITE); #endif - -#if (defined(_WIN32) || defined(_WIN64)) - return FileOpen(orgFullPath, (binary ? _O_BINARY : DEFAULT_FILE_PERMISSION)); -#else - return FileOpen(orgFullPath, O_RDONLY); -#endif // (defined(_WIN32) || defined(_WIN64)) + path = fullPath; +#endif + return open(path, O_RDONLY); } -static int32_t ReadFileInternal(const int32_t fd, void *buffer, const uint32_t targetLength) +/** + * Check if the file length is under MAX limitation. + */ +static bool CheckFileLength(const char * const fullPath, int32_t &outFileSize) { -#if defined(__LITEOS__) - int32_t count = read(fd, buffer, targetLength); -#else - int32_t count = FileRead(fd, buffer, targetLength); -#endif - return count; -} - -static void CloseFileInternal(int32_t fd) -{ -#if defined(__LITEOS__) - close(fd); -#else - FileClose(fd); -#endif + outFileSize = 0; + int32_t fileSize = GetFileSize(fullPath); + if (fileSize <= 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "open file[%s] failed for reading.", fullPath); + return false; + } + if (fileSize > FILE_CONTENT_LENGTH_MAX) { + ACE_ERROR_CODE_PRINT(EXCE_ACE_ROUTER_REPLACE_FAILED, EXCE_ACE_PAGE_FILE_TOO_HUGE); + return false; + } + outFileSize = fileSize; + return true; } /** * Read file content from one give full file path. * Return value must be freed by caller. */ -char *ReadFile(const char * const fullPath, uint32_t *fileSize, const bool binary) +char *ReadFile(const char * const fullPath, uint32_t &fileSize, const bool binary) { - if (fileSize == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "open file[%s] failed for reading, fileSize == nullptr", fullPath); - return nullptr; - } - int32_t scriptLength = GetFileSize(fullPath); - if (scriptLength <= 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "open file[%s] failed for reading, scriptLength has error.", fullPath); - return nullptr; - } + UNUSED(binary); + char *scriptBuffer = nullptr; + int32_t fd = -1; + bool success = false; - if (scriptLength > FILE_CONTENT_LENGTH_MAX) { - ACE_ERROR_CODE_PRINT(EXCE_ACE_ROUTER_REPLACE_FAILED, EXCE_ACE_PAGE_FILE_TOO_HUGE); - return nullptr; - } + do { + int32_t scriptLength = 0; + if (!CheckFileLength(fullPath, scriptLength)) { + break; + } - *fileSize = 0; - // open file - int32_t fd = OpenFileInternal(fullPath, binary); - if (fd == FILE_RET_FAIL) { - HILOG_ERROR(HILOG_MODULE_ACE, "open file[fd: %d] failed for reading", fd); - HILOG_ERROR(HILOG_MODULE_ACE, "open file[path: %s] failed for reading", fullPath); + fileSize = 0; + fd = OpenFileInternal(fullPath, O_RDONLY); + if (fd < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "open file[fd: %d] failed for reading", fd); + HILOG_ERROR(HILOG_MODULE_ACE, "open file[path: %s] failed for reading", fullPath); + break; + } + scriptBuffer = static_cast(ace_malloc(scriptLength + 1)); + if (scriptBuffer == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc buffer for file content failed, file length[%d]", scriptLength); + break; + } + if (EOK != memset_s(scriptBuffer, (scriptLength + 1), 0, (scriptLength + 1))) { + break; + } + int32_t count = read(fd, scriptBuffer, scriptLength); + if ((count <= 0) || (count > scriptLength)) { + HILOG_ERROR(HILOG_MODULE_ACE, "read fail, count(%d), length(%u), path(%s)", count, scriptLength, fullPath); + break; + } + scriptBuffer[count] = '\0'; + fileSize = count; + success = true; + } while (0); + + if (fd >= 0) { + close(fd); + } + if (!success) { + // failed, free buffer if it's already malloced out + ACE_FREE(scriptBuffer); return nullptr; } - char *scriptBuffer = static_cast(ace_malloc(scriptLength + 1)); - if (scriptBuffer == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc buffer for file content failed, file length[%d]", scriptLength); - CloseFileInternal(fd); - return nullptr; - } - int32_t count = ReadFileInternal(fd, scriptBuffer, scriptLength); - if ((count <= 0) || (count > scriptLength)) { - HILOG_ERROR(HILOG_MODULE_ACE, "FileRead failed, count(%d), targetLength(%u), filePath(%s)", count, scriptLength, - fullPath); - CloseFileInternal(fd); - ace_free(scriptBuffer); - scriptBuffer = nullptr; - return nullptr; - } - scriptBuffer[count] = '\0'; - CloseFileInternal(fd); - *fileSize = binary ? scriptLength : count; return scriptBuffer; } @@ -710,12 +678,9 @@ char *ReadFile(const char * const fullPath, uint32_t *fileSize, const bool binar * give app path, such as /system/app/uuid/, read script string from /system/app/uuid/src/index.js, * return value must be freed by caller. */ -char *ReadJSFile(const char * const appPath, const char * const jsFileName, uint32_t *fileSize) +char *ReadJSFile(const char * const appPath, const char * const jsFileName, uint32_t &fileSize) { - if (fileSize == nullptr) { - return nullptr; - } - *fileSize = 0; + fileSize = 0; // RelocateFilePath() will check the input parameters char *fullPath = RelocateJSSourceFilePath(appPath, jsFileName); if (fullPath == nullptr) { @@ -1051,7 +1016,8 @@ bool ParseRgbaColor(const char * const source, uint32_t &color, uint8_t &alpha) } buffer[bufSize] = 0; char *token; - int8_t move = 16; + // BITS_PER_BYTE is unsigned, result always equals to 16, can't overflow + int8_t move = BITS_PER_BYTE << 1; char *next = nullptr; token = strtok_s(buffer, DELIMITER, &next); color = 0; @@ -1100,21 +1066,25 @@ struct JSPageSpecific jsPageSpecific; uint16_t GetHorizontalResolution() { -// SCREENRESOLUTION_CMAKE is temporarily set, when ui and graphic unifid, this can be removed -#if ((defined __LITEOS__) || (defined __linux__) || (defined SCREENRESOLUTION_CMAKE)) +// SCREENSIZE_SPECIFIED is temporarily set, when ui and graphic unifid, this can be removed +#if ((defined __LITEOS__) || (defined __linux__) || (defined SCREENSIZE_SPECIFIED)) return Screen::GetInstance().GetWidth(); #else uint16_t horizontalResolution = 454; + uint16_t verticalResolution = 454; + ProductAdapter::GetScreenSize(horizontalResolution, verticalResolution); return horizontalResolution; #endif // OHOS_ACELITE_PRODUCT_WATCH } uint16_t GetVerticalResolution() { -#if ((defined __LITEOS__) || (defined __linux__) || (defined SCREENRESOLUTION_CMAKE)) +#if ((defined __LITEOS__) || (defined __linux__) || (defined SCREENSIZE_SPECIFIED)) return Screen::GetInstance().GetHeight(); #else + uint16_t horizontalResolution = 454; uint16_t verticalResolution = 454; + ProductAdapter::GetScreenSize(horizontalResolution, verticalResolution); return verticalResolution; #endif // OHOS_ACELITE_PRODUCT_WATCH } @@ -1202,7 +1172,7 @@ void CureImagePath(char *&imagePath) } if (lastPathPos < 0) { - if (*(imagePath + index) == PATH_SEPERATOR) { + if (*(imagePath + index) == PATH_SEPARATOR) { lastPathPos = index; } } @@ -1254,7 +1224,7 @@ const char *ParseImageSrc(jerry_value_t source) } if ((strstr(rawSrc, PATH_RELATIVE_WHOLE) != nullptr) || (strstr(rawSrc, PATH_RELATIVE_PART) != nullptr)) { - HILOG_ERROR(HILOG_MODULE_ACE, "Ralative path is not allowed in image src."); + HILOG_ERROR(HILOG_MODULE_ACE, "Relative path is not allowed in image src."); ace_free(rawSrc); rawSrc = nullptr; return nullptr; @@ -1269,11 +1239,13 @@ const char *ParseImageSrc(jerry_value_t source) return imageSrc; } -bool CopyFontFamily(char *&destination, const char * const fontFamily) +bool CopyFontFamily(char *&destination, const char * const fontFamily, uint32_t fontFamilyNameLen) { + // unused parameter for now, added for clean up warning + UNUSED(fontFamilyNameLen); ACE_FREE(destination); if (fontFamily == nullptr) { - return true; // the destination is alread nullptr + return true; // the destination is already nullptr } size_t fontFamilyLen = strlen(fontFamily); if (fontFamilyLen >= UINT8_MAX) { diff --git a/src/core/base/js_fwk_common.h b/frameworks/src/core/base/js_fwk_common.h similarity index 93% rename from src/core/base/js_fwk_common.h rename to frameworks/src/core/base/js_fwk_common.h index 1fc3b06..875a53a 100755 --- a/src/core/base/js_fwk_common.h +++ b/frameworks/src/core/base/js_fwk_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -157,6 +157,11 @@ constexpr char TRANSITION_TRANSFORM_Y[] = "translateY"; constexpr char CONSTRUCTOR_VIEW_MODEL[] = "ViewModel"; constexpr char CONSTRUCTOR_ABILITY_SLICE[] = "AbilitySlice"; +#ifdef FEATURE_ROTATION_API +constexpr char FUNC_ROTATION_NAME[] = "rotation"; +constexpr char ATTR_NAME_FOCUS[] = "focus"; +#endif // FEATURE_ROTATION_API + // get screen horizontal resolution uint16_t GetHorizontalResolution(); // get screen vertical resolution @@ -170,6 +175,14 @@ void JerrySetStringProperty(jerry_value_t object, const char * const name, const // value returned should be freed by caller when it's not nullptr and won't be used any more char *JerryMallocStringProperty(const jerry_value_t object, const char * const name, uint16_t &length); int16_t JerryGetIntegerProperty(jerry_value_t object, const char * const name); +/** + * @brief try to parse bool property from one JS object, caller should check the returned result before using outValue. + * @param object the given object + * @param name the target property name + * @param outValue the target property value + * @return true if the parse successfully + */ +bool JerryGetBoolProperty(jerry_value_t object, const char * const name, bool &outValue); void JerrySetFuncProperty(jerry_value_t object, const char * const name, jerry_external_handler_t handler); char *MallocStringOf(jerry_value_t source); // convert one jerry string value to char*, and return the string length @@ -191,9 +204,9 @@ char *RelocateJSSourceFilePath(const char * const appRootPath, const char * cons // read from src file, return value must be freed by caller char *ReadJSFile(const char * const appPath, const char * const jsFileName); // read the given file and return the whole file content -char *ReadJSFile(const char * const appPath, const char * const jsFileName, uint32_t *fileSize); +char *ReadJSFile(const char * const appPath, const char * const jsFileName, uint32_t &fileSize); // read the given file and return the whole file content -char *ReadFile(const char * const fullPath, uint32_t *fileSize, const bool binary); +char *ReadFile(const char * const fullPath, uint32_t &fileSize, const bool binary); // check whether the given file exists bool IsFileExisted(const char * const filePath); // Whether file existed and return the file size. 0 represents file not existed. @@ -281,7 +294,7 @@ constexpr uint8_t ALPHA_MAX = 255; constexpr char BRACE_OPEN = '('; constexpr char BRACE_CLOSE = ')'; constexpr char DELIMITER[] = ","; -constexpr char RESOURCE_SEPERATOR = '/'; +constexpr char RESOURCE_SEPARATOR = '/'; bool StartWith(const char *sequence, const char *prefix); bool IsHexColor(const char * const target); @@ -290,16 +303,16 @@ bool IsRgbaColor(const char * const target); bool ParseHexColor(const char * const source, uint32_t &color, uint8_t &alpha); bool ParseRgbaColor(const char * const source, uint32_t &color, uint8_t &alpha); bool ParseColor(const char * const source, uint32_t &color, uint8_t &alpha); -bool CopyFontFamily(char *&destination, const char * const fontFamily); +bool CopyFontFamily(char *&destination, const char * const fontFamily, uint32_t fontFamilyNameLen = 0); #if (defined(_WIN32) || defined(_WIN64)) -constexpr char PATH_SEPERATOR = '\\'; +constexpr char PATH_SEPARATOR = '\\'; constexpr char PATH_RELATIVE_WHOLE[] = "\\..\\"; constexpr char PATH_RELATIVE_PART[] = "..\\"; constexpr char SRC_SUB_FOLDER_NAME[] = ""; constexpr char JS_INDEX_FILE_PATH[] = "pages\\index\\index"; #else -constexpr char PATH_SEPERATOR = '/'; +constexpr char PATH_SEPARATOR = '/'; constexpr char PATH_RELATIVE_WHOLE[] = "/../"; constexpr char PATH_RELATIVE_PART[] = "../"; constexpr char SRC_SUB_FOLDER_NAME[] = ""; @@ -317,6 +330,7 @@ enum { }; constexpr int VA_ARG_END_FLAG = -1; +constexpr int INVALID_PIXEL_VALUE = -1; // switch on random path #ifndef JS_PAGE_SPECIFIC diff --git a/src/core/base/key_parser.cpp b/frameworks/src/core/base/key_parser.cpp similarity index 91% rename from src/core/base/key_parser.cpp rename to frameworks/src/core/base/key_parser.cpp index 02d3631..d37cb61 100755 --- a/src/core/base/key_parser.cpp +++ b/frameworks/src/core/base/key_parser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -205,10 +205,16 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) return K_CLOCK_HAND; } #endif // FEATURE_COMPONENT_ANALOG_CLOCK + break; case 'd': if (!strcmp(s, "atasets")) { return K_DATASETS; } +#ifdef FEATURE_DATE_FORMAT + if (!strcmp(s, "ay")) { + return K_DAY; + } +#endif #ifdef FEATURE_COMPONENT_DATE_PICKER if (!strcmp(s, "ate")) { return K_DATE; @@ -261,6 +267,9 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) if (!strcmp(s, "alse")) { return K_FALSE; } + if (!strcmp(s, "illmode")) { + return K_FILL_MODE; + } if (!strcmp(s, "ixedsize")) { return K_FIXED_SIZE; } @@ -295,11 +304,16 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) if (!strcmp(s, "eight")) { return K_HEIGHT; } -#ifdef FEATURE_COMPONENT_ANALOG_CLOCK +#if (defined(FEATURE_COMPONENT_ANALOG_CLOCK)) || (defined(FEATURE_DATE_FORMAT)) if (!strcmp(s, "our")) { return K_HOUR; } #endif // FEATURE_COMPONENT_ANALOG_CLOCK +#ifdef FEATURE_DATE_FORMAT + if (!strcmp(s, "our12")) { + return K_HOUR12; + } +#endif break; case 'i': if (!strcmp(s, "d")) { @@ -367,6 +381,11 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) if (!strcmp(s, "oop")) { return K_LOOP; } +#ifdef FEATURE_DATE_FORMAT + if (!strcmp(s, "ong")) { + return K_LONG; + } +#endif break; case 'm': if (!strcmp(s, "argin")) { @@ -401,6 +420,22 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) return K_MUTED; } #endif // FEATURE_COMPONENT_VIDEO +#ifdef FEATURE_NUMBER_FORMAT + if (!strcmp(s, "inimumFractionDigits")) { + return K_MINIMUMFRACTIONDIGITS; + } + if (!strcmp(s, "aximumFractionDigits")) { + return K_MAXIMUMFRACTIONDIGITS; + } +#endif +#ifdef FEATURE_DATE_FORMAT + if (!strcmp(s, "inute")) { + return K_MINUTE; + } + if (!strcmp(s, "onth")) { + return K_MONTH; + } +#endif break; case 'n': if (!strcmp(s, "ame")) { @@ -409,13 +444,18 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) if (!strcmp(s, "one")) { return K_NONE; } +#ifdef FEATURE_DATE_FORMAT + if (!strcmp(s, "umeric")) { + return K_NUMERIC; + } +#endif break; case 'o': if (!strcmp(s, "pacity")) { return K_OPACITY; } if (!strcmp(s, "ptions")) { - return K_OPATIONS; + return K_OPTIONS; } break; case 'p': @@ -462,6 +502,13 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) return K_PROGRESS; } break; +#ifdef FEATURE_COMPONENT_QRCODE + case 'q': + if (!strcmp(s, "rcode")) { + return K_QRCODE; + } + break; +#endif // FEATURE_COMPONENT_QRCODE case 'r': if (!strcmp(s, "adio")) { return K_RADIO; @@ -529,6 +576,11 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) if (!strcmp(s, "how")) { return K_SHOW; } +#ifdef FEATURE_DATE_FORMAT + if (!strcmp(s, "hort")) { + return K_SHORT; + } +#endif if (!strcmp(s, "lider")) { return K_SLIDER; } @@ -561,6 +613,11 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) if (!strcmp(s, "trokeWidth")) { return K_STROKE_WIDTH; } +#ifdef FEATURE_NUMBER_FORMAT + if (!strcmp(s, "tyle")) { + return K_STYLE; + } +#endif // FEATURE_NUMBER_FORMAT if (!strcmp(s, "wipe")) { return K_SWIPE; } @@ -635,6 +692,13 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) } #endif // FEATURE_COMPONENT_ANALOG_CLOCK break; + case 'u': +#ifdef FEATURE_NUMBER_FORMAT + if (!strcmp(s, "seGrouping")) { + return K_USEGROUP; + } +#endif // FEATURE_NUMBER_FORMAT + break; case 'v': if (!strcmp(s, "alue")) { return K_VALUE; @@ -656,6 +720,13 @@ uint16_t KeyParser::ParseKeyId(const char *s, const size_t len) return K_WRAP; } break; + case '2': +#ifdef FEATURE_DATE_FORMAT + if (!strcmp(s, "-digit")) { + return K_DIGIT2; + } + break; +#endif default: break; // clang-format on diff --git a/src/core/base/key_parser.h b/frameworks/src/core/base/key_parser.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/key_parser.h rename to frameworks/src/core/base/key_parser.h diff --git a/src/core/base/keys.h b/frameworks/src/core/base/keys.h similarity index 91% rename from src/core/base/keys.h rename to frameworks/src/core/base/keys.h index e0f379d..0fbeb8e 100755 --- a/src/core/base/keys.h +++ b/frameworks/src/core/base/keys.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -94,6 +94,10 @@ enum { #ifdef FEATURE_COMPONENT_DATE_PICKER KEYWORD(DATE, date) // picker-view attr value #endif // FEATURE_COMPONENT_DATE_PICKER +#ifdef FEATURE_DATE_FORMAT + KEYWORD(DAY, day) + KEYWORD(DIGIT2, digit2) +#endif KEYWORD(DIRECTION, direction) // progress direction KEYWORD(DISPLAY, display) // div layout KEYWORD(DIV, div) // tag name @@ -114,6 +118,7 @@ enum { #ifdef FEATURE_COMPONENT_VIDEO KEYWORD(FINISH, finish) // video component finish event tag #endif // FEATURE_COMPONENT_VIDEO + KEYWORD(FILL_MODE, fillmode) // image-animator attribtue KEYWORD(FIXED_SIZE, fixedsize) // image-animator attribute KEYWORD(FLEX_DIRECTION, flexDirection) // layout style KEYWORD(FLEX_END, flex-end) // layout style @@ -123,9 +128,12 @@ enum { KEYWORD(FONT_FAMILY, fontFamily) // text style type KEYWORD(FORWARDS, forwards) // animation fill value KEYWORD(HEIGHT, height) // common attributes -#ifdef FEATURE_COMPONENT_ANALOG_CLOCK +#if (defined(FEATURE_COMPONENT_ANALOG_CLOCK)) || (defined(FEATURE_DATE_FORMAT)) KEYWORD(HOUR, hour) // analog-clock hour -#endif // FEATURE_COMPONENT_ANALOG_CLOCK +#endif // FEATURE_COMPONENT_ANALOG_CLOCK FEATURE_DATE_FORMAT +#ifdef FEATURE_DATE_FORMAT + KEYWORD(HOUR12, hour12) +#endif KEYWORD(ID, id) // common attributes KEYWORD(IMAGE, image) // tag name KEYWORD(IMAGE_ANIMATOR, image-animator) // tag name @@ -145,6 +153,9 @@ enum { KEYWORD(LINE_HEIGHT, lineHeight) // text style type KEYWORD(LIST, list) // list tag name KEYWORD(LIST_ITEM, list-item) // list-item tag name +#ifdef FEATURE_DATE_FORMAT + KEYWORD(LONG, long) +#endif KEYWORD(LONGPRESS, longpress) // long progress event listener KEYWORD(LOOP, loop) // swiper loop attribute KEYWORD(MARGIN, margin) // common style margin @@ -156,13 +167,20 @@ enum { KEYWORD(MAX, max) // common attributes KEYWORD(MIN, min) // common attributes, analog-clock minute KEYWORD(MINI, mini) // text font size type +#ifdef FEATURE_DATE_FORMAT + KEYWORD(MINUTE, minute) + KEYWORD(MONTH, month) +#endif #ifdef FEATURE_COMPONENT_VIDEO KEYWORD(MUTED, muted) // video component muted attribute #endif // FEATURE_COMPONENT_VIDEO KEYWORD(NAME, name) // the attribute name KEYWORD(NONE, none) // animation fill value +#ifdef FEATURE_DATE_FORMAT + KEYWORD(NUMERIC, numeric) +#endif KEYWORD(OPACITY, opacity) // common style opacity - KEYWORD(OPATIONS, opations) // chart options + KEYWORD(OPTIONS, options) // chart options KEYWORD(PADDING, padding) KEYWORD(PADDING_BOTTOM, paddingBottom) KEYWORD(PADDING_LEFT, paddingLeft) @@ -179,6 +197,9 @@ enum { KEYWORD(PIVOT_Y, pivotY) // clock-hand pivot-y #endif // FEATURE_COMPONENT_ANALOG_CLOCK KEYWORD(PROGRESS, progress) // progress tag name +#ifdef FEATURE_COMPONENT_QRCODE + KEYWORD(QRCODE, qrcode) // qrcode tag name +#endif KEYWORD(RADIO, radio) // the type in input KEYWORD(RADIUS, radius) // circle progress radius KEYWORD(RANGE, range) // picker-view attr @@ -196,6 +217,9 @@ enum { #ifdef FEATURE_COMPONENT_ANALOG_CLOCK KEYWORD(SEC, sec) // analog-clock second #endif // FEATURE_COMPONENT_ANALOG_CLOCK +#ifdef FEATURE_DATE_FORMAT + KEYWORD(SECOND, second) +#endif #ifdef FEATURE_COMPONENT_VIDEO KEYWORD(SEEKING, seeking) // // video component seeking event tag KEYWORD(SEEKED, seeked) // // video component seeked event tag @@ -204,6 +228,9 @@ enum { KEYWORD(SELECTED_COLOR, selectedColor) // picker-view style KEYWORD(SELECTED_FONT_FAMILY, selectedFontFamily) // picker-view style KEYWORD(SELECTED_FONT_SIZE, selectedFontSize) // picker-view style +#ifdef FEATURE_DATE_FORMAT + KEYWORD(SHORT, short) +#endif KEYWORD(SHOW, show) KEYWORD(SLIDER, slider) // tag name KEYWORD(SPACE_AROUND, space-around) // layout style @@ -254,6 +281,16 @@ enum { #endif // FEATURE_COMPONENT_VIDEO KEYWORD(WIDTH, width) // common attributes KEYWORD(WRAP, wrap) // flex wrap +#ifdef FEATURE_DATE_FORMAT + KEYWORD(WEEKDAY, weekday) + KEYWORD(YEAR, year) +#endif +#ifdef FEATURE_NUMBER_FORMAT + KEYWORD(STYLE, style) + KEYWORD(USEGROUP, useGroup) + KEYWORD(MINIMUMFRACTIONDIGITS, minimumFractionDigits) + KEYWORD(MAXIMUMFRACTIONDIGITS, maximumFractionDigits) +#endif // Reused by the struct end // clang-format on #ifdef KEYWORDS_ENUM_DEFINE diff --git a/frameworks/src/core/base/lazy_load_manager.cpp b/frameworks/src/core/base/lazy_load_manager.cpp new file mode 100755 index 0000000..00001f2 --- /dev/null +++ b/frameworks/src/core/base/lazy_load_manager.cpp @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "lazy_load_manager.h" +#include "ace_log.h" +#include "component.h" +#include "component_utils.h" +#include "lazy_load_watcher.h" + +namespace OHOS { +namespace ACELite { +LazyLoadManager::LazyLoadManager() : firstWatcher_(nullptr), lastWatcher_(nullptr), state_(LazyLoadState::INIT) +{ +} + +LazyLoadManager::~LazyLoadManager() +{ + ResetWatchers(); +} + +void LazyLoadManager::ResetWatchers() +{ + LazyLoadWatcher *next = nullptr; + while (firstWatcher_ != nullptr) { + next = const_cast(firstWatcher_->GetNext()); + delete firstWatcher_; + firstWatcher_ = next; + } + + lastWatcher_ = nullptr; + state_ = LazyLoadState::INIT; +} + +void LazyLoadManager::RenderLazyLoadWatcher() +{ + LazyLoadWatcher *next = nullptr; + while (firstWatcher_ != nullptr) { + Component *componet = ComponentUtils::GetComponentFromBindingObject(firstWatcher_->GetNativeElement()); + if (componet != nullptr) { + componet->AddWatcherItem(firstWatcher_->GetAttrName(), firstWatcher_->GetAttrGetter()); + } + next = const_cast(firstWatcher_->GetNext()); + delete firstWatcher_; + firstWatcher_ = next; + } + state_ = LazyLoadState::DONE; +} + +void LazyLoadManager::AddLazyLoadWatcher(jerry_value_t nativeElement, jerry_value_t attrName, jerry_value_t getter) +{ + if (nativeElement == UNDEFINED || attrName == UNDEFINED || getter == UNDEFINED) { + return; + } + + LazyLoadWatcher *watcher = + new LazyLoadWatcher(nativeElement, jerry_acquire_value(attrName), jerry_acquire_value(getter)); + if (watcher == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create watcher errpr"); + return; + } + if (firstWatcher_ == nullptr) { + firstWatcher_ = watcher; + lastWatcher_ = watcher; + } else { + lastWatcher_->SetNext(*watcher); + lastWatcher_ = watcher; + } +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/lazy_load_manager.h b/frameworks/src/core/base/lazy_load_manager.h new file mode 100755 index 0000000..514ad17 --- /dev/null +++ b/frameworks/src/core/base/lazy_load_manager.h @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_LAZY_LOAD_MANAGER_H +#define OHOS_ACELITE_LAZY_LOAD_MANAGER_H + +#include "lazy_load_watcher.h" +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +/** + * lazy load state + */ +enum class LazyLoadState : uint8_t { + INIT, + READY, + DONE, + ABANDON +}; + +class LazyLoadManager final : public MemoryHeap { +public: + ACE_DISALLOW_COPY_AND_MOVE(LazyLoadManager); + LazyLoadManager(); + + ~LazyLoadManager(); + + void ResetWatchers(); + + /** + * @brief Cache watcher + */ + void AddLazyLoadWatcher(jerry_value_t nativeElement, jerry_value_t attrName, jerry_value_t getter); + + /** + * @brief Render watcher at next TE task + */ + void RenderLazyLoadWatcher(); + + const LazyLoadWatcher *GetLazyWatcher() const + { + return firstWatcher_; + } + + void SetState(LazyLoadState state) + { + state_ = state; + } + + LazyLoadState GetState() const + { + return state_; + } +private: + LazyLoadWatcher *firstWatcher_; + LazyLoadWatcher *lastWatcher_; + LazyLoadState state_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_LAZY_LOAD_MANAGER_H diff --git a/frameworks/src/core/base/lazy_load_watcher.cpp b/frameworks/src/core/base/lazy_load_watcher.cpp new file mode 100755 index 0000000..d9cbda8 --- /dev/null +++ b/frameworks/src/core/base/lazy_load_watcher.cpp @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "lazy_load_watcher.h" +namespace OHOS { +namespace ACELite { +LazyLoadWatcher::LazyLoadWatcher(jerry_value_t nativeElement, jerry_value_t attrName, jerry_value_t getter) + : nativeElement_(nativeElement), + attrName_(attrName), + getter_(getter), + next_(nullptr) +{ +} + +LazyLoadWatcher::~LazyLoadWatcher() +{ + jerry_release_value(attrName_); + jerry_release_value(getter_); +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/lazy_load_watcher.h b/frameworks/src/core/base/lazy_load_watcher.h new file mode 100755 index 0000000..8a9329b --- /dev/null +++ b/frameworks/src/core/base/lazy_load_watcher.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_LAZY_LOAD_WATCHER_H +#define OHOS_ACELITE_LAZY_LOAD_WATCHER_H + +#include "jerryscript-core.h" +#include "js_fwk_common.h" +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +class LazyLoadWatcher final : public MemoryHeap { +public: + ACE_DISALLOW_COPY_AND_MOVE(LazyLoadWatcher); + + LazyLoadWatcher(jerry_value_t nativeElement, jerry_value_t attrName, jerry_value_t getter); + + ~LazyLoadWatcher(); + + void SetNext(LazyLoadWatcher &next) + { + next_ = &next; + } + + const LazyLoadWatcher *GetNext() const + { + return next_; + } + + jerry_value_t GetNativeElement() const + { + return nativeElement_; + } + + jerry_value_t GetAttrName() const + { + return attrName_; + } + + jerry_value_t GetAttrGetter() const + { + return getter_; + } +private: + jerry_value_t nativeElement_; + jerry_value_t attrName_; + jerry_value_t getter_; + LazyLoadWatcher *next_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_LAZY_LOAD_WATCHER_H diff --git a/frameworks/src/core/base/locale_util.cpp b/frameworks/src/core/base/locale_util.cpp new file mode 100755 index 0000000..ee145cb --- /dev/null +++ b/frameworks/src/core/base/locale_util.cpp @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "locale_util.h" +#ifdef FEATURE_INTL_MODULE +#include "ace_log.h" +#include "global.h" +#include "js_fwk_common.h" +#include "memory_heap.h" +#include "securec.h" +#include "string.h" + +namespace OHOS { +namespace ACELite { +using namespace I18N; +LocaleInfo *LocaleUtil::GetLocaleInfo(char* locale) +{ + if (locale == nullptr) { + return GetSystemLocaleInfo(); + } + LocaleInfo *localeInfo = nullptr; + // the locale info is used '-' as separator + const char *delemeter = "-"; + char *country = nullptr; + char *next = nullptr; + if (strstr(locale, delemeter)) { + country = strtok_s(locale, delemeter, &next); + } + if (country == nullptr) { + localeInfo = new LocaleInfo(locale, nullptr); + } else { + char *origion = strtok_s(nullptr, delemeter, &next); + if ((next == nullptr) || (!strcmp("", next))) { + // set the language and region info + localeInfo = new LocaleInfo(country, origion); + } else { + // set the language, region and script info + localeInfo = new LocaleInfo(country, origion, next); + } + } + // if the locale info is nullptr or set locale info failed, set the system locale info + if ((localeInfo == nullptr) || (localeInfo->GetId() == nullptr)) { + ACE_DELETE(localeInfo); + localeInfo = GetSystemLocaleInfo(); + } + return localeInfo; +} + +LocaleInfo *LocaleUtil::GetSystemLocaleInfo() +{ + LocaleInfo *info = nullptr; + char *language = nullptr; + char *region = nullptr; + do { + language = reinterpret_cast(ace_malloc(MAX_LANGUAGE_LENGTH)); + region = reinterpret_cast(ace_malloc(MAX_REGION_LENGTH)); + if ((language == nullptr) || (region == nullptr)) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc system info failed"); + break; + } + int langRet = GLOBAL_GetLanguage(language, MAX_LANGUAGE_LENGTH); + int regionRet = GLOBAL_GetRegion(region, MAX_REGION_LENGTH); + if ((langRet != 0) || (regionRet != 0)) { + HILOG_ERROR(HILOG_MODULE_ACE, "get system language info failed"); + break; + } + info = new LocaleInfo(language, region); + } while (0); + ACE_FREE(language); + ACE_FREE(region); + return info; +} +} // namespace ACELite +} // namespace OHOS +#endif diff --git a/frameworks/src/core/base/locale_util.h b/frameworks/src/core/base/locale_util.h new file mode 100644 index 0000000..8a8bd76 --- /dev/null +++ b/frameworks/src/core/base/locale_util.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_LOCALE_UTIL_H +#define OHOS_ACELITE_LOCALE_UTIL_H +#include "acelite_config.h" +#ifdef FEATURE_INTL_MODULE +#include "locale_info.h" +#include "non_copyable.h" +namespace OHOS { +namespace ACELite { +class LocaleUtil final { +public: + ACE_DISALLOW_COPY_AND_MOVE(LocaleUtil); + LocaleUtil() = delete; + ~LocaleUtil() = delete; + + /** + * @brief split the locale info by '-', set the language, region, and script info + * @param locale the locale string + * @return the localeInfo object which has set the language, region and script + */ + static I18N::LocaleInfo *GetLocaleInfo(char *locale); + + /** + * @brief get the system language and region info + * @return the locale object which has set the language and region info + */ + static I18N::LocaleInfo *GetSystemLocaleInfo(); +}; +} +} +#endif // FEATURE_INTL_MODULE +#endif diff --git a/frameworks/src/core/base/mem_proc.cpp b/frameworks/src/core/base/mem_proc.cpp new file mode 100644 index 0000000..1b09282 --- /dev/null +++ b/frameworks/src/core/base/mem_proc.cpp @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "mem_proc.h" +#ifdef SIMULATOR_MEMORY_ANALYSIS +#include +#include +#include +#include "ace_log.h" +#include "file.h" +#include "jerryscript-core.h" +#include "jerryscript.h" +#include "js_fwk_common.h" +#include "securec.h" +#include "time.h" + +namespace OHOS { +namespace ACELite { +constexpr uint8_t MSG_LENGTH = 100; + +constexpr uint32_t UNIT = 1024; + +AceMemProc *AceMemProc::GetInstance() +{ + static AceMemProc instance; + return &instance; +} + +void AceMemProc::ClearUp() +{ + if (!IsEnabled()) { + return; + } + // backup prev txt, create a new txt + struct stat fileStat; + + int32_t state = stat(MEM_LOG_FILE_PATH, &fileStat); + if ((state != 0) || (fileStat.st_size == 0)) { + HILOG_ERROR(HILOG_MODULE_ACE, "Back up file error."); + return; + } + // it exists and not empty + time_t seconds = time(NULL); + char markdata[MSG_LENGTH]; + if (sprintf_s(markdata, MSG_LENGTH, "%ti.txt", seconds) < 0) { + close(state); + state = -1; + return; + } + char *fullPath = RelocateJSSourceFilePath(MEM_BACK_UP_LOG_FILE_PREFIX, markdata); + if (fullPath == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Back up file error."); + } else { + rename(MEM_LOG_FILE_PATH, fullPath); + ace_free(fullPath); + fullPath = nullptr; + } + close(state); + state = -1; +} + +void AceMemProc::SysMemTracing() +{ + if (!IsEnabled()) { + return; + } + HANDLE handle = GetCurrentProcess(); + PROCESS_MEMORY_COUNTERS pmc = {0}; + if (!GetProcessMemoryInfo(handle, (PROCESS_MEMORY_COUNTERS *)&pmc, sizeof(pmc))) { + HILOG_ERROR(HILOG_MODULE_ACE, "Get process memory error."); + return; + } + + FILE *fp = fopen(MEM_LOG_FILE_PATH, "a+"); + if (fp == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Get file error."); + return; + } + + // physical memory + char markdata[MSG_LENGTH]; + if (sprintf_s(markdata, MSG_LENGTH, "Phy:%d(KB)\n", uint32_t(pmc.WorkingSetSize / UNIT)) < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "Output file error."); + fclose(fp); + fp = nullptr; + return; + } + fputs(markdata, fp); + + // virtual memory + if (sprintf_s(markdata, MSG_LENGTH, "Vir:%d(KB)\n", uint32_t(pmc.PagefileUsage / UNIT)) < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "Output file error."); + fclose(fp); + fp = nullptr; + return; + } + fputs(markdata, fp); + + fflush(fp); + fclose(fp); + fp = nullptr; +} + +void AceMemProc::JerryMemTracing() +{ + if (!IsEnabled()) { + return; + } + jerry_heap_stats_t stats = {0}; + if (!jerry_get_memory_stats(&stats)) { + HILOG_ERROR(HILOG_MODULE_ACE, "Get jerry heap stats error."); + return; + } + + FILE *fp = nullptr; + fp = fopen(MEM_LOG_FILE_PATH, "a+"); + if (fp == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Get file error"); + return; + } + + size_t total = stats.size; + size_t current = stats.allocated_bytes; + size_t peak = stats.peak_allocated_bytes; + // jerry total memory + char markdata[MSG_LENGTH]; + if (sprintf_s(markdata, MSG_LENGTH, "jerry heap total:%d(KB)\n", uint32_t(total / UNIT)) < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "Output file error."); + fclose(fp); + fp = nullptr; + return; + } + fputs(markdata, fp); + + // jerry current memory + if (sprintf_s(markdata, MSG_LENGTH, "jerry heap current:%d(KB)\n", uint32_t(current / UNIT)) < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "Output file error."); + fclose(fp); + fp = nullptr; + return; + } + fputs(markdata, fp); + + // jerry peak memory + if (sprintf_s(markdata, MSG_LENGTH, "jerry heap peak:%d(KB)\n", uint32_t(peak / UNIT)) < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "Output file error."); + fclose(fp); + fp = nullptr; + return; + } + fputs(markdata, fp); + + fflush(fp); + fclose(fp); + fp = nullptr; +} + +bool AceMemProc::IsEnabled() +{ + return IsFileExisted(MEM_PROC_ENABLE_FLAG_FILE); +} +} // namespace ACELite +} // namespace OHOS +#endif // SIMULATOR_MEMORY_ANALYSIS diff --git a/frameworks/src/core/base/mem_proc.h b/frameworks/src/core/base/mem_proc.h new file mode 100644 index 0000000..21036b5 --- /dev/null +++ b/frameworks/src/core/base/mem_proc.h @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_MEM_PROC_H +#define OHOS_ACELITE_MEM_PROC_H + +#include "acelite_config.h" +#ifdef SIMULATOR_MEMORY_ANALYSIS +#define CLEAR_UP() AceMemProc::GetInstance()->ClearUp() +#define SYS_MEMORY_TRACING() AceMemProc::GetInstance()->SysMemTracing() +#define JERRY_MEMORY_TRACING() AceMemProc::GetInstance()->JerryMemTracing() +#else +#define CLEAR_UP() +#define SYS_MEMORY_TRACING() +#define JERRY_MEMORY_TRACING() +#endif // SIMULATOR_MEMORY_ANALYSIS + +#ifdef SIMULATOR_MEMORY_ANALYSIS +namespace OHOS { +namespace ACELite { +class AceMemProc { +public: + /** + * @brief Use static global variable for easy access in different source code file. + * + * @return global singleton AceMemProc object + */ + static AceMemProc *GetInstance(); + + /** + * @brief Check if the memory proc is enabled or not. + * + * @return true for enabled, false for not + */ + static bool IsEnabled(); + + /** + * @brief Clear up the previous analysis file. + */ + void ClearUp(); + + /** + * @brief Output the system memory. + */ + void SysMemTracing(); + + /** + * @brief Output the jerry memory. + * + */ + void JerryMemTracing(); + +private: + /** + * @brief Default constructor. + */ + AceMemProc() = default; + + /** + * @brief Default destructor. + */ + ~AceMemProc() = default; +}; +} // namespace ACELite +} // namespace OHOS +#endif // SIMULATOR_MEMORY_ANALYSIS +#endif // OHOS_ACELITE_MEM_PROC_H \ No newline at end of file diff --git a/src/core/base/memory_heap.cpp b/frameworks/src/core/base/memory_heap.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/memory_heap.cpp rename to frameworks/src/core/base/memory_heap.cpp diff --git a/src/core/base/non_copyable.h b/frameworks/src/core/base/non_copyable.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/non_copyable.h rename to frameworks/src/core/base/non_copyable.h diff --git a/frameworks/src/core/base/number_parser.cpp b/frameworks/src/core/base/number_parser.cpp new file mode 100644 index 0000000..751646d --- /dev/null +++ b/frameworks/src/core/base/number_parser.cpp @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2021 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. + */ +#include "number_parser.h" +#include +#include +#include "ace_log.h" + +namespace OHOS { +namespace ACELite { +/** + * @brief ParseDoubleValue convert one string to number(int32_t) value + * @param percentStr the under processing string + * @param strLength the given string length + * @param outValue the converted result + * @return the process result, false for converting failed, true for success, caller + * should check the returned value before using outValue. + */ +bool NumberParser::ParseDoubleValue(const char *str, uint16_t strLength, double &outValue) +{ + if (!IsValidString(str, strLength)) { + return false; + } + + outValue = strtod(str, nullptr); + return true; +} + +/** + * @brief ParsePercentValue convert percent string to number value + * @param percentStr the under processing percent string, for example "10%" + * @param strLength the given percent string length + * @param outValue the converted result + * @return the process result, false for converting failed, true for success, caller + * should check the returned value before using outValue. + */ +bool NumberParser::ParsePercentValue(const char *percentStr, uint16_t strLength, float &outValue) +{ + constexpr uint16_t minLength = 2; + // check input parameters + if (!(IsValidString(percentStr, strLength)) || (strLength < minLength)) { + HILOG_ERROR(HILOG_MODULE_ACE, "parse percent value failed, invalid input parameters"); + return false; + } + size_t originalStrLen = strlen(percentStr); + uint16_t ensuredStrLength = (strLength > originalStrLen) ? originalStrLen : strLength; + // only support max 15 bytes length string + constexpr uint16_t maxLength = 16; + if (ensuredStrLength > maxLength) { + HILOG_ERROR(HILOG_MODULE_ACE, "parse percent value failed, input string too long [%d]", ensuredStrLength); + return false; + } + // the latest charater must be %, and the first digit must not be "." + if ((percentStr[0] == '.') || (percentStr[ensuredStrLength - 1] != '%')) { + return false; + } + // check if the string is one valid number format + uint16_t index = (percentStr[0] == '-') ? 1 : 0; + constexpr uint16_t minNegativeLength = minLength + 1; + if ((index == 1) && (ensuredStrLength < minNegativeLength)) { + // for negative number, the min length is 3 + return false; + } + while ((index < ensuredStrLength) && (percentStr[index] != '%')) { + if ((percentStr[index] != '.') && ((percentStr[index] < '0') || (percentStr[index] > '9'))) { + // give up the parsing, it's not digit format + return false; + } + index++; + } + // do the parsing + outValue = (float)(strtod(percentStr, nullptr)); + return true; +} + +/** + * @brief IsValidString check if the input target string is valid + * @param str the given under processing string + * @param strLength the given string's length + * @return true for valid string, false for not + */ +bool NumberParser::IsValidString(const char *str, uint16_t strLength) +{ + return ((str != nullptr) && (strLength != 0)); +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/base/number_parser.h b/frameworks/src/core/base/number_parser.h new file mode 100644 index 0000000..a12063c --- /dev/null +++ b/frameworks/src/core/base/number_parser.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_NUMBER_PARSER_H +#define OHOS_ACELITE_NUMBER_PARSER_H + +#include +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +/** + * Utils class for number formating operations. + */ +class NumberParser final { +public: + ACE_DISALLOW_COPY_AND_MOVE(NumberParser); + NumberParser() = delete; + ~NumberParser() = delete; + + /** + * @brief ParseDoubleValue convert one string to number(double) value + * @param percentStr the under processing string + * @param strLength the given string length + * @param outValue the converted result + * @return the process result, false for converting failed, true for success, caller + * should check the returned value before using outValue. + */ + static bool ParseDoubleValue(const char *str, uint16_t strLength, double &outValue); + + /** + * @brief ParsePercentValue convert percent string to number value + * @param percentStr the under processing percent string, for example "10%" + * @param strLength the given percent string length + * @param outValue the converted result + * @return the process result, false for converting failed, true for success, caller + * should check the returned value before using outValue. + */ + static bool ParsePercentValue(const char *percentStr, uint16_t strLength, float &outValue); + +private: + /** + * @brief IsValidString check if the input target string is valid + * @param str the given under processing string + * @param strLength the given string's length + * @return true for valid string, false for not + */ + static bool IsValidString(const char *str, uint16_t strLength); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_NUMBER_PARSER_H diff --git a/frameworks/src/core/base/product_adapter.cpp b/frameworks/src/core/base/product_adapter.cpp new file mode 100644 index 0000000..7c6ca96 --- /dev/null +++ b/frameworks/src/core/base/product_adapter.cpp @@ -0,0 +1,225 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "product_adapter.h" + +#include "acelite_config.h" +#include "graphic_config.h" +#include "js_async_work.h" +#include "message_queue_utils.h" +#include "module_manager.h" + +namespace OHOS { +namespace ACELite { +/** + * Used for holding all the related dfx interfaces assigned from specific implementation. + */ +struct DFXWrapper { + DFXWrapper() + : eventTag_(0), + eventSubTag_(0), + errCodeTag_(0), + errCodeSubTag_(0), + eventPrintHandler_(nullptr), + errCodePrintHandler_(nullptr), + jsLogOutputHandler_(nullptr), + nativeMemInfoGetter_(nullptr) + { + } + uint8_t eventTag_; + uint8_t eventSubTag_; + uint8_t errCodeTag_; + uint8_t errCodeSubTag_; + EventPrintHandler eventPrintHandler_; + ErrCodePrintHandler errCodePrintHandler_; + JSLogOutputHandler jsLogOutputHandler_; + NativeMemInfoGetter nativeMemInfoGetter_; +}; + +static DFXWrapper g_dfxWrapper; +static TEHandlingHooks g_teHandlingHooks = {nullptr, nullptr}; +static TerminateAbilityHandler g_termiantingHandler = nullptr; +// default font styles +static char *g_defaultFontFamilyName = nullptr; +static uint8_t g_defaultFontSize = 30; +static uint16_t g_screenWidth = 454; +static uint16_t g_screenHeight = 454; + +// indicating if the ace application is on forground +static bool g_isAceForground = false; + +void ProductAdapter::InitAceTags(uint8_t *aceTags, uint8_t tagCount) +{ + const uint8_t minCount = 4; + if (aceTags == nullptr || tagCount < minCount) { + return; + } + uint8_t index = 0; + g_dfxWrapper.eventTag_ = aceTags[index++]; + g_dfxWrapper.eventSubTag_ = aceTags[index++]; + g_dfxWrapper.errCodeTag_ = aceTags[index++]; + g_dfxWrapper.errCodeSubTag_ = aceTags[index++]; +} + +void ProductAdapter::InitTraceHandlers(EventPrintHandler eventHandler, ErrCodePrintHandler errCodeHandler) +{ + g_dfxWrapper.eventPrintHandler_ = eventHandler; + g_dfxWrapper.errCodePrintHandler_ = errCodeHandler; +} + +void ProductAdapter::InitConsoleNativeHandler(JSLogOutputHandler handler) +{ + g_dfxWrapper.jsLogOutputHandler_ = handler; +} + +void ProductAdapter::InitNativeMemPoolHook(NativeMemInfoGetter getter) +{ + g_dfxWrapper.nativeMemInfoGetter_ = getter; +} + +void ProductAdapter::InitExtraModulesGetter(ProductModulesGetter productModuleGetter, + PrivateModulesGetter privateModuleGetter) +{ + ModuleManager::GetInstance()->SetProductModulesGetter(productModuleGetter); + ModuleManager::GetInstance()->SetPrivateModulesGetter(privateModuleGetter); +} + +void ProductAdapter::PrintEventTrace(uint8_t info2, uint8_t info3, uint8_t info4) +{ + if (g_dfxWrapper.eventPrintHandler_ == nullptr || g_dfxWrapper.eventTag_ == 0 || g_dfxWrapper.eventSubTag_ == 0) { + return; + } + + uint8_t subTag = (info2 == 0) ? g_dfxWrapper.eventSubTag_ : info2; + g_dfxWrapper.eventPrintHandler_(g_dfxWrapper.eventTag_, subTag, info3, info4); +} + +void ProductAdapter::PrintErrCode(uint8_t info2, uint16_t rfu) +{ + if (g_dfxWrapper.errCodePrintHandler_ == nullptr || g_dfxWrapper.errCodeTag_ == 0 || + g_dfxWrapper.errCodeSubTag_ == 0) { + return; + } + g_dfxWrapper.errCodePrintHandler_(g_dfxWrapper.errCodeTag_, g_dfxWrapper.errCodeSubTag_, info2, rfu); +} + +void ProductAdapter::OutputJSConsoleLog(uint8_t level, const char *content) +{ + if (g_dfxWrapper.jsLogOutputHandler_ == nullptr) { + return; + } + g_dfxWrapper.jsLogOutputHandler_(level, content); +} + +void ProductAdapter::GetNativeMemInfo(NativeMemInfo *memInfo) +{ + if (g_dfxWrapper.nativeMemInfoGetter_ == nullptr) { + return; + } + + g_dfxWrapper.nativeMemInfoGetter_(memInfo); +} + +void ProductAdapter::RegTerminatingHandler(TerminateAbilityHandler handler) +{ + g_termiantingHandler = handler; +} + +void ProductAdapter::RegTEHandlers(const TEHandlingHooks &teHandlingHooks) +{ + g_teHandlingHooks.renderTEHandler = teHandlingHooks.renderTEHandler; + g_teHandlingHooks.renderEndHandler = teHandlingHooks.renderEndHandler; +} + +// NOTE: This TE function will be called in VSYNC interrupt, and +// as no any task can be switched to during an interrupt, so it's safe to +// read the global value directly here. +TEDispatchingResult ProductAdapter::DispatchTEMessage() +{ +#ifdef OHOS_ACELITE_PRODUCT_WATCH // only some specific products support TE dispatching + if (!g_isAceForground) { + return TEDispatchingResult::REFUSED; + } + + if (JsAsyncWork::DispatchToLoop(TE_EVENT, nullptr)) { + return TEDispatchingResult::ACCEPTED; + } + // if the ACE application is on forground and the dispatching failed, should retry sending to ACE again + return TEDispatchingResult::ACCEPT_FAILED; +#else + return TEDispatchingResult::REFUSED; +#endif // OHOS_ACELITE_PRODUCT_WATCH +} + +void ProductAdapter::SendTerminatingRequest(uint32_t token, bool forceStop) +{ + if (g_termiantingHandler != nullptr) { + g_termiantingHandler(token, forceStop); + } +} + +bool ProductAdapter::IsTEHandlersRegisted() +{ + return (g_teHandlingHooks.renderTEHandler != nullptr); +} + +void ProductAdapter::ProcessOneTE() +{ + if (g_teHandlingHooks.renderTEHandler != nullptr) { + (void)(g_teHandlingHooks.renderTEHandler()); + } +} + +void ProductAdapter::NotifyRenderEnd() +{ + if (g_teHandlingHooks.renderEndHandler != nullptr) { + g_teHandlingHooks.renderEndHandler(); + } +} + +void ProductAdapter::SetDefaultFontStyle(const char *defaultFontFamily, uint8_t defaultFontSize) +{ + g_defaultFontFamilyName = const_cast(defaultFontFamily); + g_defaultFontSize = defaultFontSize; +} + +const char *ProductAdapter::GetDefaultFontFamilyName() +{ + return (g_defaultFontFamilyName != nullptr) ? g_defaultFontFamilyName : DEFAULT_VECTOR_FONT_FILENAME; +} + +uint8_t ProductAdapter::GetDefaultFontSize() +{ + return g_defaultFontSize; +} + +void ProductAdapter::UpdateShowingState(bool forground) +{ + g_isAceForground = forground; +} + +void ProductAdapter::SetScreenSize(uint16_t width, uint16_t height) +{ + g_screenWidth = width; + g_screenHeight = height; +} + +void ProductAdapter::GetScreenSize(uint16_t &width, uint16_t &height) +{ + width = g_screenWidth; + height = g_screenHeight; +} +} // namespace ACELite +} // namespace OHOS diff --git a/src/core/base/string_util.cpp b/frameworks/src/core/base/string_util.cpp old mode 100644 new mode 100755 similarity index 91% rename from src/core/base/string_util.cpp rename to frameworks/src/core/base/string_util.cpp index 5fe0d9f..5650417 --- a/src/core/base/string_util.cpp +++ b/frameworks/src/core/base/string_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,10 +15,8 @@ #include "ace_mem_base.h" #include "js_config.h" -#include "string_util.h" -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) +#include "string_util.h" namespace OHOS { namespace ACELite { @@ -28,6 +26,9 @@ char *StringUtil::Copy(const char *sequence) return nullptr; } size_t size = strlen(sequence); + if (size >= UINT16_MAX) { + return nullptr; + } char *buffer = StringUtil::Malloc(size); if (buffer == nullptr) { return nullptr; @@ -66,7 +67,7 @@ char *StringUtil::Slice(const char *sequence, const int32_t start, const int32_t if (startIdx < endIdx || endIdx < 0) { return nullptr; } - uint32_t diffSize = endIdx - startIdx; + int32_t diffSize = endIdx - startIdx; if (diffSize < 0) { return nullptr; } @@ -74,7 +75,7 @@ char *StringUtil::Slice(const char *sequence, const int32_t start, const int32_t if (buffer == nullptr) { return nullptr; } - if (strncpy_s(buffer, size + 1, sequence + startIdx, diffSize) == 0) { + if (strncpy_s(buffer, diffSize + 1, sequence + startIdx, diffSize) == 0) { return buffer; } ace_free(buffer); diff --git a/src/core/base/string_util.h b/frameworks/src/core/base/string_util.h similarity index 100% rename from src/core/base/string_util.h rename to frameworks/src/core/base/string_util.h diff --git a/src/core/base/time_util.cpp b/frameworks/src/core/base/time_util.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/base/time_util.cpp rename to frameworks/src/core/base/time_util.cpp diff --git a/src/core/base/time_util.h b/frameworks/src/core/base/time_util.h old mode 100755 new mode 100644 similarity index 88% rename from src/core/base/time_util.h rename to frameworks/src/core/base/time_util.h index ad6b0e9..6cb6c7a --- a/src/core/base/time_util.h +++ b/frameworks/src/core/base/time_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -17,9 +17,7 @@ #define OHOS_ACELITE_TIME_UTIL_H #include #include "js_config.h" -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) namespace OHOS { namespace ACELite { diff --git a/src/core/components/analog_clock_component.cpp b/frameworks/src/core/components/analog_clock_component.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/analog_clock_component.cpp rename to frameworks/src/core/components/analog_clock_component.cpp diff --git a/src/core/components/analog_clock_component.h b/frameworks/src/core/components/analog_clock_component.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/analog_clock_component.h rename to frameworks/src/core/components/analog_clock_component.h diff --git a/src/core/components/camera_component.cpp b/frameworks/src/core/components/camera_component.cpp similarity index 87% rename from src/core/components/camera_component.cpp rename to frameworks/src/core/components/camera_component.cpp index b6ca76c..b04e8f1 100755 --- a/src/core/components/camera_component.cpp +++ b/frameworks/src/core/components/camera_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -17,6 +17,7 @@ #ifdef FEATURE_COMPONENT_CAMERA #include "camera_component.h" +#include #include #include #include @@ -39,13 +40,11 @@ jerry_value_t CameraComponent::jsContext_; bool CameraComponent::lastCaptureCompleted_ = true; const char * const CameraComponent::TAKE_PHOTO = "takePhoto"; - -const uint32_t CameraComponent::IMAG_W_PIXELS_LOW = 720; -const uint32_t CameraComponent::IMAG_H_PIXELS_LOW = 576; -const uint32_t CameraComponent::IMAG_W_PIXELS_NORMAL = 1280; -const uint32_t CameraComponent::IMAG_H_PIXELS_NORMAL = 720; -const uint32_t CameraComponent::IMAG_W_PIXELS_HIGH = 1920; -const uint32_t CameraComponent::IMAG_H_PIXELS_HIGH = 1080; +const uint32_t CameraComponent::IMAG_W_PIXELS = 1920; +const uint32_t CameraComponent::IMAG_H_PIXELS = 1080; +const int32_t CameraComponent::IMAG_QFACTOR_LOW = 50; +const int32_t CameraComponent::IMAG_QFACTOR_NORMAL = 85; +const int32_t CameraComponent::IMAG_QFACTOR_HIGH = 90; void FrameCallback::OnFrameFinished(Media::Camera &camera, Media::FrameConfig &frameConfig, @@ -141,9 +140,16 @@ string *FrameCallback::CreateFilePath() const { const char *dataPath = GetDataPath(); if (dataPath == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "FrameCallback: get data path failed!"); return nullptr; } - string dataPathStr(dataPath); + char fullDataPath[PATH_MAX + 1] = {0}; + if (realpath(dataPath, fullDataPath) == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "FrameCallback: invalid data path!"); + return nullptr; + } + + string dataPathStr(fullDataPath); string prefix = dataPathStr + "/Img_"; ostringstream oss; struct timeval timeVal; @@ -272,6 +278,8 @@ bool CameraComponent::CreateNativeViews() cameraCallback_ = make_unique(); frameConfig_ = new Media::FrameConfig(Media::FRAME_CONFIG_CAPTURE); if (frameConfig_ != nullptr) { + captureSurface_->SetWidthAndHeight(IMAG_W_PIXELS, IMAG_H_PIXELS); + captureSurface_->SetUsage(BUFFER_CONSUMER_USAGE_HARDWARE); frameConfig_->AddSurface(*captureSurface_); } return true; @@ -301,7 +309,9 @@ inline UIView *CameraComponent::GetComponentRootView() const return static_cast(cameraView_.get()); } -bool CameraComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +bool CameraComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) { bool result = false; switch (eventTypeId) { @@ -326,12 +336,32 @@ void CameraComponent::PostRender() } list camList = cameraKit_->GetCameraIds(); if (camList.empty()) { + HILOG_ERROR(HILOG_MODULE_ACE, "CameraComponent: empty camera list!"); return; } const string cameraId = camList.front(); + const Media::CameraAbility *ability = cameraKit_->GetCameraAbility(cameraId); + if (ability == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "CameraComponent: get camera ability failed!"); + return; + } + bool isSizeSupported = false; + list sizeList = ability->GetSupportedSizes(0); + for (auto &pic : sizeList) { + if (pic.width == IMAG_W_PIXELS && pic.height == IMAG_H_PIXELS) { + isSizeSupported = true; + break; + } + } + if (!isSizeSupported) { + HILOG_ERROR(HILOG_MODULE_ACE, "CameraComponent: capture resolution unsupported!"); + return; + } + Surface *previewSurface = cameraView_->GetSurface(); if (previewSurface != nullptr) { - previewSurface->SetWidthAndHeight(IMAG_W_PIXELS_NORMAL, IMAG_H_PIXELS_NORMAL); + previewSurface->SetWidthAndHeight(IMAG_W_PIXELS, IMAG_H_PIXELS); + previewSurface->SetUsage(BUFFER_CONSUMER_USAGE_HARDWARE); cameraCallback_->SetPreviewSurface(*previewSurface); } cameraKit_->CreateCamera(cameraId, *cameraCallback_.get(), *cameraCallback_->GetEventHandler()); @@ -388,26 +418,20 @@ void CameraComponent::ReleaseStaticResources() bool CameraComponent::CaptureFrame(const CameraComponent *component, const char *quality) { Media::FrameConfig *frameConfig = component->GetFrameConfig(); - Surface *surface = const_cast(component->GetCaptureSurface()); - if ((frameConfig == nullptr) || (surface == nullptr)) { + if (frameConfig == nullptr) { return false; } - - uint32_t surfWidth = IMAG_W_PIXELS_NORMAL; // corresponding to default resolution - uint32_t surfHeight = IMAG_H_PIXELS_NORMAL; // corresponding to default resolution + int32_t qfactor = IMAG_QFACTOR_NORMAL; if (quality != nullptr) { const char * const qualityLow = "low"; const char * const qualityHigh = "high"; if (strcmp(quality, qualityLow) == 0) { - surfWidth = IMAG_W_PIXELS_LOW; - surfHeight = IMAG_H_PIXELS_LOW; + qfactor = IMAG_QFACTOR_LOW; } else if (strcmp(quality, qualityHigh) == 0) { - surfWidth = IMAG_W_PIXELS_HIGH; - surfHeight = IMAG_H_PIXELS_HIGH; + qfactor = IMAG_QFACTOR_HIGH; } } - surface->SetWidthAndHeight(surfWidth, surfHeight); - + frameConfig->SetParameter(PARAM_KEY_IMAGE_ENCODE_QFACTOR, qfactor); const CameraCallback *cameraCallback = component->GetCameraCallback(); if (cameraCallback == nullptr) { return false; diff --git a/src/core/components/camera_component.h b/frameworks/src/core/components/camera_component.h similarity index 91% rename from src/core/components/camera_component.h rename to frameworks/src/core/components/camera_component.h index b090467..71ab07b 100755 --- a/src/core/components/camera_component.h +++ b/frameworks/src/core/components/camera_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -149,7 +149,9 @@ protected: bool CreateNativeViews() override; void ReleaseNativeViews() override; UIView *GetComponentRootView() const override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) override; void PostRender() override; private: @@ -159,23 +161,17 @@ private: Media::FrameConfig *frameConfig_; Surface *captureSurface_; static const char * const TAKE_PHOTO; - static const uint32_t IMAG_W_PIXELS_LOW; - static const uint32_t IMAG_H_PIXELS_LOW; - static const uint32_t IMAG_W_PIXELS_NORMAL; - static const uint32_t IMAG_H_PIXELS_NORMAL; - static const uint32_t IMAG_W_PIXELS_HIGH; - static const uint32_t IMAG_H_PIXELS_HIGH; + static const uint32_t IMAG_W_PIXELS; + static const uint32_t IMAG_H_PIXELS; + static const int32_t IMAG_QFACTOR_LOW; + static const int32_t IMAG_QFACTOR_NORMAL; + static const int32_t IMAG_QFACTOR_HIGH; Media::FrameConfig *GetFrameConfig() const { return frameConfig_; } - const Surface *GetCaptureSurface() const - { - return captureSurface_; - } - static bool CaptureFrame(const CameraComponent *component, const char *quality); static jerry_value_t TakePhoto(const jerry_value_t func, const jerry_value_t context, diff --git a/frameworks/src/core/components/canvas_component.cpp b/frameworks/src/core/components/canvas_component.cpp new file mode 100644 index 0000000..e78c09e --- /dev/null +++ b/frameworks/src/core/components/canvas_component.cpp @@ -0,0 +1,960 @@ +/* + * Copyright (c) 2020-2021 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. + */ + +#include "acelite_config.h" + +#ifdef FEATURE_COMPONENT_CANVAS +#include "canvas_component.h" +#include "js_fwk_common.h" +#include "product_adapter.h" +#include "securec.h" + +namespace OHOS { +namespace ACELite { +// default fill style color=black +const char * const CanvasComponent::DEFAULT_FILLSTYLE = "#000000"; +// default stroke style color=black +const char * const CanvasComponent::DEFAULT_STROKESTYLE = "#000000"; +// default text align=left +const char * const CanvasComponent::DEFAULT_TEXTALIGN = "left"; + +// API-attribute +const char * const CanvasComponent::ATTR_FILLSTYLE = "fillStyle"; +const char * const CanvasComponent::ATTR_STROKESTYLE = "strokeStyle"; +const char * const CanvasComponent::ATTR_LINEWIDTH = "lineWidth"; +const char * const CanvasComponent::ATTR_FONT = "font"; +const char * const CanvasComponent::ATTR_TEXTALIGN = "textAlign"; + +// API-method +const char * const CanvasComponent::FUNC_GETCONTEXT = "getContext"; +const char * const CanvasComponent::FUNC_FILLRECT = "fillRect"; +const char * const CanvasComponent::FUNC_STROKERECT = "strokeRect"; +const char * const CanvasComponent::FUNC_FILLTEXT = "fillText"; +const char * const CanvasComponent::FUNC_BEGINPATH = "beginPath"; +const char * const CanvasComponent::FUNC_MOVETO = "moveTo"; +const char * const CanvasComponent::FUNC_LINETO = "lineTo"; +const char * const CanvasComponent::FUNC_RECT = "rect"; +const char * const CanvasComponent::FUNC_ARC = "arc"; +const char * const CanvasComponent::FUNC_CLOSEPATH = "closePath"; +const char * const CanvasComponent::FUNC_STROKE = "stroke"; + +// create canvas draw attribute-callback mapping +const AttrMap CanvasComponent::attrMap_[] = { + {ATTR_FILLSTYLE, FillStyleSetter, FillStyleGetter}, + {ATTR_STROKESTYLE, StrokeStyleSetter, StrokeStyleGetter}, + {ATTR_LINEWIDTH, LineWidthSetter, LineWidthGetter}, + {ATTR_FONT, FontSetter, FontGetter}, + {ATTR_TEXTALIGN, TextAlignSetter, TextAlignGetter} +}; + +// create canvas draw method-callback mapping +const MethodMap CanvasComponent::methodMap_[] = { + {FUNC_GETCONTEXT, GetContext}, + {FUNC_FILLRECT, FillRect}, + {FUNC_STROKERECT, StrokeRect}, + {FUNC_FILLTEXT, FillText}, + {FUNC_BEGINPATH, BeginPath}, + {FUNC_MOVETO, MoveTo}, + {FUNC_LINETO, LineTo}, + {FUNC_RECT, Rect}, + {FUNC_ARC, Arc}, + {FUNC_CLOSEPATH, ClosePath}, + {FUNC_STROKE, Stroke} +}; + +CanvasComponent::CanvasComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) + : Component(options, children, styleManager), + context_(UNDEFINED), + fillStyleValue_(nullptr), + strokeStyleValue_(nullptr), + fontValue_(nullptr), + textAlignValue_(nullptr), + lineWidthValue_(1) +{ + SetComponentName(K_CANVAS); + // set default paint pattern + paint_.SetFillColor(Color::Black()); + paint_.SetOpacity(OPA_OPAQUE); + paint_.SetStrokeColor(Color::Black()); + paint_.SetStrokeWidth(1); + + // set default text font pattern + fontStyle_.align = TEXT_ALIGNMENT_LEFT; + fontStyle_.direct = TEXT_DIRECT_LTR; + fontStyle_.fontSize = ProductAdapter::GetDefaultFontSize(); + char *defaultFontName = nullptr; + CopyFontFamily(defaultFontName, ProductAdapter::GetDefaultFontFamilyName()); + fontStyle_.fontName = defaultFontName; + fontStyle_.letterSpace = DEFAULT_FONT_LETTERSPACE; + + RegisterNamedFunction(methodMap_[0].methodName, methodMap_[0].callbackName); +} + +// Create UICanvas +bool CanvasComponent::CreateNativeViews() +{ + return true; +} + +void CanvasComponent::ReleaseNativeViews() +{ + ACE_FREE(fillStyleValue_); + ACE_FREE(strokeStyleValue_); + ACE_FREE(fontValue_); + ACE_FREE(textAlignValue_); + // free fontStyle_.fontName memory which malloc in FontSetter method. + if (fontStyle_.fontName != nullptr) { + ace_free(const_cast(fontStyle_.fontName)); + fontStyle_.fontName = nullptr; + } + if (!IS_UNDEFINED(context_)) { + bool deleted = jerry_delete_object_native_pointer(context_, nullptr); + if (!deleted) { + HILOG_WARN(HILOG_MODULE_ACE, "canvas_component: delete object native pointer context_ failed!"); + } + jerry_release_value(context_); + } +} + +UIView *CanvasComponent::GetComponentRootView() const +{ + return (const_cast(&canvas_)); +} + +jerry_value_t CanvasComponent::GetContext(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + if (argsNum != ArgsCount::NUM_1) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of getContext method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("getContext method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + if (IS_UNDEFINED(component->context_)) { + component->context_ = jerry_create_object(); + jerry_set_object_native_pointer(component->context_, component, nullptr); + + // register fillStyle, strokeStyle, lineWidth, font, textAlign attribute + uint16_t attrMapLength = sizeof(attrMap_) / sizeof(attrMap_[0]); + for (uint16_t index = 0; index < attrMapLength; index++) { + RegisterAttributeFunc(component->context_, attrMap_[index].attrName, attrMap_[index].setterName, + attrMap_[index].getterName); + } + + // register fillRect, strokeRect, fillText, beginPath, moveTo, lineTo, rect, arc, closePath, stroke method + uint16_t methodMapLength = sizeof(methodMap_) / sizeof(methodMap_[0]); + for (uint16_t index = 1; index < methodMapLength; index++) { + RegisterDrawMethodFunc(component->context_, methodMap_[index].methodName, methodMap_[index].callbackName); + } + } + + // BeginPath function need to be called after getting canvas API object + component->canvas_.BeginPath(); + + jerry_acquire_value(component->context_); + return component->context_; +} + +jerry_value_t CanvasComponent::FillStyleSetter(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_1) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: fillStyle value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("fillStyle value error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + ACE_FREE(component->fillStyleValue_); + + component->fillStyleValue_ = MallocStringOf(args[ArgsIndex::IDX_0]); + if (component->fillStyleValue_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: fillStyle value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("fillStyle value erro!")); + } + + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + ParseColor(component->fillStyleValue_, color, alpha); + component->paint_.SetFillColor(component->GetRGBColor(color)); + component->paint_.SetOpacity(alpha); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::FillStyleGetter(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + if (component->fillStyleValue_ == nullptr) { + CopyFontFamily(component->fillStyleValue_, DEFAULT_FILLSTYLE); + } + + if (component->fillStyleValue_ != nullptr) { + return jerry_create_string(reinterpret_cast(component->fillStyleValue_)); + } + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("fillStyle value error")); +} + +jerry_value_t CanvasComponent::StrokeStyleSetter(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_1) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: strokeStyle value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("the value of strokeStyle is null")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + ACE_FREE(component->strokeStyleValue_); + + component->strokeStyleValue_ = MallocStringOf(args[ArgsIndex::IDX_0]); + if (component->strokeStyleValue_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: strokeStyle value error"); + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("strokeStyle value error")); + } + + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + ParseColor(component->strokeStyleValue_, color, alpha); + component->paint_.SetStrokeColor(component->GetRGBColor(color)); + component->paint_.SetOpacity(alpha); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::StrokeStyleGetter(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + if (component->strokeStyleValue_ == nullptr) { + CopyFontFamily(component->strokeStyleValue_, DEFAULT_STROKESTYLE); + } + + if (component->strokeStyleValue_ != nullptr) { + return jerry_create_string(reinterpret_cast(component->strokeStyleValue_)); + } + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("strokeStyle value error")); +} + +jerry_value_t CanvasComponent::LineWidthSetter(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_1) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: lineWidth value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("lineWidth value error!")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + component->lineWidthValue_ = IntegerOf(args[ArgsIndex::IDX_0]); + component->paint_.SetStrokeWidth(component->lineWidthValue_); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::LineWidthGetter(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + return jerry_create_number(component->lineWidthValue_); +} + +jerry_value_t CanvasComponent::FontSetter(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_1) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: font value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("font value error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + ACE_FREE(component->fontValue_); + + component->fontValue_ = MallocStringOf(args[ArgsIndex::IDX_0]); + if (component->fontValue_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: text font value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("text font value error")); + } + + const int8_t maxParamCount = 2; + for (int8_t index = 0; index < maxParamCount; index++) { + // get font size or font family from fontValue. + char *mallocSubFont = nullptr; + component->GetSubFont(component->fontValue_, index, mallocSubFont); + if (mallocSubFont == nullptr) { + HILOG_WARN(HILOG_MODULE_ACE, "canvas_component: get text font size or font family failed"); + ace_free(component->fontValue_); + component->fontValue_ = nullptr; + return UNDEFINED; + } + + // if it is a font size + if (*mallocSubFont >= '0' && *mallocSubFont <= '9') { + component->fontStyle_.fontSize = strtol(mallocSubFont, nullptr, DEC); + ace_free(mallocSubFont); + mallocSubFont = nullptr; + } else { // if it is a font family + // free default component->fontStyle_.fontName memory. + if (component->fontStyle_.fontName != nullptr) { + ace_free(const_cast(component->fontStyle_.fontName)); + component->fontStyle_.fontName = nullptr; + } + // set customized font name, the memory of mallocFontFamily need be free in CanvasFillText method. + component->fontStyle_.fontName = mallocSubFont; + } + } + return UNDEFINED; +} + +jerry_value_t CanvasComponent::FontGetter(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + if (component->fontValue_ == nullptr) { + uint8_t defaultFontSize = ProductAdapter::GetDefaultFontSize(); + const char *defaultFontName = ProductAdapter::GetDefaultFontFamilyName(); + size_t nameLength = (defaultFontName != nullptr) ? strlen(defaultFontName) : 0; + const uint8_t maxNameLen = 32; + const uint8_t maxFontSizeLen = 16; + const uint8_t maxBufferLen = maxNameLen + maxFontSizeLen; + if (nameLength > 0 && (nameLength < maxNameLen) && (defaultFontSize < UINT8_MAX)) { + char defaultFont[maxBufferLen] = {0}; + int length = sprintf_s(defaultFont, (maxBufferLen - 1), "%dpx %s", defaultFontSize, defaultFontName); + if (length > 0 && length < maxBufferLen) { + CopyFontFamily(component->fontValue_, defaultFont, length); + } + } + } + + if (component->fontValue_ != nullptr) { + return jerry_create_string(reinterpret_cast(component->fontValue_)); + } + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("text font value error")); +} + +jerry_value_t CanvasComponent::TextAlignSetter(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_1) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: textAlign value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("textAlign value error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + ACE_FREE(component->textAlignValue_); + + uint16_t textAlignLength = 0; + component->textAlignValue_ = MallocStringOf(args[ArgsIndex::IDX_0], &textAlignLength); + if (component->textAlignValue_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: text align value error!"); + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("text align value error")); + } + + uint16_t textAlignId = KeyParser::ParseKeyId(component->textAlignValue_, textAlignLength); + if (textAlignId == K_LEFT) { + component->fontStyle_.align = TEXT_ALIGNMENT_LEFT; + } else if (textAlignId == K_RIGHT) { + component->fontStyle_.align = TEXT_ALIGNMENT_RIGHT; + } else if (textAlignId == K_CENTER) { + component->fontStyle_.align = TEXT_ALIGNMENT_CENTER; + } else { + // do nothing(use default align=TEXT_ALIGNMENT_LEFT) + } + return UNDEFINED; +} + +jerry_value_t CanvasComponent::TextAlignGetter(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + if (component->textAlignValue_ == nullptr) { + CopyFontFamily(component->textAlignValue_, DEFAULT_TEXTALIGN); + } + + if (component->textAlignValue_ != nullptr) { + return jerry_create_string(reinterpret_cast(component->textAlignValue_)); + } + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("textAlign value error")); +} + +jerry_value_t CanvasComponent::FillRect(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_4) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of fillRect method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("fillRect method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + int16_t startX = IntegerOf(args[ArgsIndex::IDX_0]); + int16_t startY = IntegerOf(args[ArgsIndex::IDX_1]); + int16_t width = IntegerOf(args[ArgsIndex::IDX_2]); + int16_t height = IntegerOf(args[ArgsIndex::IDX_3]); + + // FILL_STYLE: fill rect support fill shapses only + component->paint_.SetStyle(component->paint_.FILL_STYLE); + + Point startPoint; + startPoint.x = startX; + startPoint.y = startY; + component->canvas_.DrawRect(startPoint, height, width, component->paint_); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::StrokeRect(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_4) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of strokeRect method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("strokeRect method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + int16_t startX = IntegerOf(args[ArgsIndex::IDX_0]); + int16_t startY = IntegerOf(args[ArgsIndex::IDX_1]); + int16_t width = IntegerOf(args[ArgsIndex::IDX_2]); + int16_t height = IntegerOf(args[ArgsIndex::IDX_3]); + + // STROKE_STYLE: stroke rect support draw borders only + component->paint_.SetStyle(component->paint_.STROKE_STYLE); + + Point startPoint; + startPoint.x = startX; + startPoint.y = startY; + component->canvas_.DrawRect(startPoint, height, width, component->paint_); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::FillText(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_3) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of fillText method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("fillText method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + char *textValue = MallocStringOf(args[ArgsIndex::IDX_0]); + if (textValue == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get text value failed"); + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("get text value failed")); + } + + int16_t startX = IntegerOf(args[ArgsIndex::IDX_1]); + int16_t startY = IntegerOf(args[ArgsIndex::IDX_2]); + int16_t maxWidth = component->canvas_.GetWidth(); + + // FILL_STYLE: fillText support fill shapses only + component->paint_.SetStyle(component->paint_.FILL_STYLE); + + Point startPoint; + const int8_t half = 2; + startPoint.x = startX; + startPoint.y = startY; + + // if textAlign=left, not need transfer startX, if textAlign=right or center, need transfer startX + if (component->fontStyle_.align == TEXT_ALIGNMENT_RIGHT) { + startPoint.x = startX - maxWidth; + } else if (component->fontStyle_.align == TEXT_ALIGNMENT_CENTER) { + startPoint.x = (startX + startX - maxWidth) / half; + } else { + startPoint.x = startX; + } + + component->canvas_.DrawLabel(startPoint, textValue, maxWidth, component->fontStyle_, component->paint_); + + ACE_FREE(textValue); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::BeginPath(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + component->canvas_.BeginPath(); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::MoveTo(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_2) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of moveTo method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("moveTo method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + int16_t x = IntegerOf(args[ArgsIndex::IDX_0]); + int16_t y = IntegerOf(args[ArgsIndex::IDX_1]); + + Point point; + point.x = x; + point.y = y; + component->canvas_.MoveTo(point); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::LineTo(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_2) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of lineTo method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("lineTo method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + int16_t x = IntegerOf(args[ArgsIndex::IDX_0]); + int16_t y = IntegerOf(args[ArgsIndex::IDX_1]); + + Point point; + point.x = x; + point.y = y; + component->canvas_.LineTo(point); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::Rect(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_4) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of rect method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("rect method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + int16_t x = IntegerOf(args[ArgsIndex::IDX_0]); + int16_t y = IntegerOf(args[ArgsIndex::IDX_1]); + int16_t width = IntegerOf(args[ArgsIndex::IDX_2]); + int16_t height = IntegerOf(args[ArgsIndex::IDX_3]); + + Point point; + point.x = x; + point.y = y; + component->canvas_.AddRect(point, height, width); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::Arc(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + if (argsNum != ArgsCount::NUM_5 && argsNum != ArgsCount::NUM_6) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of arc method parameter error!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("arc method parameter error")); + } + + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + int16_t centerX = IntegerOf(args[ArgsIndex::IDX_0]); + int16_t centerY = IntegerOf(args[ArgsIndex::IDX_1]); + int16_t radius = IntegerOf(args[ArgsIndex::IDX_2]); + double sAngle = jerry_get_number_value(args[ArgsIndex::IDX_3]); + double eAngle = jerry_get_number_value(args[ArgsIndex::IDX_4]); + + bool counterClockwise = false; + if (argsNum == ArgsCount::NUM_6) { + if (jerry_value_is_boolean(args[ArgsIndex::IDX_5])) { + counterClockwise = BoolOf(args[ArgsIndex::IDX_5]); + } + } + + Point centerPoint; + centerPoint.x = centerX; + centerPoint.y = centerY; + int16_t startAngle = 0; + int16_t endAngle = 0; + + bool result = component->FormatArcAngle(sAngle, eAngle, startAngle, endAngle, counterClockwise); + if (!result) { + return jerry_create_error(JERRY_ERROR_TYPE, reinterpret_cast("arc angle error")); + } + + // 0 degree is at the 3 o'clock position of the arc's circle at JS layer, + // but which is at the 12 o'clock position at Native layer. + constexpr int16_t DEGREES_OFFSET = 90; + constexpr int16_t DEGREES_360 = 360; + if (((startAngle + DEGREES_OFFSET) <= INT16_MAX) && ((endAngle + DEGREES_OFFSET) <= INT16_MAX)) { + startAngle = startAngle + DEGREES_OFFSET; + endAngle = endAngle + DEGREES_OFFSET; + } else { + startAngle = startAngle + DEGREES_OFFSET - DEGREES_360; + endAngle = endAngle + DEGREES_OFFSET - DEGREES_360; + } + + component->canvas_.ArcTo(centerPoint, radius, startAngle, endAngle); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::ClosePath(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + component->canvas_.ClosePath(); + return UNDEFINED; +} + +jerry_value_t CanvasComponent::Stroke(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + (void)func; + (void)args; + (void)argsNum; + CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); + return jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("get canvas component from js object failed")); + } + + component->canvas_.DrawPath(component->paint_); + return UNDEFINED; +} + +void CanvasComponent::GetSubFont(const char *font, const uint8_t index, char *&subFont) const +{ + if (font == nullptr || *font == '\0') { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get font attribute failed"); + return; + } + + if (strlen(font) >= UINT16_MAX) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: font size overflow."); + return; + } + + // skip space character at the head of string. + while ((*font != '\0') && (*font == ' ')) { + font++; + } + + uint8_t currentIndex = 0; + const char *currentPos = font; + const char *endPos = font; + while (*currentPos != '\0') { + // find the sub font string + if (currentIndex == index) { + if (*endPos != ' ' && *endPos != '\0') { + endPos++; + continue; + } + uint16_t len = endPos - currentPos; + uint16_t startIndex = currentPos - font; + subFont = static_cast(ace_malloc(len + 1)); + if (subFont == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: malloc buffer failed for subFont"); + return; + } + errno_t error = strncpy_s(subFont, len + 1, font + startIndex, len); + if (error != 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: copy string failed"); + ace_free(subFont); + subFont = nullptr; + return; + } + subFont[len] = '\0'; + break; + } + // go forward to next sub font string. + if (*(currentPos) == ' ' && *(currentPos + 1) != ' ') { + currentIndex = currentIndex + 1; + endPos = currentPos + 1; + } + currentPos++; + } +} + +bool CanvasComponent::FormatArcAngle(double sAngle, + double eAngle, + int16_t &startAngle, + int16_t &endAngle, + bool counterClockwise) const +{ + constexpr int16_t DEGREES_180 = 180; + constexpr int16_t DEGREES_360 = 360; + + // calculate start-angle and end-angle degrees + if (((DEGREES_180 * sAngle / UI_PI) > INT16_MAX) || ((DEGREES_180 * sAngle / UI_PI) < INT16_MIN) || + ((DEGREES_180 * eAngle / UI_PI) > INT16_MAX) || ((DEGREES_180 * eAngle / UI_PI) < INT16_MIN)) { + HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: startAngle or endAngle overflow."); + return false; + } + + startAngle = DEGREES_180 * sAngle / UI_PI; + endAngle = DEGREES_180 * eAngle / UI_PI; + + if (!counterClockwise) { + // reset end-angle degrees when (endAngle - startAngle) > 360 + if ((endAngle - startAngle) > DEGREES_360) { + endAngle = startAngle + DEGREES_360; + } + // reset start-angle or end-angle degrees when startAngle > endAngle + if (startAngle <= endAngle) { + return true; + } + while (startAngle >= endAngle) { + if ((endAngle + DEGREES_360) > INT16_MAX) { + startAngle = startAngle - DEGREES_360; + break; + } + endAngle = endAngle + DEGREES_360; + } + } else { + // reset end-angle degrees when (endAngle - startAngle) > 360 + if ((startAngle - endAngle) > DEGREES_360) { + endAngle = startAngle - DEGREES_360; + } + // reset start-angle or end-angle degrees when startAngle < endAngle + if (startAngle >= endAngle) { + return true; + } + while (startAngle <= endAngle) { + if ((endAngle - DEGREES_360) < INT16_MIN) { + startAngle = startAngle + DEGREES_360; + break; + } + endAngle = endAngle - DEGREES_360; + } + } + + return true; +} + +void CanvasComponent::RegisterAttributeFunc(jerry_value_t canvas2dContext, + const char *attributeName, + jerry_external_handler_t setterHandler, + jerry_external_handler_t getterHandler) +{ + // register canvas js attribute setter property via the jerry_define_own_property method + jerry_value_t propName = jerry_create_string(reinterpret_cast(attributeName)); + jerry_property_descriptor_t desc; + jerry_init_property_descriptor_fields(&desc); + desc.is_set_defined = true; + desc.setter = jerry_create_external_function(setterHandler); + desc.is_get_defined = true; + desc.getter = jerry_create_external_function(getterHandler); + jerry_value_t returnValue = jerry_define_own_property(canvas2dContext, propName, &desc); + jerry_free_property_descriptor_fields(&desc); + ReleaseJerryValue(propName, returnValue, VA_ARG_END_FLAG); +} + +void CanvasComponent::RegisterDrawMethodFunc(jerry_value_t canvas2dContext, + const char *drawMethodName, + jerry_external_handler_t handler) +{ + JerrySetFuncProperty(canvas2dContext, drawMethodName, handler); +} +} // namespace ACELite +} // namespace OHOS +#endif // FEATURE_COMPONENT_CANVAS diff --git a/src/core/components/canvas_component.h b/frameworks/src/core/components/canvas_component.h old mode 100755 new mode 100644 similarity index 62% rename from src/core/components/canvas_component.h rename to frameworks/src/core/components/canvas_component.h index 335ee18..46ec159 --- a/src/core/components/canvas_component.h +++ b/frameworks/src/core/components/canvas_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -25,6 +25,8 @@ namespace OHOS { namespace ACELite { +enum ArgsCount : uint8_t { NUM_1 = 1, NUM_2, NUM_3, NUM_4, NUM_5, NUM_6 }; +enum ArgsIndex : uint8_t { IDX_0, IDX_1, IDX_2, IDX_3, IDX_4, IDX_5 }; struct AttrMap { ACE_DISALLOW_COPY_AND_MOVE(AttrMap); const char *attrName; @@ -51,6 +53,11 @@ protected: private: void GetSubFont(const char *font, const uint8_t index, char *&subFont) const; + bool FormatArcAngle(double sAngle, + double eAngle, + int16_t &startAngle, + int16_t &endAngle, + bool counterClockwise) const; static void RegisterAttributeFunc(jerry_value_t canvas2dContext, const char *attributeName, @@ -61,10 +68,10 @@ private: const char *drawMethodName, jerry_external_handler_t handler); - static jerry_value_t CanvasGetContext(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum); + static jerry_value_t GetContext(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum); static jerry_value_t FillStyleSetter(const jerry_value_t func, const jerry_value_t dom, @@ -116,23 +123,58 @@ private: const jerry_value_t args[], const jerry_length_t argsNum); - static jerry_value_t CanvasFillRect(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum); + static jerry_value_t FillRect(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum); - static jerry_value_t CanvasStrokeRect(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum); + static jerry_value_t StrokeRect(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t argsNum); - static jerry_value_t CanvasFillText(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum); + static jerry_value_t FillText(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); - UICanvas *canvas_; - jerry_value_t canvas2dContext_; + static jerry_value_t BeginPath(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static jerry_value_t MoveTo(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static jerry_value_t LineTo(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static jerry_value_t Rect(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static jerry_value_t Arc(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static jerry_value_t ClosePath(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static jerry_value_t Stroke(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + UICanvas canvas_; + jerry_value_t context_; Paint paint_; UICanvas::FontStyle fontStyle_; char *fillStyleValue_; @@ -142,17 +184,9 @@ private: int16_t lineWidthValue_; static const char * const DEFAULT_FILLSTYLE; static const char * const DEFAULT_STROKESTYLE; - static const char * const DEFAULT_FONT; static const char * const DEFAULT_TEXTALIGN; static const AttrMap attrMap_[]; static const MethodMap methodMap_[]; - static const uint8_t ARGS_COUNT_ONE; - static const uint8_t ARGS_COUNT_THREE; - static const uint8_t ARGS_COUNT_FOUR; - static const uint8_t ARGS_INDEX_0; - static const uint8_t ARGS_INDEX_1; - static const uint8_t ARGS_INDEX_2; - static const uint8_t ARGS_INDEX_3; static const char * const ATTR_FILLSTYLE; static const char * const ATTR_STROKESTYLE; static const char * const ATTR_LINEWIDTH; @@ -162,6 +196,13 @@ private: static const char * const FUNC_FILLRECT; static const char * const FUNC_STROKERECT; static const char * const FUNC_FILLTEXT; + static const char * const FUNC_BEGINPATH; + static const char * const FUNC_MOVETO; + static const char * const FUNC_LINETO; + static const char * const FUNC_RECT; + static const char * const FUNC_ARC; + static const char * const FUNC_CLOSEPATH; + static const char * const FUNC_STROKE; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/chart_component.cpp b/frameworks/src/core/components/chart_component.cpp similarity index 87% rename from src/core/components/chart_component.cpp rename to frameworks/src/core/components/chart_component.cpp index fa80556..5d1dfcb 100755 --- a/src/core/components/chart_component.cpp +++ b/frameworks/src/core/components/chart_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -17,10 +17,10 @@ #include "ace_log.h" #include "ace_mem_base.h" #include "flex_layout.h" +#include "font/ui_font_header.h" #include "keys.h" #include "ui_chart.h" #include "ui_circle_progress.h" -#include "font/ui_font_header.h" namespace OHOS { namespace ACELite { @@ -69,7 +69,9 @@ ChartComponent::ChartComponent(jerry_value_t options, jerry_value_t children, Ap chartType_(const_cast(LINE)), headPointStyle_(nullptr), topPointStyle_(nullptr), - bottomPointStyle_(nullptr){} + bottomPointStyle_(nullptr) +{ +} bool ChartComponent::CreateNativeViews() { @@ -94,10 +96,7 @@ bool ChartComponent::CreateNativeViews() HILOG_ERROR(HILOG_MODULE_ACE, "create chart view error"); return false; } - if (!Init()) { - return false; - } - return true; + return Init(); } bool ChartComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) @@ -111,7 +110,7 @@ bool ChartComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrV dataSetsRecord_ = attrValue; break; } - case K_OPATIONS: { + case K_OPTIONS: { SetOptions(attrValue); break; } @@ -122,7 +121,7 @@ bool ChartComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrV return false; } -void ChartComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) +void ChartComponent::PostUpdate(uint16_t attrKeyId) { chartView_->ClearDataSerial(); chartView_->Invalidate(); @@ -201,54 +200,54 @@ void ChartComponent::UpdateStrokeSmoothToSerial(UIChartDataSerial& dataserial) dataserial.EnableSmooth(seriesOptions_->smooth); } +UIChartDataSerial::PointStyle *ChartComponent::UpdatePointStyle(UIChartDataSerial::PointStyle *pointStyle, + uint32_t fillColor, uint32_t strokeColor, uint32_t radius, uint32_t strokeWidth) +{ + if (pointStyle == nullptr) { + pointStyle = new UIChartDataSerial::PointStyle(); + if (pointStyle == nullptr) { + return nullptr; + } + } + pointStyle->fillColor = GetRGBColor(fillColor); + pointStyle->strokeColor = GetRGBColor(strokeColor); + pointStyle->strokeWidth = 1; + pointStyle->radius = radius; + pointStyle->strokeWidth = strokeWidth; + return pointStyle; +} + bool ChartComponent::UpdatePointToSerial(UIChartDataSerial* dataserial, PointType type) { switch (type) { case PointType::HEAD: { + headPointStyle_ = UpdatePointStyle(headPointStyle_, seriesOptions_->head->fillColor, + seriesOptions_->head->strokeColor, seriesOptions_->head->size, seriesOptions_->head->strokeWidth); if (headPointStyle_ == nullptr) { - headPointStyle_ = new UIChartDataSerial::PointStyle(); - if (headPointStyle_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc headPointStyle heap error"); - return false; - } + HILOG_ERROR(HILOG_MODULE_ACE, "malloc headPointStyle heap error"); + return false; } - headPointStyle_->fillColor = GetRGBColor(seriesOptions_->head->fillColor); - headPointStyle_->strokeColor = GetRGBColor(seriesOptions_->head->strokeColor); - headPointStyle_->strokeWidth = 1; - headPointStyle_->radius = seriesOptions_->head->size; - headPointStyle_->strokeWidth = seriesOptions_->head->strokeWidth; dataserial->SetHeadPointStyle(*headPointStyle_); break; } case PointType::TOP: { + topPointStyle_ = UpdatePointStyle(topPointStyle_, seriesOptions_->top->fillColor, + seriesOptions_->top->strokeColor, seriesOptions_->top->size, seriesOptions_->top->strokeWidth); if (topPointStyle_ == nullptr) { - topPointStyle_ = new UIChartDataSerial::PointStyle(); - if (topPointStyle_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc topPointStyle heap error"); - return false; - } + HILOG_ERROR(HILOG_MODULE_ACE, "malloc topPointStyle heap error"); + return false; } - topPointStyle_->fillColor = GetRGBColor(seriesOptions_->top->fillColor); - topPointStyle_->strokeColor = GetRGBColor(seriesOptions_->top->strokeColor); - topPointStyle_->strokeWidth = 1; - topPointStyle_->radius = seriesOptions_->top->size; - topPointStyle_->strokeWidth = seriesOptions_->top->strokeWidth; dataserial->SetTopPointStyle(*topPointStyle_); break; } case PointType::BOTTOM: { + bottomPointStyle_ = UpdatePointStyle(bottomPointStyle_, + seriesOptions_->bottom->fillColor, seriesOptions_->bottom->strokeColor, + seriesOptions_->bottom->size, seriesOptions_->bottom->strokeWidth); if (bottomPointStyle_ == nullptr) { - bottomPointStyle_ = new UIChartDataSerial::PointStyle(); - if (bottomPointStyle_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc bottomPointStyle heap error"); - return false; - } + HILOG_ERROR(HILOG_MODULE_ACE, "malloc bottomPointStyle heap error"); + return false; } - bottomPointStyle_->fillColor = GetRGBColor(seriesOptions_->bottom->fillColor); - bottomPointStyle_->strokeColor = GetRGBColor(seriesOptions_->bottom->strokeColor); - bottomPointStyle_->strokeWidth = 1; - bottomPointStyle_->radius = seriesOptions_->bottom->size; - bottomPointStyle_->strokeWidth = seriesOptions_->bottom->strokeWidth; dataserial->SetBottomPointStyle(*bottomPointStyle_); break; } @@ -262,29 +261,26 @@ bool ChartComponent::UpdatePointToSerial(UIChartDataSerial* dataserial, PointTyp bool ChartComponent::UpdatePoints(UIChartDataSerial* dataserial) { if (seriesOptions_->isTopSet) { - if (UpdatePointToSerial(dataserial, PointType::TOP)) { - dataserial->EnableTopPoint(true); - } else { + if (!UpdatePointToSerial(dataserial, PointType::TOP)) { return false; } + dataserial->EnableTopPoint(true); } else { dataserial->EnableTopPoint(false); } if (seriesOptions_->isHeadSet) { - if (UpdatePointToSerial(dataserial, PointType::HEAD)) { - dataserial->EnableHeadPoint(true); - } else { + if (!UpdatePointToSerial(dataserial, PointType::HEAD)) { return false; } + dataserial->EnableHeadPoint(true); } else { dataserial->EnableHeadPoint(false); } if (seriesOptions_->isBottomSet) { - if (UpdatePointToSerial(dataserial, PointType::BOTTOM)) { - dataserial->EnableBottomPoint(true); - } else { + if (!UpdatePointToSerial(dataserial, PointType::BOTTOM)) { return false; } + dataserial->EnableBottomPoint(true); } else { dataserial->EnableBottomPoint(false); } @@ -318,7 +314,7 @@ bool ChartComponent::UpdateValuesToSerial(jerry_value_t dataSet, UIChartDataSeri if ((xMaxValue_ >= (UINT16_MAX - 1)) || (dataLen < xMinValue_)) { HILOG_WARN(HILOG_MODULE_ACE, "customMaxCount or customMinValue is set out of boundary"); } - uint16_t customMaxCount = xMaxValue_ + 1; // the max data count speciafied by user + uint16_t customMaxCount = xMaxValue_ + 1; // the max data count specified by user uint16_t actualMaxCount = dataLen - xMinValue_; // the actual max data count setted in data array len = (customMaxCount < actualMaxCount) ? customMaxCount : actualMaxCount; } @@ -346,8 +342,7 @@ bool ChartComponent::UpdateValuesToSerial(jerry_value_t dataSet, UIChartDataSeri } ReleaseJerryValue(hasDataProp, jData, VA_ARG_END_FLAG); // need to set after datas setted - isSetOk = isSetOk ? UpdatePoints(dataserial) : false; - return isSetOk; + return (isSetOk ? UpdatePoints(dataserial) : false); } bool ChartComponent::AppendValuesToSerial(jerry_value_t dataSet, UIChartDataSerial* dataserial, uint16_t dataLen) @@ -475,7 +470,7 @@ jerry_value_t ChartComponent::AppendDatas(const jerry_value_t func, const jerry_value_t *args, const jerry_length_t argsNum) { - uint8_t functionParamsNum = 1; // js append function just recieve 1 number params + uint8_t functionParamsNum = 1; // js append function just receive 1 number params if (argsNum != functionParamsNum) { HILOG_ERROR(HILOG_MODULE_ACE, "append function params error"); } else { @@ -519,7 +514,7 @@ void ChartComponent::UpdateData(jerry_value_t dataSets, jerry_value_t keyName, u bool isSetOk = false; for (uint8_t index = 0; index < serialsCount; index++) { // every data set jerry_value_t dataSet = jerry_get_property_by_index(dataSets, index); - // check data is set correctlly, if the data is not set correctly, need not to set other attribute left + // check data is set correctly, if the data is not set correctly, need not to set other attribute left jerry_value_t dataValue = jerry_get_property(dataSet, keyName); if ((!jerry_value_is_undefined(dataValue)) && jerry_value_is_array(dataValue)) { uint16_t dataLen = jerry_get_array_length(dataValue); @@ -566,8 +561,7 @@ bool ChartComponent::UpdataDataInOrder(jerry_value_t dataSet, UIChartDataSerial& UpdateFillColorToSerial(dataSet, dataserial); UpdateGradientToSerial(dataSet, &dataserial); UpdateStrokeSmoothToSerial(dataserial); - bool isSetOk = UpdateValuesToSerial(dataSet, &dataserial, dataLen); - return isSetOk; + return UpdateValuesToSerial(dataSet, &dataserial, dataLen); } void ChartComponent::AppendData(jerry_value_t dataSet, DataSerials* dataSerialNode) @@ -597,7 +591,7 @@ void ChartComponent::UpdateColorToSerial(jerry_value_t dataSet, UIChartDataSeria isColorSet = true; } } - uint32_t defaultColorVal = 0xFF6384; // pink + const uint32_t defaultColorVal = 0xFF6384; // pink uint32_t colorVal = defaultColorVal; if (isColorSet) { colorVal = GetColor(dataSet, const_cast(styleName), defaultColorVal); @@ -613,12 +607,7 @@ void ChartComponent::UpdateColorToSerial(jerry_value_t dataSet, UIChartDataSeria bool ChartComponent::SetOptionsAxis(jerry_value_t attrValue, bool isXAxis) { bool isSetOk = false; - jerry_value_t jAxisName; - if (isXAxis) { - jAxisName = jerry_create_string(reinterpret_cast(X_AXIS)); - } else { - jAxisName = jerry_create_string(reinterpret_cast(Y_AXIS)); - } + jerry_value_t jAxisName = jerry_create_string(reinterpret_cast(isXAxis ? X_AXIS : Y_AXIS)); jerry_value_t hasXAxisProp = jerry_has_property(attrValue, jAxisName); if (!jerry_get_boolean_value(hasXAxisProp)) { HILOG_ERROR(HILOG_MODULE_ACE, "xAxis and yAxis param must set"); @@ -641,12 +630,21 @@ bool ChartComponent::SetOptionsAxis(jerry_value_t attrValue, bool isXAxis) bool ChartComponent::SetOptionsAxisDataRange(jerry_value_t xAxisValue, bool isXAxis) { bool isSetOk = true; - uint8_t defaultMinValue = 0; - uint8_t defaultMaxValue = 100; + const uint8_t defaultMinValue = 0; + const uint8_t defaultMaxValue = 100; jerry_value_t jMinValue = jerryx_get_property_str(xAxisValue, MIN); jerry_value_t jMaxValue = jerryx_get_property_str(xAxisValue, MAX); - uint16_t minValue = (uint16_t)(jerry_get_number_value(jMinValue)); - uint16_t maxValue = (uint16_t)(jerry_get_number_value(jMaxValue)); + double tempMinVal = jerry_get_number_value(jMinValue); + double tempMaxVal = jerry_get_number_value(jMaxValue); + uint16_t minValue = defaultMinValue; + uint16_t maxValue = defaultMaxValue; + if ((tempMinVal >= 0) && (tempMinVal <= UINT16_MAX)) { + minValue = static_cast(tempMinVal); + } + if ((tempMaxVal >= 0) && (tempMaxVal <= UINT16_MAX)) { + maxValue = static_cast(tempMaxVal); + } + if (maxValue == 0) { if (!jerryx_has_property_str(xAxisValue, "max")) { HILOG_WARN(HILOG_MODULE_ACE, @@ -706,12 +704,15 @@ bool ChartComponent::SetOptionsAxisDataRange(uint16_t minValue, uint16_t maxValu void ChartComponent::SetOptionsAxisTick(jerry_value_t xAxisValue, bool isXAxis) { jerry_value_t jAxisTickValue = jerryx_get_property_str(xAxisValue, "axisTick"); - int16_t axisTickValue = (int16_t)(jerry_get_number_value(jAxisTickValue)); + double tempAxisTickVal = jerry_get_number_value(jAxisTickValue); + int16_t axisTickValue; const int8_t minTickValue = 1; const int8_t maxTickValue = 20; - if ((axisTickValue < minTickValue) || (axisTickValue > maxTickValue)) { + if ((tempAxisTickVal < minTickValue) || (tempAxisTickVal > maxTickValue)) { int16_t defaultValue = 10; // default value, means total number of ticks axisTickValue = defaultValue; + } else { + axisTickValue = static_cast(tempAxisTickVal); } jerry_release_value(jAxisTickValue); if (isXAxis) { @@ -725,12 +726,15 @@ bool ChartComponent::SetOptionsAxisDisplay(jerry_value_t xAxisValue, bool isXAxi { bool displayValue = false; // default value, means not show axis jerry_value_t jDisplayValue = jerryx_get_property_str(xAxisValue, DISPLAY); - displayValue = jerry_get_boolean_value(jDisplayValue); + if (!jerry_value_is_undefined(jDisplayValue)) { + displayValue = jerry_get_boolean_value(jDisplayValue); + } if (isXAxis) { xAxis_->SetVisible(displayValue); } else { yAxis_->SetVisible(displayValue); } + jerry_release_value(jDisplayValue); return true; } @@ -755,9 +759,7 @@ void ChartComponent::SetOptionsAxisColor(jerry_value_t xAxisValue, bool isXAxis) void ChartComponent::RecordOptionsSeries(jerry_value_t options) { - if (!jerryx_has_property_str(options, SERIES)) { - return; - } else { + if (jerryx_has_property_str(options, SERIES)) { jerry_value_t jSeriesVal = jerryx_get_property_str(options, SERIES); RecordOptionsSeriesLineStyle(jSeriesVal); RecordOptionsSeriesPoint(jSeriesVal, PointType::HEAD); @@ -773,20 +775,19 @@ void ChartComponent::RecordOptionsSeriesLineStyle(jerry_value_t jSeriesVal) char* styleName = const_cast(LINE_STYLE); if (!jerryx_has_property_str(jSeriesVal, styleName)) { return; - } else { - jerry_value_t jLineStyleVal = jerryx_get_property_str(jSeriesVal, styleName); - styleName = const_cast(WIDTH); - uint16_t widthVal = GetSizeVal(jLineStyleVal, styleName, 1); - chartView_->SetStyle(STYLE_LINE_WIDTH, widthVal); // chart width set can affect all the series - seriesOptions_->width = widthVal; - styleName = const_cast(SMOOTH); - if (jerryx_has_property_str(jLineStyleVal, styleName)) { - jerry_value_t jSmoothVal = jerryx_get_property_str(jLineStyleVal, styleName); - seriesOptions_->smooth = jerry_get_boolean_value(jSmoothVal); - jerry_release_value(jSmoothVal); - } - jerry_release_value(jLineStyleVal); } + jerry_value_t jLineStyleVal = jerryx_get_property_str(jSeriesVal, styleName); + styleName = const_cast(WIDTH); + uint16_t widthVal = GetSizeVal(jLineStyleVal, styleName, 1); + chartView_->SetStyle(STYLE_LINE_WIDTH, widthVal); // chart width set can affect all the series + seriesOptions_->width = widthVal; + styleName = const_cast(SMOOTH); + if (jerryx_has_property_str(jLineStyleVal, styleName)) { + jerry_value_t jSmoothVal = jerryx_get_property_str(jLineStyleVal, styleName); + seriesOptions_->smooth = jerry_get_boolean_value(jSmoothVal); + jerry_release_value(jSmoothVal); + } + jerry_release_value(jLineStyleVal); } void ChartComponent::RecordOptionsSeriesPoint(jerry_value_t jSeriesVal, PointType type) @@ -816,14 +817,14 @@ void ChartComponent::RecordOptionsSeriesPoint(jerry_value_t jSeriesVal, PointTyp styleName = const_cast(SIZE); uint8_t defaultValue = 4; uint8_t size = GetSizeVal(jPointStyleVal, styleName, defaultValue); - uint32_t defalutColorVal = 0xff0000; + uint32_t defaultColorVal = 0xff0000; styleName = const_cast(STROKE_COLOR); - uint32_t strokeColor = GetColor(jPointStyleVal, styleName, defalutColorVal); + uint32_t strokeColor = GetColor(jPointStyleVal, styleName, defaultColorVal); defaultValue = 1; styleName = const_cast(STROKE_WIDTH); uint8_t strokeWidth = GetSizeVal(jPointStyleVal, styleName, defaultValue); styleName = const_cast(FILL_COLOR); - uint32_t fillColor = GetColor(jPointStyleVal, styleName, defalutColorVal); + uint32_t fillColor = GetColor(jPointStyleVal, styleName, defaultColorVal); bool isDisplay = GetDisplayStatus(jPointStyleVal); jerry_release_value(jPointStyleVal); @@ -931,17 +932,16 @@ void ChartComponent::ClearDataSerialsNode(DataSerials* serial) { if (serial == nullptr) { return; - } else { - if (serial->next) { - ClearDataSerialsNode(serial->next); - } - if (serial->dataSerial) { - delete (serial->dataSerial); - serial->dataSerial = nullptr; - } - delete (serial); - serial = nullptr; } + if (serial->next) { + ClearDataSerialsNode(serial->next); + } + if (serial->dataSerial) { + delete (serial->dataSerial); + serial->dataSerial = nullptr; + } + delete (serial); + serial = nullptr; } void ChartComponent::ClearAllDataSerials() @@ -984,10 +984,9 @@ bool ChartComponent::GetDisplayStatus(jerry_value_t obj) { if (!jerryx_has_property_str(obj, DISPLAY)) { return true; - } else { - jerry_value_t jDisplayValue = jerryx_get_property_str(obj, DISPLAY); - return jerry_get_boolean_value(jDisplayValue); } + jerry_value_t jDisplayValue = jerryx_get_property_str(obj, DISPLAY); + return jerry_get_boolean_value(jDisplayValue); } bool ChartComponent::Init() diff --git a/src/core/components/chart_component.h b/frameworks/src/core/components/chart_component.h similarity index 95% rename from src/core/components/chart_component.h rename to frameworks/src/core/components/chart_component.h index 1713656..5f5a9fc 100755 --- a/src/core/components/chart_component.h +++ b/frameworks/src/core/components/chart_component.h @@ -30,7 +30,7 @@ struct DataSerials : public MemoryHeap { DataSerials() : dataSerial(nullptr), next(nullptr) {} }; -enum class PointType { HEAD, TOP, BOTTOM }; +enum class PointType : uint8_t { HEAD, TOP, BOTTOM }; struct PointOptions : public MemoryHeap { uint8_t size; @@ -65,7 +65,7 @@ public: ~ChartComponent() {} virtual bool CreateNativeViews() override; virtual bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; - virtual void PostUpdate(uint16_t attrKeyId, bool updateResult) override; + virtual void PostUpdate(uint16_t attrKeyId) override; virtual void PostRender() override; virtual void ReleaseNativeViews() override; @@ -96,6 +96,8 @@ private: void SetOptionsAxisTick(jerry_value_t options, bool isXAxis); bool SetOptionsAxisDisplay(jerry_value_t options, bool isXAxis); void SetOptionsAxisColor(jerry_value_t options, bool isXAxis); + UIChartDataSerial::PointStyle *UpdatePointStyle(UIChartDataSerial::PointStyle *pointStyle, uint32_t fillColor, + uint32_t strokeColor, uint32_t radius, uint32_t strokeWidth); /** * @brief record series options in seriesOptions_ * diff --git a/frameworks/src/core/components/circle_progress_component.cpp b/frameworks/src/core/components/circle_progress_component.cpp new file mode 100644 index 0000000..77a27c1 --- /dev/null +++ b/frameworks/src/core/components/circle_progress_component.cpp @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "circle_progress_component.h" + +namespace OHOS { +namespace ACELite { +CircleProgressComponent::CircleProgressComponent(jerry_value_t options, + jerry_value_t children, AppStyleManager *styleManager) + : Component(options, children, styleManager), + centerX_(INT16_MAX), + centerY_(INT16_MAX), + radius_(INT16_MAX), + startAngle_(DEFAULT_START_ANGLE), + totalAngle_(DEFAULT_TOTAL_ANGLE) +{ +} + +bool CircleProgressComponent::CreateNativeViews() +{ + // set default value + progressView_.SetBackgroundStyle(StyleDefault::GetBrightStyle()); + const int8_t defaultLineWidth = 32; + progressView_.SetBackgroundStyle(STYLE_LINE_WIDTH, defaultLineWidth); // Compatible with rich devices + progressView_.SetBackgroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + const char * const defaultBackgroundColor = "rgba(255,255,255,0.15)"; + if (ParseColor(defaultBackgroundColor, color, alpha)) { + progressView_.SetBackgroundStyle(STYLE_LINE_COLOR, GetRGBColor(color).full); + } + progressView_.SetForegroundStyle(StyleDefault::GetBrightColorStyle()); + progressView_.SetForegroundStyle(STYLE_BACKGROUND_OPA, 0); + progressView_.SetForegroundStyle(STYLE_BORDER_OPA, 0); + progressView_.SetForegroundStyle(STYLE_LINE_WIDTH, defaultLineWidth); + progressView_.SetForegroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); + const char * const defaultColor = "#5EA1FF"; + if (ParseColor(defaultColor, color, alpha)) { + progressView_.SetForegroundStyle(STYLE_LINE_COLOR, GetRGBColor(color).full); + progressView_.SetForegroundStyle(STYLE_LINE_OPA, OPA_OPAQUE); + } + return true; +} + +bool CircleProgressComponent::ApplyPrivateStyle(const AppStyleItem *style) +{ + return SetArcProgressStyle(style); +} + +UIView *CircleProgressComponent::GetComponentRootView() const +{ + return const_cast(&progressView_); +} + +bool CircleProgressComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) +{ + switch (attrKeyId) { + case K_PERCENT: { + // set the specific attribute of this progress view + int16_t rangeMax = 100; + int16_t rangeMin = 0; + progressView_.SetRange(rangeMax, rangeMin); + progressView_.SetValue(IntegerOf(attrValue)); + return true; + } + default: { + return false; + } + } +} + +void CircleProgressComponent::SetAngles() +{ + if (centerX_ == INT16_MAX) { + centerX_ = static_cast(progressView_.GetWidth()) >> 1; + } + if (centerY_ == INT16_MAX) { + centerY_ = static_cast(progressView_.GetHeight()) >> 1; + } + if (radius_ == INT16_MAX) { + if (progressView_.GetWidth() <= progressView_.GetHeight()) { + radius_ = static_cast(progressView_.GetWidth()) >> 1; + } else { + radius_ = static_cast(progressView_.GetHeight()) >> 1; + } + } + + progressView_.SetCenterPosition(centerX_, centerY_); + progressView_.SetRadius(radius_); + progressView_.SetStartAngle(startAngle_); + progressView_.SetEndAngle(startAngle_ + totalAngle_); +} + +void CircleProgressComponent::SetStartAngle(const AppStyleItem *style) +{ + const int16_t minStartAngle = 0; + const int16_t maxStartAngle = 360; + startAngle_ = GetStyleDegValue(style); // Compatible with rich devices, value should between -180 and 0 + if (startAngle_ > maxStartAngle) { + startAngle_ = maxStartAngle; + } else if (startAngle_ < minStartAngle) { + startAngle_ = minStartAngle; + } +} + +void CircleProgressComponent::SetTotalAngle(const AppStyleItem *style) +{ + const int16_t minStartAngle = -360; + const int16_t maxStartAngle = 360; + totalAngle_ = GetStyleDegValue(style); // Compatible with rich devices, value should between 0 and 180 + if (totalAngle_ < minStartAngle) { + totalAngle_ = minStartAngle; + } else if (totalAngle_ > maxStartAngle) { + totalAngle_ = maxStartAngle; + } +} + +bool CircleProgressComponent::SetArcColor(const AppStyleItem *style) +{ + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + if (!GetStyleColorValue(style, color, alpha)) { + return false; + } + progressView_.SetForegroundStyle(STYLE_LINE_COLOR, GetRGBColor(color).full); + progressView_.SetForegroundStyle(STYLE_LINE_OPA, alpha); + return true; +} + +bool CircleProgressComponent::SetArcBackgroundColor(const AppStyleItem *style) +{ + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + if (!GetStyleColorValue(style, color, alpha)) { + return false; + } + progressView_.SetBackgroundStyle(STYLE_LINE_COLOR, GetRGBColor(color).full); + progressView_.SetBackgroundStyle(STYLE_LINE_OPA, alpha); + return true; +} + +bool CircleProgressComponent::SetArcProgressStyle(const AppStyleItem *style) +{ + uint16_t stylePropNameId = GetStylePropNameId(style); + switch (stylePropNameId) { + case K_CENTER_X: { + centerX_ = GetStylePixelValue(style); + return true; + } + case K_CENTER_Y: { + centerY_ = GetStylePixelValue(style); + return true; + } + case K_RADIUS: { + radius_ = GetStylePixelValue(style); + return true; + } + case K_START_ANGLE: { + SetStartAngle(style); + return true; + } + case K_TOTAL_ANGLE: { + SetTotalAngle(style); + return true; + } + case K_COLOR: { + return SetArcColor(style); + } + case K_STROKE_WIDTH: { + progressView_.SetBackgroundStyle(STYLE_LINE_WIDTH, GetStylePixelValue(style)); + progressView_.SetForegroundStyle(STYLE_LINE_WIDTH, GetStylePixelValue(style)); + return true; + } + case K_BACKGROUND_COLOR: { + return SetArcBackgroundColor(style); + } + default: { + return false; + } + } +} + +void CircleProgressComponent::OnViewAttached() +{ + HandleExtraUpdate(); +} + +void CircleProgressComponent::PostUpdate(uint16_t attrKeyId) +{ + UNUSED(attrKeyId); + HandleExtraUpdate(); +} + +void CircleProgressComponent::HandleExtraUpdate() +{ + SetAngles(); +} +} // namespace ACELite +} // namespace OHOS diff --git a/src/core/components/progress_component.h b/frameworks/src/core/components/circle_progress_component.h old mode 100755 new mode 100644 similarity index 56% rename from src/core/components/progress_component.h rename to frameworks/src/core/components/circle_progress_component.h index 4609e0e..6f660f6 --- a/src/core/components/progress_component.h +++ b/frameworks/src/core/components/circle_progress_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2021 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 @@ -13,48 +13,44 @@ * limitations under the License. */ -#ifndef OHOS_ACELITE_PROGRESS_COMPONENT_H -#define OHOS_ACELITE_PROGRESS_COMPONENT_H +#ifndef OHOS_ACELITE_CIRCLE_PROGRESS_COMPONENT_H +#define OHOS_ACELITE_CIRCLE_PROGRESS_COMPONENT_H + #include "component.h" #include "non_copyable.h" -#include "ui_abstract_progress.h" +#include "ui_circle_progress.h" namespace OHOS { namespace ACELite { -enum ProgressType { ARC = 0x01, HORIZONTAL = 0x02 }; - constexpr int16_t DEFAULT_START_ANGLE = 240; constexpr int16_t DEFAULT_TOTAL_ANGLE = 240; constexpr int16_t DEFAULT_STROKE_WIDTH = 32; -class ProgressComponent final : public Component { +class CircleProgressComponent final : public Component { public: - ACE_DISALLOW_COPY_AND_MOVE(ProgressComponent); - ProgressComponent() = delete; - ProgressComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager); - ~ProgressComponent() override {} + ACE_DISALLOW_COPY_AND_MOVE(CircleProgressComponent); + CircleProgressComponent() = delete; + CircleProgressComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager); + ~CircleProgressComponent() override {} protected: - bool CreateNativeViews() override; - void ReleaseNativeViews() override; UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; bool ApplyPrivateStyle(const AppStyleItem* style) override; - void PostRender() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; + void PostUpdate(uint16_t attrKeyId) override; + void OnViewAttached() override; + void HandleExtraUpdate(); + bool CreateNativeViews() override; private: - ProgressType GetType() const; - char* GetStringAttrByName(const char * const name, uint16_t* len) const; void SetAngles(); - void HorizonProgressPostDeal() const; bool SetArcProgressStyle(const AppStyleItem* style); - bool SetHorizonProgressStyle(const AppStyleItem* style); - jerry_value_t options_; - UIAbstractProgress* progressView_; - ProgressType type_; - int16_t hStrokeWidth_; + void SetStartAngle(const AppStyleItem *style); + void SetTotalAngle(const AppStyleItem *style); + bool SetArcColor(const AppStyleItem *style); + bool SetArcBackgroundColor(const AppStyleItem *style); + UICircleProgress progressView_; int16_t centerX_; int16_t centerY_; int16_t radius_; @@ -64,4 +60,4 @@ private: } // namespace ACELite } // namespace OHOS -#endif // OHOS_ACELITE_PROGRESS_COMPONENT_H +#endif // OHOS_ACELITE_CIRCLE_PROGRESS_COMPONENT_H diff --git a/src/core/components/clock_hand_component.cpp b/frameworks/src/core/components/clock_hand_component.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/core/components/clock_hand_component.cpp rename to frameworks/src/core/components/clock_hand_component.cpp index c2cc253..c0af38f --- a/src/core/components/clock_hand_component.cpp +++ b/frameworks/src/core/components/clock_hand_component.cpp @@ -100,6 +100,7 @@ void ClockHandComponent::PostRender() jerry_value_t nativeObj = GetNativeElement(); if (jerry_value_is_undefined(nativeObj)) { + ReleaseJerryValue(pivotXValue, pivotYValue, typeIdValue, VA_ARG_END_FLAG); return; } SetNamedProperty(nativeObj, stylePivotX, pivotXValue); diff --git a/src/core/components/clock_hand_component.h b/frameworks/src/core/components/clock_hand_component.h old mode 100755 new mode 100644 similarity index 98% rename from src/core/components/clock_hand_component.h rename to frameworks/src/core/components/clock_hand_component.h index 2af26c3..ef784a2 --- a/src/core/components/clock_hand_component.h +++ b/frameworks/src/core/components/clock_hand_component.h @@ -46,7 +46,7 @@ protected: * * @brief Values that represent different clock-hand layout types */ - enum class LayoutType { + enum class LayoutType : uint8_t { // UIImageView layout IMAGE, // Rectangle layout diff --git a/src/core/components/component.cpp b/frameworks/src/core/components/component.cpp similarity index 66% rename from src/core/components/component.cpp rename to frameworks/src/core/components/component.cpp index c81b189..e0df537 100755 --- a/src/core/components/component.cpp +++ b/frameworks/src/core/components/component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -25,13 +25,12 @@ #include "js_router.h" #include "key_parser.h" #include "keys.h" +#include "lazy_load_manager.h" +#include "securec.h" #include "stylemgr/app_style.h" #include "stylemgr/app_style_manager.h" #include "time_util.h" #include "wrapper/js.h" -#if ENABLED(SECURE_C_FUNCTION) -#include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) namespace OHOS { namespace ACELite { @@ -40,7 +39,7 @@ static bool g_isAnimatorStarted = false; void Component::HandlerAnimations() { Component::AnimationsNode *point = g_animationListHead; - while (point != nullptr) { + while (point != nullptr && point->transitionImpl != nullptr) { point->transitionImpl->Start(); point = point->next; } @@ -54,6 +53,7 @@ void Component::ReleaseAnimations() Component::AnimationsNode *temp = point->next; if (point->transitionImpl) { delete (point->transitionImpl); + point->transitionImpl = nullptr; } delete (point); point = temp; @@ -63,7 +63,10 @@ void Component::ReleaseAnimations() } Component::Component(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) - : styleManager_(styleManager), + : childHead_(nullptr), + nextSibling_(nullptr), + parent_(nullptr), + styleManager_(styleManager), options_(options), children_(UNDEFINED), onClickListener_(nullptr), @@ -84,21 +87,20 @@ Component::Component(jerry_value_t options, jerry_value_t children, AppStyleMana trans_(nullptr), descriptors_(jerry_acquire_value(children)), watchersHead_(nullptr), - height_(-1), - width_(-1) + height_(-1, DimensionType::TYPE_UNKNOWN), + width_(-1, DimensionType::TYPE_UNKNOWN), + top_(-1, DimensionType::TYPE_UNKNOWN), + left_(-1, DimensionType::TYPE_UNKNOWN), + marginTop_(-1, DimensionType::TYPE_UNKNOWN), + marginLeft_(-1, DimensionType::TYPE_UNKNOWN), + marginRight_(-1, DimensionType::TYPE_UNKNOWN), + marginBottom_(-1, DimensionType::TYPE_UNKNOWN) { // create native element object before combining styles, as style data binding need it nativeElement_ = jerry_create_object(); jerry_value_t global = jerry_get_global_object(); viewModel_ = jerryx_get_property_str(global, ATTR_ROOT); jerry_release_value(global); - if (styleManager_) { - // combine app style for this component by app style list. - // style apply priority: inline(static style) > #id > .class - START_TRACING_WITH_COMPONENT_NAME(RENDER_COMBINE_STYLE, componentName_); - styleManager_->CombineStylesForCurrentTag(options_, *this); - STOP_TRACING(); - } } /** @@ -120,15 +122,16 @@ bool Component::Render() } PreRender(); - bool renderResult = false; // step1: create native view/views START_TRACING_WITH_COMPONENT_NAME(RENDER_CREATE_COMPONENT, componentName_); - renderResult = CreateNativeViews(); + bool renderResult = CreateNativeViews(); if (!renderResult) { return false; } STOP_TRACING(); + SetViewExtraMsg(); + // step2: binding js object with this component jerry_set_object_native_pointer(nativeElement_, this, nullptr); @@ -136,7 +139,7 @@ bool Component::Render() ParseOptions(); // step4: apply styles START_TRACING_WITH_COMPONENT_NAME(RENDER_APPLY_STYLE, componentName_); - ApplyStyles(); + ApplyStyles(options_, *this); STOP_TRACING(); // step5:process this component's children @@ -145,23 +148,55 @@ bool Component::Render() STOP_TRACING(); if (!renderResult) { return false; - } else { - RecordAnimation(); } + RecordAnimation(); PostRender(); rendered_ = true; return renderResult; } +void Component::SetViewExtraMsg() +{ + UIView *view = GetComponentRootView(); + if (view == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "failed to set the extra message for view."); + return; + } + UIView::ViewExtraMsg *extraMsg = new UIView::ViewExtraMsg(); + if (extraMsg == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Failed to mapping native view with DOM element."); + return; + } + extraMsg->elementPtr = (void *)&nativeElement_; + view->SetExtraMsg(extraMsg); +} + +void Component::ReleaseViewExtraMsg() +{ + UIView *view = GetComponentRootView(); + if (view == nullptr) { + return; + } + UIView::ViewExtraMsg *extraMsg = view->GetExtraMsg(); + ACE_DELETE(extraMsg); + view->SetExtraMsg(nullptr); +} + void Component::Release() { // detach self from fatal handler monitoring FatalHandler::GetInstance().DetachComponentNode(this); + if (parent_ != nullptr) { + parent_->RemoveChild(this); + } + // stop view animation if (curTransitionImpl_) { curTransitionImpl_->Stop(); } + ReleaseViewExtraMsg(); + jerry_delete_object_native_pointer(nativeElement_, nullptr); // release all native views ReleaseNativeViews(); // release transition param @@ -200,11 +235,17 @@ bool Component::UpdateView(uint16_t attrKeyId, jerry_value_t attrValue) } } - RefreshRect(); + if (parent_ != nullptr) { + ConstrainedParameter parentParam; + parent_->GetConstrainedParam(parentParam); + AlignDimensions(parentParam); + } + AdaptBoxSizing(); // force parent to relayout the children in case component's area is changed InvalidateIfNeeded(attrKeyId, false); - - PostUpdate(attrKeyId, updateResult); + if (updateResult) { + PostUpdate(attrKeyId); + } StartAnimation(); STOP_TRACING(); @@ -240,6 +281,7 @@ bool Component::SetCommonAttribute(UIView &view, const uint16_t attrKeyId, const ACE_FREE(viewId_); viewId_ = MallocStringOf(attrValue); if (viewId_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "failed to set `id` attribute."); return false; } view.SetViewId(viewId_); @@ -253,7 +295,8 @@ bool Component::SetCommonAttribute(UIView &view, const uint16_t attrKeyId, const uint16_t length = 0; char *refName = MallocStringOf(attrValue, &length); if (refName == nullptr) { - break; + HILOG_ERROR(HILOG_MODULE_ACE, "failed to set `ref` attribute."); + return false; } if (length != 0) { jerry_value_t refs = jerryx_get_property_str(viewModel_, ATTR_REFS); @@ -278,66 +321,174 @@ bool Component::SetCommonAttribute(UIView &view, const uint16_t attrKeyId, const return true; } -void Component::ApplyStyles() +void Component::ApplyStyles(const jerry_value_t options, Component &curr) const { - const AppStyle *combinedStyle = GetStyleManager()->GetCombinedStyle(); - if (combinedStyle != nullptr) { - const AppStyleItem *style = combinedStyle->GetFirst(); - while (style != nullptr) { - START_TRACING_WITH_EXTRA_INFO(APPLY_STYLE_ITEM, componentName_, GetStylePropNameId(style)); - // call children's apply method - ApplyStyle(style); - STOP_TRACING(); - style = style->GetNext(); - } + if (jerry_value_is_undefined(options)) { + return; } - RefreshRect(); + styleManager_->ApplyComponentStyles(options, curr); } -bool Component::RefreshRect() const +void Component::GetDimensionFromStyle(Dimension &dimension, const AppStyleItem &styleItem) const +{ + if (styleItem.GetValueType() == STYLE_PROP_VALUE_TYPE_PERCENT) { + // percent format + dimension.value.percentage = styleItem.GetPercentValue(); + dimension.type = DimensionType::TYPE_PERCENT; + return; + } + // number or string format + // use INT32_MIN as the impossible default value + int32_t pixelValue = GetStylePixelValue(&styleItem, INT32_MIN); + if (pixelValue == INT32_MIN) { + // get pixel failed, reset to unknown type + dimension.type = DimensionType::TYPE_UNKNOWN; + return; + } + dimension.value.pixel = (int16_t)(pixelValue); + dimension.type = DimensionType::TYPE_PIXEL; +} + +void Component::CalculateDimensionPixel(Dimension &dimension, int16_t base) const +{ + const uint8_t hundred = 100; + if (dimension.type == DimensionType::TYPE_PERCENT) { + dimension.value.pixel = (int16_t)((dimension.value.percentage * base) / hundred); + dimension.type = DimensionType::TYPE_PIXEL; + } +} + +const Dimension &Component::GetDimension(uint16_t keyNameId) const +{ + const static Dimension unknownDimension = {0, DimensionType::TYPE_UNKNOWN}; + switch (keyNameId) { + case K_WIDTH: + return width_; + case K_HEIGHT: + return height_; + case K_TOP: + return top_; + case K_LEFT: + return left_; + case K_MARGIN_TOP: + return marginTop_; + case K_MARGIN_BOTTOM: + return marginBottom_; + case K_MARGIN_RIGHT: + return marginRight_; + case K_MARGIN_LEFT: + return marginLeft_; + default: { + return unknownDimension; + } + } +} + +void Component::AlignDimensions(const ConstrainedParameter ¶m) +{ + // width + CalculateDimensionPixel(width_, param.maxWidth); + CalculateDimensionPixel(height_, param.maxHeight); + // top & left + CalculateDimensionPixel(top_, param.maxHeight); + CalculateDimensionPixel(left_, param.maxWidth); + // margin + CalculateDimensionPixel(marginTop_, param.maxHeight); + CalculateDimensionPixel(marginLeft_, param.maxHeight); + CalculateDimensionPixel(marginRight_, param.maxHeight); + CalculateDimensionPixel(marginBottom_, param.maxHeight); + // notify + OnDimensionsAligned(); +} + +void Component::GetConstrainedParam(ConstrainedParameter ¶m) const +{ + param.maxWidth = width_.value.pixel; + param.maxHeight = height_.value.pixel; +} + +void Component::ApplyAlignedMargin(UIView &uiView) const +{ + if (marginTop_.type == DimensionType::TYPE_PIXEL) { + uiView.SetStyle(STYLE_MARGIN_TOP, marginTop_.value.pixel); + } + if (marginBottom_.type == DimensionType::TYPE_PIXEL) { + uiView.SetStyle(STYLE_MARGIN_BOTTOM, marginBottom_.value.pixel); + } + if (marginLeft_.type == DimensionType::TYPE_PIXEL) { + uiView.SetStyle(STYLE_MARGIN_LEFT, marginLeft_.value.pixel); + } + if (marginRight_.type == DimensionType::TYPE_PIXEL) { + uiView.SetStyle(STYLE_MARGIN_RIGHT, marginRight_.value.pixel); + } +} + +void Component::ApplyAlignedPosition(UIView &uiView) const +{ + if (top_.type == DimensionType::TYPE_PIXEL) { + uiView.SetY(top_.value.pixel); + } + if (left_.type == DimensionType::TYPE_PIXEL) { + uiView.SetX(left_.value.pixel); + } +} + +void Component::AdapteBoxRectArea(UIView &uiView) const +{ + // set view height and width + uint8_t borderNum = 2; + int16_t height = (height_.type == DimensionType::TYPE_PIXEL) ? height_.value.pixel : -1; + int16_t width = (width_.type == DimensionType::TYPE_PIXEL) ? width_.value.pixel : -1; + if (height >= 0) { + // as uiView->GetStyle(STYLE_PADDING_TOP) and uiView->GetStyle(STYLE_PADDING_BOTTOM) is defined + // as uint16_t, so do not need to judge whether less than 0 + if (uiView.GetStyle(STYLE_BORDER_WIDTH) < 0) { + HILOG_WARN(HILOG_MODULE_ACE, "border and padding size should not less than 0"); + } + int16_t contentHeight = height - (uiView.GetStyle(STYLE_BORDER_WIDTH) * borderNum) - + uiView.GetStyle(STYLE_PADDING_TOP) - uiView.GetStyle(STYLE_PADDING_BOTTOM); + if (contentHeight <= 0) { + HILOG_WARN(HILOG_MODULE_ACE, + "component height can not include padding and border width, padding and border will be set 0"); + uiView.SetStyle(STYLE_BORDER_WIDTH, 0); + uiView.SetStyle(STYLE_PADDING_TOP, 0); + uiView.SetStyle(STYLE_PADDING_BOTTOM, 0); + uiView.SetHeight(height); + } else { + uiView.SetHeight(contentHeight); + } + } + if (width >= 0) { + if (uiView.GetStyle(STYLE_BORDER_WIDTH) < 0) { + HILOG_WARN(HILOG_MODULE_ACE, "border and padding size should not less than 0"); + } + int16_t contentWidth = width - (uiView.GetStyle(STYLE_BORDER_WIDTH) * borderNum) - + uiView.GetStyle(STYLE_PADDING_LEFT) - uiView.GetStyle(STYLE_PADDING_RIGHT); + if (contentWidth <= 0) { + HILOG_WARN(HILOG_MODULE_ACE, + "component width can not include padding and border width, padding and border will be set 0"); + uiView.SetStyle(STYLE_BORDER_WIDTH, 0); + uiView.SetStyle(STYLE_PADDING_LEFT, 0); + uiView.SetStyle(STYLE_PADDING_RIGHT, 0); + uiView.SetWidth(width); + } else { + uiView.SetWidth(contentWidth); + } + } +} + +bool Component::AdaptBoxSizing() const { UIView *uiView = GetComponentRootView(); if (uiView == nullptr) { return false; } - // set view height and width - uint8_t borderNum = 2; - if (height_ >= 0) { - // as uiView->GetStyle(STYLE_PADDING_TOP) and uiView->GetStyle(STYLE_PADDING_BOTTOM) is defined - // as uint16_t, so do not need to judge whether less than 0 - if (uiView->GetStyle(STYLE_BORDER_WIDTH) < 0) { - HILOG_WARN(HILOG_MODULE_ACE, "border and padding size should not less than 0"); - } - int16_t contentHeight = height_ - (uiView->GetStyle(STYLE_BORDER_WIDTH) * borderNum) - - uiView->GetStyle(STYLE_PADDING_TOP) - uiView->GetStyle(STYLE_PADDING_BOTTOM); - if (contentHeight <= 0) { - HILOG_WARN(HILOG_MODULE_ACE, - "component height can not include padding and border width, padding and border will be set 0"); - uiView->SetStyle(STYLE_BORDER_WIDTH, 0); - uiView->SetStyle(STYLE_PADDING_TOP, 0); - uiView->SetStyle(STYLE_PADDING_BOTTOM, 0); - uiView->SetHeight(height_); - } else { - uiView->SetHeight(contentHeight); - } - } - if (width_ >= 0) { - if (uiView->GetStyle(STYLE_BORDER_WIDTH) < 0) { - HILOG_WARN(HILOG_MODULE_ACE, "border and padding size should not less than 0"); - } - int16_t contentWidth = width_ - (uiView->GetStyle(STYLE_BORDER_WIDTH) * borderNum) - - uiView->GetStyle(STYLE_PADDING_LEFT) - uiView->GetStyle(STYLE_PADDING_RIGHT); - if (contentWidth <= 0) { - HILOG_WARN(HILOG_MODULE_ACE, - "component width can not include padding and border width, padding and border will be set 0"); - uiView->SetStyle(STYLE_BORDER_WIDTH, 0); - uiView->SetStyle(STYLE_PADDING_LEFT, 0); - uiView->SetStyle(STYLE_PADDING_RIGHT, 0); - uiView->SetWidth(width_); - } else { - uiView->SetWidth(contentWidth); - } - } + // apply aligned top and left + ApplyAlignedPosition(*uiView); + // apply aligned magin + ApplyAlignedMargin(*uiView); + // adjust the box sizing + AdapteBoxRectArea(*uiView); return true; } @@ -354,8 +505,7 @@ bool Component::ApplyStyle(const AppStyleItem *style) // one private style get matched, no need to try private style ones return true; } - applyResult = ApplyCommonStyle(*uiView, style); - return applyResult; + return ApplyCommonStyle(*uiView, style); } /* @@ -393,11 +543,11 @@ bool Component::ApplyCommonStyle(UIView &view, const AppStyleItem *style) switch (styleNameId) { case K_HEIGHT: { - SetHeight(style); + GetDimensionFromStyle(height_, *style); break; } case K_WIDTH: { - SetWidth(style); + GetDimensionFromStyle(width_, *style); break; } case K_DISPLAY: { @@ -405,23 +555,26 @@ bool Component::ApplyCommonStyle(UIView &view, const AppStyleItem *style) break; } case K_MARGIN: { - SetMargin(view, *style); + GetDimensionFromStyle(marginBottom_, *style); + GetDimensionFromStyle(marginLeft_, *style); + GetDimensionFromStyle(marginRight_, *style); + GetDimensionFromStyle(marginTop_, *style); break; } case K_MARGIN_BOTTOM: { - SetBottomMargin(view, *style); + GetDimensionFromStyle(marginBottom_, *style); break; } case K_MARGIN_LEFT: { - SetLeftMargin(view, *style); + GetDimensionFromStyle(marginLeft_, *style); break; } case K_MARGIN_RIGHT: { - SetRightMargin(view, *style); + GetDimensionFromStyle(marginRight_, *style); break; } case K_MARGIN_TOP: { - SetTopMargin(view, *style); + GetDimensionFromStyle(marginTop_, *style); break; } case K_PADDING: @@ -465,11 +618,11 @@ bool Component::ApplyCommonStyle(UIView &view, const AppStyleItem *style) break; } case K_LEFT: { - SetLeft(view, style); + GetDimensionFromStyle(left_, *style); break; } case K_TOP: { - SetTop(view, style); + GetDimensionFromStyle(top_, *style); break; } case K_ANIMATION_DURATION: { @@ -496,6 +649,10 @@ bool Component::ApplyCommonStyle(UIView &view, const AppStyleItem *style) SetAnimationKeyFrames(view, style); break; } + case K_OPACITY: { + SetOpacity(view, *style); + break; + } default: { return false; } @@ -524,29 +681,18 @@ void Component::ParseOptions() return; } - jerry_value_t attrsPropValue = jerryx_get_property_str(options_, ATTR_ATTRS); - const char * const attrEvent = "on"; - jerry_value_t eventPropValue = jerryx_get_property_str(options_, attrEvent); - - if (!jerry_value_is_undefined(attrsPropValue)) { - START_TRACING(RENDER_PARSE_ATTR); - ParseAttrs(attrsPropValue); - STOP_TRACING(); - } - - if (!jerry_value_is_undefined(eventPropValue)) { - START_TRACING(RENDER_PARSE_EVENT); - ParseEvent(eventPropValue); - STOP_TRACING(); - } - ReleaseJerryValue(eventPropValue, attrsPropValue, VA_ARG_END_FLAG); + START_TRACING(RENDER_PARSE_ATTR); + ParseAttrs(); + STOP_TRACING(); + START_TRACING(RENDER_PARSE_EVENT); + ParseEvents(); + STOP_TRACING(); } void Component::SetAnimationKeyFrames(const UIView &view, const AppStyleItem *styleItem) { if (trans_ == nullptr) { trans_ = new TransitionParams(); - if (trans_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "create TransitionParams object error"); return; @@ -594,7 +740,7 @@ void Component::SetAnimationKeyFrames(const AppStyleItem *item) return; } size_t valLength = strlen(itemValue); - if ((valLength <= 0) || (valLength >= UINT8_MAX)) { + if ((valLength == 0) || (valLength >= UINT8_MAX)) { item = item->GetNext(); continue; } @@ -784,7 +930,7 @@ void Component::RecordAnimation() AddAnimationToList(curTransitionImpl_); isAnimationKeyFramesSet_ = false; // special for "if" situation, if g_isAnimatorStarted is started means the page has started all the - // animators, and the current component is created by "if" situation, so the animator can start immediattly + // animators, and the current component is created by "if" situation, so the animator can start immediately if (g_isAnimatorStarted) { curTransitionImpl_->Start(); } @@ -851,8 +997,7 @@ int32_t Component::GetAnimatorValue(char *animatorValue, const int8_t index, boo return 0; } - long convertedValue = isOpacity ? (long)((strtod(value, nullptr) * ALPHA_MAX)) : - strtol(value, nullptr, DEC); + long convertedValue = isOpacity ? (long)((strtod(value, nullptr) * ALPHA_MAX)) : strtol(value, nullptr, DEC); if (TransitionImpl::IsEndWith(value, "rad")) { uint8_t degConversionRate = 57; convertedValue = convertedValue * degConversionRate; @@ -860,12 +1005,11 @@ int32_t Component::GetAnimatorValue(char *animatorValue, const int8_t index, boo return convertedValue; } -/** - * check if the pass-in attrValue is an Expression, if it is, calculate it and bind watcher instance. - * if it's not, just return the passed-in attrValue itself. - */ -jerry_value_t Component::ParseExpression(jerry_value_t attrKey, jerry_value_t attrValue) +jerry_value_t Component::AddWatcherItem(const jerry_value_t attrKey, const jerry_value_t attrValue, bool isLazyLoading) { +#ifdef FEATURE_LAZY_LOADING_MODULE + isLazyLoading = true; +#endif jerry_value_t options = jerry_create_object(); JerrySetNamedProperty(options, ARG_WATCH_EL, nativeElement_); JerrySetNamedProperty(options, ARG_WATCH_ATTR, attrKey); @@ -875,17 +1019,25 @@ jerry_value_t Component::ParseExpression(jerry_value_t attrKey, jerry_value_t at HILOG_ERROR(HILOG_MODULE_ACE, "Failed to create Watcher instance."); } else { InsertWatcherCommon(watchersHead_, watcher); - propValue = jerryx_get_property_str(watcher, "_lastValue"); + if (!isLazyLoading) { + propValue = jerryx_get_property_str(watcher, "_lastValue"); + } } jerry_release_value(options); return propValue; } -void Component::ParseAttrs(jerry_value_t attrs) +void Component::ParseAttrs() { + jerry_value_t attrs = jerryx_get_property_str(options_, ATTR_ATTRS); + if (jerry_value_is_undefined(attrs)) { + return; + } + jerry_value_t attrKeys = jerry_get_object_keys(attrs); if (jerry_value_is_undefined(attrKeys)) { HILOG_ERROR(HILOG_MODULE_ACE, "None attributes to parse."); + jerry_release_value(attrs); return; } @@ -898,7 +1050,14 @@ void Component::ParseAttrs(jerry_value_t attrs) if (jerry_value_is_function(attrValue)) { START_TRACING_WITH_COMPONENT_NAME(SET_ATTR_PARSE_EXPRESSION, componentName_); - newAttrValue = ParseExpression(attrKey, attrValue); +#ifdef FEATURE_LAZY_LOADING_MODULE + newAttrValue = CallJSFunction(attrValue, viewModel_, nullptr, 0); + JsAppContext *context = JsAppContext::GetInstance(); + LazyLoadManager *lazyLoadManager = const_cast(context->GetLazyLoadManager()); + lazyLoadManager->AddLazyLoadWatcher(nativeElement_, attrKey, attrValue); +#else + newAttrValue = AddWatcherItem(attrKey, attrValue); +#endif STOP_TRACING(); } @@ -921,11 +1080,12 @@ void Component::ParseAttrs(jerry_value_t attrs) ReleaseJerryValue(attrKey, attrValue, VA_ARG_END_FLAG); } jerry_release_value(attrKeys); + jerry_release_value(attrs); } -void Component::SetClickEventListener(UIView &view, const jerry_value_t eventFunc, const uint16_t eventTypeId) +void Component::SetClickEventListener(UIView &view, const jerry_value_t eventFunc, bool isStopPropagation) { - onClickListener_ = new ViewOnClickListener(eventFunc, eventTypeId); + onClickListener_ = new ViewOnClickListener(eventFunc, isStopPropagation); if (onClickListener_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "click listener create failed"); return; @@ -1002,9 +1162,9 @@ void Component::SetKeyBoardEventListener(jerry_value_t eventFunc, uint16_t event } #endif -void Component::SetLongPressEventListener(UIView &view, const jerry_value_t eventFunc, const uint16_t eventTypeId) +void Component::SetLongPressEventListener(UIView &view, const jerry_value_t eventFunc, bool isStopPropagation) { - onLongPressListener_ = new ViewOnLongPressListener(eventFunc, eventTypeId); + onLongPressListener_ = new ViewOnLongPressListener(eventFunc, isStopPropagation); if (onLongPressListener_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "long press listener create failed"); return; @@ -1014,9 +1174,9 @@ void Component::SetLongPressEventListener(UIView &view, const jerry_value_t even view.SetTouchable(true); } -void Component::SetSwipeEventListener(UIView &view, jerry_value_t eventFunc) +void Component::SetSwipeEventListener(UIView &view, jerry_value_t eventFunc, bool isStopPropagation) { - onSwipeListener_ = new ViewOnSwipeListener(eventFunc); + onSwipeListener_ = new ViewOnSwipeListener(eventFunc, isStopPropagation); if (onSwipeListener_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "swipe listener create failed"); return; @@ -1029,30 +1189,43 @@ void Component::SetSwipeEventListener(UIView &view, jerry_value_t eventFunc) } // default implementation -bool Component::RegisterEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +bool Component::RegisterEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) { - UIView *uiView = GetComponentRootView(); - if ((uiView == nullptr) || !KeyParser::IsKeyValid(eventTypeId) || IS_UNDEFINED(funcValue)) { + if (!KeyParser::IsKeyValid(eventTypeId) || IS_UNDEFINED(funcValue)) { + HILOG_ERROR(HILOG_MODULE_ACE, "register event listener failed cause by invalid attribute name or value."); return false; } - bool registerResult = RegisterPrivateEventListener(eventTypeId, funcValue); + UIView *uiView = GetComponentRootView(); + if (uiView == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "register event listener failed cause by empty view."); + return false; + } + + bool registerResult = RegisterPrivateEventListener(eventTypeId, funcValue, isStopPropagation); if (registerResult) { return true; } - return RegisterCommonEventListener(*uiView, eventTypeId, funcValue); + return RegisterCommonEventListener(*uiView, eventTypeId, funcValue, isStopPropagation); } -bool Component::RegisterCommonEventListener(UIView &view, const uint16_t eventTypeId, const jerry_value_t funcValue) +bool Component::RegisterCommonEventListener(UIView &view, + const uint16_t eventTypeId, + const jerry_value_t funcValue, + bool isStopPropagation) { switch (eventTypeId) { case K_CLICK: { - SetClickEventListener(view, funcValue, eventTypeId); + SetClickEventListener(view, funcValue, isStopPropagation); break; } case K_LONGPRESS: { - SetLongPressEventListener(view, funcValue, eventTypeId); + SetLongPressEventListener(view, funcValue, isStopPropagation); + break; + } + case K_SWIPE: { + SetSwipeEventListener(view, funcValue, isStopPropagation); break; } #ifdef JS_TOUCH_EVENT_SUPPORT @@ -1077,10 +1250,6 @@ bool Component::RegisterCommonEventListener(UIView &view, const uint16_t eventTy break; } #endif - case K_SWIPE: { - SetSwipeEventListener(view, funcValue); - break; - } default: { return false; } @@ -1102,13 +1271,13 @@ void Component::ReleaseCommonEventListeners() ACE_DELETE(onSwipeListener_); } -void Component::AppendDescriptorOrElements(UIViewGroup *viewGroup, const JSValue descriptorOrElements) +void Component::AppendDescriptorOrElements(Component *parent, const JSValue descriptorOrElements) { if (!JSUndefined::Is(descriptorOrElements)) { uint16_t size = JSArray::Length(descriptorOrElements); for (uint16_t idx = 0; idx < size; ++idx) { JSValue descriptorOrElement = JSArray::Get(descriptorOrElements, idx); - AppendDescriptorOrElement(viewGroup, descriptorOrElement); + AppendDescriptorOrElement(parent, descriptorOrElement); JSRelease(descriptorOrElement); } } @@ -1138,65 +1307,73 @@ void Component::InvalidateIfNeeded(uint16_t attrKeyId, bool invalidateSelf) cons } } -void Component::ParseEvent(jerry_value_t events) +void Component::ParseEvents() { - jerry_value_t eventKeys = jerry_get_object_keys(events); - if (jerry_value_is_undefined(eventKeys)) { - HILOG_ERROR(HILOG_MODULE_ACE, "None event to parse."); + /* + New JS bundle: + _c('div', { + catchBubbleEvents: { + longpress: _vm.handleLongPress + }, + onBubbleEvents: { + swipe: _vm.handleSwipe + } + }); + + The events bound to 'catchBubbleEvents' field should be stoped propagation, + but the events bound to 'onBubbleEvents' field should not. + + Old JS bundle: + _('div', { + on: { + click: _vm.handleClick + }, + }); + The old framework does not support the event bubble mechanism. + Therefore, the events bound to 'on' field are processed as bound to 'onBubbleEvents' field. + */ + BindEvents("on", true); + BindEvents("catchBubbleEvents", true); + BindEvents("onBubbleEvents", false); +} + +void Component::BindEvents(const char *type, bool isStopPropagation) +{ + JSValue events = JSObject::Get(options_, type); + if (JSUndefined::Is(events)) { + JSRelease(events); return; } - - uint16_t length = jerry_get_array_length(eventKeys); + JSValue keys = JSObject::Keys(events); + if (JSUndefined::Is(keys)) { + JSRelease(keys); + JSRelease(events); + return; + } + uint16_t length = JSArray::Length(keys); if (length == 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "None event to parse."); - jerry_release_value(eventKeys); + JSRelease(keys); + JSRelease(events); return; } + for (uint16_t idx = 0; idx < length; ++idx) { + JSValue key = JSArray::Get(keys, idx); + JSValue func = JSObject::Get(events, key); - uint16_t eventTypeStrLen = 0; - for (uint16_t index = 0; index < length; ++index) { - jerry_value_t eventKey = jerry_get_property_by_index(eventKeys, index); - jerry_value_t eventFunc = jerry_get_property(events, eventKey); - - char *eventType = MallocStringOf(eventKey, &eventTypeStrLen); - if (eventType != nullptr) { - if (eventTypeStrLen != 0) { - uint16_t eventTypeId = KeyParser::ParseKeyId(eventType, eventTypeStrLen); - bool isSuccess = RegisterEventListener(eventTypeId, eventFunc); - if (!isSuccess) { - HILOG_ERROR(HILOG_MODULE_ACE, "Register event listener error."); - } + uint16_t keyLength = 0; + char *keyName = MallocStringOf(key, &keyLength); + if (keyLength != 0) { + uint16_t keyId = KeyParser::ParseKeyId(keyName, keyLength); + if (!RegisterEventListener(keyId, func, isStopPropagation)) { + HILOG_ERROR(HILOG_MODULE_ACE, "Register event listener error."); } - ace_free(eventType); - eventType = nullptr; } - ReleaseJerryValue(eventKey, eventFunc, VA_ARG_END_FLAG); + ACE_FREE(keyName); + JSRelease(func); + JSRelease(key); } - jerry_release_value(eventKeys); -} - -// set component's left coordinate relative to its parent -void Component::SetLeft(UIView &view, const AppStyleItem *styleItem) const -{ - int16_t left = GetStylePixelValue(styleItem); - view.SetX(left); -} - -// set component's top coordinate relative to its parent -void Component::SetTop(UIView &view, const AppStyleItem *styleItem) const -{ - int16_t top = GetStylePixelValue(styleItem); - view.SetY(top); -} - -void Component::SetHeight(const AppStyleItem *styleItem) -{ - height_ = GetStylePixelValue(styleItem); -} - -void Component::SetWidth(const AppStyleItem *styleItem) -{ - width_ = GetStylePixelValue(styleItem); + JSRelease(keys); + JSRelease(events); } void Component::SetVisible(UIView &view, const AppStyleItem *styleItem) const @@ -1211,7 +1388,7 @@ void Component::SetVisible(UIView &view, const AppStyleItem *styleItem) const } uint16_t valueId = KeyParser::ParseKeyId(strValue, GetStyleStrValueLen(styleItem)); - view.SetVisible((valueId == K_NONE) ? false : true); + view.SetVisible(valueId != K_NONE); } void Component::SetBackgroundColor(UIView &view, const AppStyleItem &styleItem) const @@ -1232,38 +1409,50 @@ void Component::SetOpacity(UIView &view, const AppStyleItem &styleItem) const return; } double opacity = styleItem.GetFloatingValue(); - view.SetStyle(STYLE_BACKGROUND_OPA, view.GetStyle(STYLE_BACKGROUND_OPA) * opacity); - view.SetStyle(STYLE_IMAGE_OPA, view.GetStyle(STYLE_IMAGE_OPA) * opacity); - view.SetStyle(STYLE_LINE_OPA, view.GetStyle(STYLE_LINE_OPA) * opacity); - view.SetStyle(STYLE_TEXT_OPA, view.GetStyle(STYLE_TEXT_OPA) * opacity); + const double opacityMin = 0.0; + const double opacityMax = 1.0; + if (opacity < opacityMin) { + opacity = opacityMin; + } else if (opacity > opacityMax) { + opacity = opacityMax; + } + view.SetOpaScale(opacity * OPA_OPAQUE); } -void Component::SetMargin(UIView &view, const AppStyleItem &styleItem) const +void Component::SetMargin(UIView &view) const { - SetLeftMargin(view, styleItem); - SetTopMargin(view, styleItem); - SetRightMargin(view, styleItem); - SetBottomMargin(view, styleItem); + SetLeftMargin(view); + SetTopMargin(view); + SetRightMargin(view); + SetBottomMargin(view); } -void Component::SetLeftMargin(UIView &view, const AppStyleItem &styleItem) const +void Component::SetLeftMargin(UIView &view) const { - view.SetStyle(STYLE_MARGIN_LEFT, GetStylePixelValue(&styleItem)); + if (marginLeft_.type == DimensionType::TYPE_PIXEL) { + view.SetStyle(STYLE_MARGIN_LEFT, marginLeft_.value.pixel); + } } -void Component::SetTopMargin(UIView &view, const AppStyleItem &styleItem) const +void Component::SetTopMargin(UIView &view) const { - view.SetStyle(STYLE_MARGIN_TOP, GetStylePixelValue(&styleItem)); + if (marginTop_.type == DimensionType::TYPE_PIXEL) { + view.SetStyle(STYLE_MARGIN_TOP, marginTop_.value.pixel); + } } -void Component::SetRightMargin(UIView &view, const AppStyleItem &styleItem) const +void Component::SetRightMargin(UIView &view) const { - view.SetStyle(STYLE_MARGIN_RIGHT, GetStylePixelValue(&styleItem)); + if (marginRight_.type == DimensionType::TYPE_PIXEL) { + view.SetStyle(STYLE_MARGIN_RIGHT, marginRight_.value.pixel); + } } -void Component::SetBottomMargin(UIView &view, const AppStyleItem &styleItem) const +void Component::SetBottomMargin(UIView &view) const { - view.SetStyle(STYLE_MARGIN_BOTTOM, GetStylePixelValue(&styleItem)); + if (marginBottom_.type == DimensionType::TYPE_PIXEL) { + view.SetStyle(STYLE_MARGIN_BOTTOM, marginBottom_.value.pixel); + } } void Component::SetPadding(UIView &view, const AppStyleItem &styleItem) const @@ -1357,7 +1546,7 @@ void Component::HandleListForDireactive() } } -void Component::AppendChildren(UIViewGroup *viewGroup) +void Component::AppendChildren(Component *parent) { if (JSUndefined::Is(descriptors_)) { return; @@ -1368,7 +1557,7 @@ void Component::AppendChildren(UIViewGroup *viewGroup) for (uint16_t index = 0; index < size; ++index) { JSValue descriptorOrElement = JSArray::Get(descriptors_, index); if (!JSUndefined::Is(descriptorOrElement)) { - bool isDescriptor = AppendDescriptorOrElement(viewGroup, descriptorOrElement); + bool isDescriptor = AppendDescriptorOrElement(parent, descriptorOrElement); if (isDescriptor) { CreateDirectiveWatcher(descriptorOrElement); } @@ -1377,34 +1566,34 @@ void Component::AppendChildren(UIViewGroup *viewGroup) } } -bool Component::AppendDescriptorOrElement(UIViewGroup *viewGroup, const jerry_value_t descriptorOrElement) +bool Component::AppendDescriptorOrElement(Component *parent, const jerry_value_t descriptorOrElement) { if (DescriptorUtils::IsIfDescriptor(descriptorOrElement)) { - AppendIfDescriptor(viewGroup, descriptorOrElement); + AppendIfDescriptor(parent, descriptorOrElement); return true; } if (DescriptorUtils::IsForDescriptor(descriptorOrElement)) { - AppendForDescriptor(viewGroup, descriptorOrElement); + AppendForDescriptor(parent, descriptorOrElement); return true; } - AppendElement(viewGroup, descriptorOrElement); + AppendElement(parent, descriptorOrElement); return false; } -void Component::AppendIfDescriptor(UIViewGroup *viewGroup, const jerry_value_t descriptor) +void Component::AppendIfDescriptor(Component *parent, const jerry_value_t descriptor) { bool isShown = DescriptorUtils::IsIfDescriptorShown(descriptor); if (isShown) { JSValue decriptorOrElement = DescriptorUtils::GetDescriptorRendered(descriptor); if (!JSUndefined::Is(decriptorOrElement)) { - AppendDescriptorOrElement(viewGroup, decriptorOrElement); + AppendDescriptorOrElement(parent, decriptorOrElement); JSRelease(decriptorOrElement); } else { // Don't release decriptorOrElement // because decriptorOrElement is the result of jerry_create_object but jerry_get_property decriptorOrElement = DescriptorUtils::RenderIfDescriptor(descriptor); - AppendDescriptorOrElement(viewGroup, decriptorOrElement); + AppendDescriptorOrElement(parent, decriptorOrElement); // does decriptorOrElement need to be release if decriptorOrElement is descriptor } @@ -1412,21 +1601,24 @@ void Component::AppendIfDescriptor(UIViewGroup *viewGroup, const jerry_value_t d DescriptorUtils::DelIfDescriptorRendered(descriptor); } } -void Component::AppendForDescriptor(UIViewGroup *viewGroup, const jerry_value_t descriptor) +void Component::AppendForDescriptor(Component *parent, const jerry_value_t descriptor) { JSValue descriptorOrelements = DescriptorUtils::GetDescriptorRendered(descriptor); if (!JSUndefined::Is(descriptorOrelements)) { - AppendDescriptorOrElements(viewGroup, descriptorOrelements); + AppendDescriptorOrElements(parent, descriptorOrelements); JSRelease(descriptorOrelements); } else { // Don't release decriptorOrElements // because decriptorOrElements is the result of jerry_create_object but jerry_get_property descriptorOrelements = DescriptorUtils::RenderForDescriptor(descriptor); - AppendDescriptorOrElements(viewGroup, descriptorOrelements); + AppendDescriptorOrElements(parent, descriptorOrelements); } } -void Component::AppendElement(UIViewGroup *viewGroup, const jerry_value_t element) +void Component::AppendElement(Component *parent, const jerry_value_t element) { + if (parent == nullptr) { + return; + } Component *component = nullptr; if (!JSObject::GetNativePointer(element, reinterpret_cast(&component))) { // if get binding component native pointer failed from a child element, just release that element @@ -1436,8 +1628,93 @@ void Component::AppendElement(UIViewGroup *viewGroup, const jerry_value_t elemen return; } JSArray::Push(children_, element); - viewGroup->Add(component->GetComponentRootView()); + parent->AddChild(component); } + +/* + * NOTE: add one child will not attach the native view immediately, but + * when removing one child, the child native view will be detached immediately + */ +void Component::AddChild(Component *childNode) +{ + if (childNode == nullptr) { + return; + } + + if (childHead_ == nullptr) { + childNode->SetParent(this); + childNode->SetNextSibling(nullptr); + childHead_ = childNode; + return; + } + + // find the tail + Component *temp = childHead_; + while ((temp != nullptr) && (temp->GetNextSibling() != nullptr)) { + if (temp == childNode) { + // already added in the list, drop + return; + } + temp = const_cast(temp->GetNextSibling()); + } + childNode->SetParent(this); + temp->SetNextSibling(childNode); + childNode->SetNextSibling(nullptr); +} + +void Component::RemoveChild(Component *childNode) +{ + if ((childNode == nullptr) || (childHead_ == nullptr)) { + return; + } + + UIView *childNativeView = childNode->GetComponentRootView(); + UIViewGroup *parentView = reinterpret_cast(GetComponentRootView()); + if (childNativeView == nullptr || parentView == nullptr) { + return; + } + + if (childNode == childHead_) { + // it is the head + Component *next = const_cast(childHead_->GetNextSibling()); + childNode->SetNextSibling(nullptr); + childNode->SetParent(nullptr); + childHead_ = next; + parentView->Remove(childNativeView); + return; + } + + // find the target node's pre one + Component *temp = childHead_; + while (temp != nullptr) { + if (temp->GetNextSibling() == childNode) { + // found it + break; + } + temp = const_cast(temp->GetNextSibling()); + } + if (temp == nullptr) { + // not found + return; + } + + // the head itself is the last one + if (temp == childHead_) { + childHead_ = nullptr; + } + temp->SetNextSibling(nullptr); + childNode->SetNextSibling(nullptr); + childNode->SetParent(nullptr); + parentView->Remove(childNativeView); +} + +void Component::RemoveAllChildren() +{ + while (childHead_ != nullptr) { + RemoveChild(childHead_); + } +} + void Component::CreateDirectiveWatcher(jerry_value_t descriptor) { JSValue watcher = DescriptorUtils::CreateDescriptorWatcher(nativeElement_, descriptor); @@ -1445,17 +1722,42 @@ void Component::CreateDirectiveWatcher(jerry_value_t descriptor) InsertWatcherCommon(watchersHead_, watcher); } } -void Component::HandleChildrenChange(jerry_value_t descriptor) -{ - UIViewGroup *viewGroup = reinterpret_cast(GetComponentRootView()); - if (viewGroup != nullptr) { - viewGroup->RemoveAll(); - } else { - HILOG_ERROR(HILOG_MODULE_ACE, "Get root component error"); +void Component::BuildViewTree(Component *currComponent, Component *parent, ConstrainedParameter &parentParameter) +{ + if (currComponent == nullptr) { return; } + // align self dimension + currComponent->AlignDimensions(parentParameter); + // refresh rect (border box sizing -> content box sizing) + currComponent->AdaptBoxSizing(); + // attach to parent + if (parent != nullptr) { + parent->AttachView(currComponent); + // notify view has been attached to tree, it means the parent's size is already calculated out + currComponent->OnViewAttached(); + } + + Component *child = const_cast(currComponent->GetChildHead()); + if (child == nullptr) { + return; + } + // the child only can layout in the content area of parent + ConstrainedParameter alignParameter; + currComponent->GetConstrainedParam(alignParameter); + while (child != nullptr) { + BuildViewTree(child, currComponent, alignParameter); + child = const_cast(child->GetNextSibling()); + } + // consider how to avoid layout repeatly, for example: div - div -- div + currComponent->LayoutChildren(); +} + +void Component::HandleChildrenChange(jerry_value_t descriptor) +{ + RemoveAllChildren(); if (!JSUndefined::Is(children_)) { JSRelease(children_); children_ = JSArray::Create(0); @@ -1468,49 +1770,54 @@ void Component::HandleChildrenChange(jerry_value_t descriptor) continue; } if (descriptorOrElement == descriptor) { - UpdateDescriptor(viewGroup, descriptorOrElement); + UpdateDescriptor(this, descriptorOrElement); } else { - ReappendDescriptorOrElement(viewGroup, descriptorOrElement); + ReappendDescriptorOrElement(this, descriptorOrElement); } JSRelease(descriptorOrElement); } - viewGroup->LayoutChildren(); - viewGroup->Invalidate(); + Component *parent = const_cast(GetParent()); + ConstrainedParameter parentParam; + Component *target = (parent == nullptr) ? this : parent; + target->GetConstrainedParam(parentParam); + BuildViewTree(this, nullptr, parentParam); + target->LayoutChildren(); + target->Invalidate(); } -void Component::UpdateDescriptor(UIViewGroup *viewGroup, const jerry_value_t descriptor) +void Component::UpdateDescriptor(Component *parent, const jerry_value_t descriptor) { if (DescriptorUtils::IsIfDescriptor(descriptor)) { - AppendIfDescriptor(viewGroup, descriptor); + AppendIfDescriptor(parent, descriptor); } else if (DescriptorUtils::IsForDescriptor(descriptor)) { // Release descriptor last rendered DescriptorUtils::DelForDescriptorRendered(descriptor); // Re-render descriptor JSValue descriptorOrElements = DescriptorUtils::RenderForDescriptor(descriptor); - AppendDescriptorOrElements(viewGroup, descriptorOrElements); + AppendDescriptorOrElements(parent, descriptorOrElements); } else { // never } } -void Component::ReappendDescriptorOrElement(UIViewGroup *viewGroup, const jerry_value_t descriptor) +void Component::ReappendDescriptorOrElement(Component *parent, const jerry_value_t descriptor) { if (DescriptorUtils::IsIfDescriptor(descriptor)) { JSValue descriptorOrElement = DescriptorUtils::GetDescriptorRendered(descriptor); if (!JSUndefined::Is(descriptorOrElement)) { - AppendDescriptorOrElement(viewGroup, descriptor); + AppendDescriptorOrElement(parent, descriptor); } JSRelease(descriptorOrElement); } else if (DescriptorUtils::IsForDescriptor(descriptor)) { JSValue descriptorOrElements = DescriptorUtils::GetDescriptorRendered(descriptor); if (!JSUndefined::Is(descriptorOrElements)) { - AppendDescriptorOrElements(viewGroup, descriptorOrElements); + AppendDescriptorOrElements(parent, descriptorOrElements); } JSRelease(descriptorOrElements); } else { - AppendElement(viewGroup, descriptor); + AppendElement(parent, descriptor); } } @@ -1550,12 +1857,77 @@ bool Component::GetStyleColorValue(const AppStyleItem *style, uint32_t &color, u color = style->GetNumValue(); alpha = OPA_OPAQUE; return true; - } else if (style->GetValueType() == STYLE_PROP_VALUE_TYPE_STRING) { - return ParseColor(style->GetStrValue(), color, alpha); - } else { - HILOG_ERROR(HILOG_MODULE_ACE, "invalid color format!"); - return false; } + if (style->GetValueType() == STYLE_PROP_VALUE_TYPE_STRING) { + return ParseColor(style->GetStrValue(), color, alpha); + } + HILOG_ERROR(HILOG_MODULE_ACE, "invalid color format!"); + return false; } + +bool Component::HandleBackgroundImg(const AppStyleItem &styleItem, char *&pressedImage, char *&normalImage) const +{ + bool result = false; + if (styleItem.GetValueType() == STYLE_PROP_VALUE_TYPE_STRING) { + const char * const url = styleItem.GetStrValue(); + char *filePath = CreatePathStrFromUrl(url); + if (filePath != nullptr) { + char *imagePath = JsAppContext::GetInstance()->GetResourcePath(filePath); + if (imagePath == nullptr) { + ace_free(filePath); + filePath = nullptr; + return result; + } +#ifdef OHOS_ACELITE_PRODUCT_WATCH + // convert .png/jpeg/bmp to .bin subfix + CureImagePath(imagePath); +#endif // OHOS_ACELITE_PRODUCT_WATCH + if ((styleItem.GetPseudoClassType() == PSEUDO_CLASS_ACTIVE) || + (styleItem.GetPseudoClassType() == PSEUDO_CLASS_CHECKED)) { + // in case we don't free the buffer after using + ACE_FREE(pressedImage); + pressedImage = imagePath; + } else { + // in case we don't free the buffer after using + ACE_FREE(normalImage); + normalImage = imagePath; + } + ace_free(filePath); + filePath = nullptr; + result = true; + } + } + return result; +} + +#ifdef FEATURE_ROTATION_API +jerry_value_t Component::HandleRotationRequest(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t size) +{ + UNUSED(func); + UIView *bindedView = ComponentUtils::GetViewFromBindingObject(dom); + if (bindedView == nullptr) { + return UNDEFINED; + } + + // default action is to request the focus even user do not pass the argument + bool focusRequest = true; + if (args != nullptr && size > 0) { + if (!JerryGetBoolProperty(args[0], ATTR_NAME_FOCUS, focusRequest)) { + HILOG_ERROR(HILOG_MODULE_ACE, "not bool argument passed, will clear the focus!"); + focusRequest = false; + } + } + if (focusRequest) { + bindedView->RequestFocus(); + } else { + bindedView->ClearFocus(); + } + + return UNDEFINED; +} +#endif // FEATURE_ROTATION_API } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/component.h b/frameworks/src/core/components/component.h similarity index 69% rename from src/core/components/component.h rename to frameworks/src/core/components/component.h index 705ff8f..d15dbb9 100755 --- a/src/core/components/component.h +++ b/frameworks/src/core/components/component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -27,6 +27,41 @@ namespace OHOS { namespace ACELite { +enum DimensionType : uint8_t { + TYPE_UNKNOWN = 0, + TYPE_PIXEL, + TYPE_PERCENT, +}; + +union DimensionValue { + float percentage; + int16_t pixel; +}; + +struct Dimension : public MemoryHeap { + Dimension() : type(DimensionType::TYPE_UNKNOWN) + { + value.percentage = -1; + } + Dimension(float dValue, DimensionType dType) + { + value.percentage = dValue; + type = dType; + } + DimensionValue value; + DimensionType type; +}; + +/** + * @brief The ConstrainedParameter struct record the content rang limitation + */ +struct ConstrainedParameter : public MemoryHeap { + ConstrainedParameter() : maxWidth(0), maxHeight(0) {} + ConstrainedParameter(int16_t width, int16_t height) : maxWidth(width), maxHeight(height) {} + int16_t maxWidth; + int16_t maxHeight; +}; + class Component : public MemoryHeap { public: ACE_DISALLOW_COPY_AND_MOVE(Component); @@ -72,6 +107,18 @@ public: */ virtual UIView *GetComponentRootView() const = 0; + /** + * @brief This is the entry to set all combined styles into one specific component, one default + * implementation is provided, which calls ApplyPrivateStyle() to try the component's private special + * style first, if one gets matched, the appling process ends, if not, common styles will be + * tried by calling ApplyCommonStyle() method. + * + * NOTE: The default implementation just apply styles into the ui view returned by GetComponentRootView(), + * if this doesn't meet your requirement, go ahead to override this whole function as you want. + * + * @return true if the given style gets matched and is set properly, false for otherwise. + */ + virtual bool ApplyStyle(const AppStyleItem *style); /** * Call this to invalidate the views this component is holding, the default implementation is just to * invalidate the root view of the component, if the child class has special requirement, override this @@ -104,10 +151,39 @@ public: return descriptors_; } - jerry_value_t ParseExpression(jerry_value_t attrKey, jerry_value_t attrValue); + jerry_value_t AddWatcherItem(const jerry_value_t attrKey, const jerry_value_t attrValue, + bool isLazyLoading = false); void HandleChildrenChange(jerry_value_t descriptor); + /** + * @brief AttachView call this function to link native views together to the tree + */ + virtual void AttachView(const Component *child) + { + UNUSED(child); + } + /** + * @brief OnViewAttached called when the native view is attached to the tree + */ + virtual void OnViewAttached() {} + virtual void LayoutChildren() {} + static void BuildViewTree(Component *currComponent, Component *parent, ConstrainedParameter &alignParameter); + + const Component *GetParent() const + { + return parent_; + } + + const Component *GetChildHead() const + { + return childHead_; + } + + const Component *GetNextSibling() const + { + return nextSibling_; + } struct AnimationsNode : public MemoryHeap { TransitionImpl *transitionImpl; AnimationsNode *next; @@ -117,6 +193,12 @@ public: static void HandlerAnimations(); static void ReleaseAnimations(); + /** + * @brief GetDimension return the dimension data, only width, height, margin, top and left are supported + * @param keyNameId the key ID for representing which dimension data is wanted + * @return the requested dimension data + */ + const Dimension &GetDimension(uint16_t keyNameId) const; protected: void SetComponentName(uint16_t name) @@ -128,7 +210,7 @@ protected: /** * @brief The child class can implement this function to do some initialization before the whole render process - * begining. See PostRender() also. The default implementation just does nothing. + * beginning. See PostRender() also. The default implementation just does nothing. */ virtual void PreRender() {} /** @@ -147,7 +229,7 @@ protected: * @brief This function will be called when UpdateView execute finished. See PreUpdate() also. * The default implementation just does nothing. */ - virtual void PostUpdate(uint16_t attrKeyId, bool updateResult) {} + virtual void PostUpdate(uint16_t attrKeyId) {} /** * @brief step1: inherited class must override this method to create the native views, it's the child class's * responsibility to record the native views it creates out, and they should be released properly in release @@ -159,12 +241,20 @@ protected: * * @return true for success, false for failure */ - virtual bool CreateNativeViews() = 0; + virtual bool CreateNativeViews() + { + return true; + } /** * @brief This function must be implemented by child classes. Should release all the native views it * creates out in CreateNativeViews() function. */ - virtual void ReleaseNativeViews() = 0; + virtual void ReleaseNativeViews() {} + /** + * @brief Mapping native view with DOM element. + */ + virtual void SetViewExtraMsg(); + virtual void ReleaseViewExtraMsg(); /** * @brief This is the entry to set all attributes into one specific component, one default * implementation is provided, which calls SetPrivateAttribute() to try the component's private special @@ -204,35 +294,26 @@ protected: * * @return true if the given event gets matched and is set properly, false for otherwise. */ - virtual bool RegisterEventListener(uint16_t eventTypeId, jerry_value_t funcValue); + virtual bool RegisterEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation); /** * @brief Child class should call this to set common event listener to a given native view. * * @return true if any common event type matchs successfully, false if no match at all */ - bool RegisterCommonEventListener(UIView& view, const uint16_t eventTypeId, const jerry_value_t funcValue); + bool RegisterCommonEventListener(UIView& view, + const uint16_t eventTypeId, + const jerry_value_t funcValue, + bool isStopPropagation); /** * @brief Child class should call this to set own special event setting/update actions. * * @return true if any common event type matchs successfully, false if no match at all */ - virtual bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) + virtual bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) { return false; } - /** - * @brief This is the entry to set all combined styles into one specific component, one default - * implementation is provided, which calls ApplyPrivateStyle() to try the component's private special - * style first, if one gets matched, the appling process ends, if not, common styles will be - * tried by calling ApplyCommonStyle() method. - * - * NOTE: The default implementation just apply styles into the ui view returned by GetComponentRootView(), - * if this doesn't meet your requirement, go ahead to override this whole function as you want. - * - * @return true if the given style gets matched and is set properly, false for otherwise. - */ - virtual bool ApplyStyle(const AppStyleItem *style); /** * @brief Used to set all common styles for all kinds of component. * @@ -284,14 +365,14 @@ protected: jerry_value_t SetListForWatcher(jerry_value_t getter, jerry_value_t children); void HandleListForDireactive(); - void AppendChildren(UIViewGroup *viewGroup); - bool AppendDescriptorOrElement(UIViewGroup *viewGroup, const jerry_value_t descriptorOrElement); - void AppendIfDescriptor(UIViewGroup *viewGroup, const jerry_value_t descriptor); - void AppendForDescriptor(UIViewGroup *viewGroup, const jerry_value_t descriptor); - void AppendElement(UIViewGroup *viewGroup, const jerry_value_t element); + void AppendChildren(Component *parent); + bool AppendDescriptorOrElement(Component *parent, const jerry_value_t descriptorOrElement); + void AppendIfDescriptor(Component *parent, const jerry_value_t descriptor); + void AppendForDescriptor(Component *parent, const jerry_value_t descriptor); + void AppendElement(Component *parent, const jerry_value_t element); void CreateDirectiveWatcher(jerry_value_t descriptor); - void UpdateDescriptor(UIViewGroup *viewGroup, const jerry_value_t descriptor); - void ReappendDescriptorOrElement(UIViewGroup *viewGroup, const jerry_value_t descriptor); + void UpdateDescriptor(Component *parent, const jerry_value_t descriptor); + void ReappendDescriptorOrElement(Component *parent, const jerry_value_t descriptor); int32_t GetStyleNumValue(const AppStyleItem *style) const { return style->GetNumValue(); @@ -318,11 +399,16 @@ protected: } int16_t GetHeight() const { - return height_; + return (height_.type == TYPE_PIXEL) ? height_.value.pixel : INVALID_PIXEL_VALUE; } int16_t GetWidth() const { - return width_; + return (width_.type == TYPE_PIXEL) ? width_.value.pixel : INVALID_PIXEL_VALUE; + } + + jerry_value_t *GetDomElementPointer() + { + return &nativeElement_; } int32_t GetStylePixelValue(const AppStyleItem *style, int32_t defaultValue = 0) const; @@ -333,21 +419,49 @@ protected: void SetTopPadding(UIView &view, const AppStyleItem& styleItem) const; void SetRightPadding(UIView &view, const AppStyleItem& styleItem) const; void SetBottomPadding(UIView &view, const AppStyleItem& styleItem) const; - void SetLeftMargin(UIView &view, const AppStyleItem& styleItem) const; - void SetTopMargin(UIView &view, const AppStyleItem& styleItem) const; - void SetRightMargin(UIView &view, const AppStyleItem& styleItem) const; - void SetBottomMargin(UIView &view, const AppStyleItem& styleItem) const; - void SetMargin(UIView &view, const AppStyleItem& styleItem) const; void SetBorderWidth(UIView &view, const AppStyleItem& styleItem) const; void SetBorderColor(UIView &view, const AppStyleItem& styleItem) const; void SetBorderRadius(UIView &view, const AppStyleItem& styleItem) const; void SetBackgroundColor(UIView &view, const AppStyleItem& styleItem) const; void SetOpacity(UIView &view, const AppStyleItem &styleItem) const; + /** + * @brief GetConstrainedParam return the align parameter the children can be refer to + */ + void GetConstrainedParam(ConstrainedParameter ¶m) const; + void SetLeftMargin(UIView &view) const; + void SetTopMargin(UIView &view) const; + void SetRightMargin(UIView &view) const; + void SetBottomMargin(UIView &view) const; + void SetMargin(UIView &view) const; + virtual void ApplyAlignedMargin(UIView &uiView) const; + /** + * @brief get the pressedImage url and the normal image url + * @param styleItem the style item which contains image info + * @param pressedImage the pseudo value in style item + * @param normalImage the normal image url + * @return if get the image url success return true, else false + */ + bool HandleBackgroundImg(const AppStyleItem &styleItem, char *&pressedImage, char *&normalImage) const; + +#ifdef FEATURE_ROTATION_API + /** + * @brief the rotation API handling function, the child component can register it for rotation API supporting + * @param func function object + * @param dom the context of function execution + * @param args the list of arguments + * @param size the length of arguments list + * @return the handling result to caller + */ + static jerry_value_t HandleRotationRequest(const jerry_value_t func, + const jerry_value_t dom, + const jerry_value_t args[], + const jerry_length_t size); +#endif // FEATURE_ROTATION_API private: /** * @brief Used to set animation keyframes, such as transform, background-color, height etc. - * it is set as attribute, and support binding to data, so it can be changed dynamiclly. + * it is set as attribute, and support binding to data, so it can be changed dynamically. * * the following three functions will called in order */ @@ -378,36 +492,35 @@ private: int32_t GetAnimatorValue(char *animatorValue, const int8_t index, bool isOpacity = false) const; void ParseOptions(); - void ParseAttrs(jerry_value_t attrs); - void ParseEvent(jerry_value_t events); + void ParseAttrs(); + void ParseEvents(); + void BindEvents(const char *type, bool isStopPropagation); /** * @brief Apply combined styles into native view. */ - void ApplyStyles(); + void ApplyStyles(const jerry_value_t options, Component& currentComponent) const; /** * @brief This function will be called after the ApplyCommonStyle, make padding style work. */ - bool RefreshRect() const; - void SetHeight(const AppStyleItem *styleItem); - void SetWidth(const AppStyleItem *styleItem); + bool AdaptBoxSizing() const; + void ApplyAlignedPosition(UIView &uiView) const; + void AdapteBoxRectArea(UIView &uiView) const; void SetVisible(UIView& view, const AppStyleItem *styleItem) const; - void SetLeft(UIView& view, const AppStyleItem *styleItem) const; - void SetTop(UIView& view, const AppStyleItem *styleItem) const; - void SetClickEventListener(UIView& view, const jerry_value_t eventFunc, const uint16_t eventTypeId); - void SetLongPressEventListener(UIView& view, const jerry_value_t eventFunc, const uint16_t eventTypeId); - void SetSwipeEventListener(UIView& view, jerry_value_t eventFunc); + void SetClickEventListener(UIView& view, const jerry_value_t eventFunc, bool isStopPropagation); + void SetLongPressEventListener(UIView& view, const jerry_value_t eventFunc, bool isStopPropagation); + void SetSwipeEventListener(UIView& view, jerry_value_t eventFunc, bool isStopPropagation); #ifdef JS_TOUCH_EVENT_SUPPORT - void SetTouchStartEventListener(UIView &view, jerry_value_t eventFunc, const uint16_t eventTypeId); - void SetTouchMoveEventListener(UIView &view, jerry_value_t eventFunc, const uint16_t eventTypeId); - void SetTouchEndEventListener(UIView &view, jerry_value_t eventFunc, const uint16_t eventTypeId); - void SetTouchCancelEventListener(UIView &view, jerry_value_t eventFunc, const uint16_t eventTypeId); - void SetKeyBoardEventListener(jerry_value_t eventFunc, const uint16_t eventTypeId); + void SetTouchStartEventListener(UIView &view, jerry_value_t eventFunc, bool isStopPropagation); + void SetTouchMoveEventListener(UIView &view, jerry_value_t eventFunc, bool isStopPropagation); + void SetTouchEndEventListener(UIView &view, jerry_value_t eventFunc, bool isStopPropagation); + void SetTouchCancelEventListener(UIView &view, jerry_value_t eventFunc, bool isStopPropagation); + void SetKeyBoardEventListener(jerry_value_t eventFunc, bool isStopPropagation); #endif /** * @brief release common event listeners if any is set */ void ReleaseCommonEventListeners(); - void AppendDescriptorOrElements(UIViewGroup *viewGroup, const JSValue descriptorOrElements); + void AppendDescriptorOrElements(Component *parent, const JSValue descriptorOrElements); /** * @brief For some situations, if the component's rect(position, width, height and so on) area is changed, need * to force the parent container to relayout all children, and need to invalided self before the changes are @@ -419,6 +532,54 @@ private: void InvalidateIfNeeded(uint16_t attrKeyId, bool invalidateSelf = false) const; void AddAnimationToList(const TransitionImpl *transitionImpl) const; + void GetDimensionFromStyle(Dimension &dimension, const AppStyleItem &styleItem) const; + void CalculateDimensionPixel(Dimension &dimension, int16_t base) const; + void AlignDimensions(const ConstrainedParameter ¶m); + virtual void OnDimensionsAligned() {} + + /** + * @brief SetParent assign parent node + * @param parent current component's parent + */ + void SetParent(Component *parent) + { + parent_ = parent; + } + void SetNextSibling(Component *next) + { + nextSibling_ = next; + } + /** + * @brief AddChild insert one child + * @param childNode child component + * + * NOTE: add one child will not attach the native view immediately, but + * when removing one child, the child native view will be detached immediately + */ + void AddChild(Component *childNode); + /** + * @brief RemoveChild cut off the specific child from current component + * @param childNode the child component + */ + void RemoveChild(Component *childNode); + /** + * @brief RemoveAllChildren clean all children + */ + void RemoveAllChildren(); + + /** + * @brief childHead_ the child list + */ + Component *childHead_; + /** + * @brief nextSibling_ next neighbor + */ + Component *nextSibling_; + /** + * @brief parent_ parent component node + */ + Component *parent_; + AppStyleManager *styleManager_; jerry_value_t nativeElement_; jerry_value_t viewModel_; @@ -445,8 +606,14 @@ private: TransitionParams *trans_; jerry_value_t descriptors_; Watcher *watchersHead_; - int16_t height_; - int16_t width_; + Dimension height_; + Dimension width_; + Dimension top_; + Dimension left_; + Dimension marginTop_; + Dimension marginLeft_; + Dimension marginRight_; + Dimension marginBottom_; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/component_factory.h b/frameworks/src/core/components/component_factory.h similarity index 77% rename from src/core/components/component_factory.h rename to frameworks/src/core/components/component_factory.h index bcc1862..c686ee8 100755 --- a/src/core/components/component_factory.h +++ b/frameworks/src/core/components/component_factory.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -28,11 +28,16 @@ #include "canvas_component.h" #endif // FEATURE_COMPONENT_CANVAS #include "chart_component.h" +#include "circle_progress_component.h" #include "component.h" #include "div_component.h" #include "fatal_handler.h" +#include "horizon_progress_component.h" +#include "image_animator_component.h" #include "image_component.h" -#include "input_component.h" +#include "input_button_component.h" +#include "input_checkbox_component.h" +#include "input_radio_component.h" #include "js_fwk_common.h" #include "key_parser.h" #include "keys.h" @@ -40,11 +45,13 @@ #include "marquee_component.h" #include "non_copyable.h" #include "picker_view_component.h" -#include "progress_component.h" +#ifdef FEATURE_COMPONENT_QRCODE +#include "qrcode_component.h" +#endif #include "slider_component.h" +#include "stack_component.h" #include "swiper_component.h" #include "switch_component.h" -#include "image_animator_component.h" #ifdef FEATURE_COMPONENT_TABS #include "tab_bar_component.h" #include "tab_content_component.h" @@ -84,10 +91,10 @@ public: break; #endif // FEATURE_COMPONENT_CANVAS case K_DIV: - component = new DivComponent(options, children, styleManager, DivComponent::LayoutType::FLEX); + component = new DivComponent(options, children, styleManager); break; case K_STACK: - component = new DivComponent(options, children, styleManager, DivComponent::LayoutType::POSITION); + component = new StackComponent(options, children, styleManager); break; case K_IMAGE: component = new ImageComponent(options, children, styleManager); @@ -95,9 +102,16 @@ public: case K_IMAGE_ANIMATOR: component = new ImageAnimatorComponent(options, children, styleManager); break; - case K_PROGRESS: - component = new ProgressComponent(options, children, styleManager); + case K_PROGRESS: { + uint16_t id = ComponentUtils::GetComponentType(options); + if (id == K_ARC) { + component = new CircleProgressComponent(options, children, styleManager); + } else { + // default type is horizon progress + component = new HorizonProgressComponent(options, children, styleManager); + } break; + } #ifdef FEATURE_COMPONENT_TABS case K_TAB_BAR: component = new TabBarComponent(options, children, styleManager); @@ -125,7 +139,7 @@ public: component = new ListComponent(options, children, styleManager); break; case K_LIST_ITEM: - component = new DivComponent(options, children, styleManager, DivComponent::LayoutType::FLEX); + component = new DivComponent(options, children, styleManager); break; #ifdef FEATURE_COMPONENT_ANALOG_CLOCK case K_CLOCK_HAND: @@ -135,9 +149,18 @@ public: component = new AnalogClockComponent(options, children, styleManager); break; #endif // FEATURE_COMPONENT_ANALOG_CLOCK - case K_INPUT: - component = new InputComponent(options, children, styleManager); + case K_INPUT: { + uint16_t id = ComponentUtils::GetComponentType(options); + if (id == K_CHECKBOX) { + component = new InputCheckboxComponent(options, children, styleManager); + } else if (id == K_RADIO) { + component = new InputRadioComponent(options, children, styleManager); + } else { + // default type is input button + component = new InputButtonComponent(options, children, styleManager); + } break; + } case K_MARQUEE: component = new MarqueeComponent(options, children, styleManager); break; @@ -147,6 +170,11 @@ public: case K_PICKER_VIEW: component = new PickerViewComponent(options, children, styleManager); break; +#ifdef FEATURE_COMPONENT_QRCODE + case K_QRCODE: + component = new QrcodeComponent(options, children, styleManager); + break; +#endif // FEATURE_COMPONENT_QRCODE #ifdef FEATURE_COMPONENT_VIDEO case K_VIDEO: component = new VideoComponent(options, children, styleManager); diff --git a/frameworks/src/core/components/component_utils.cpp b/frameworks/src/core/components/component_utils.cpp new file mode 100755 index 0000000..b144e11 --- /dev/null +++ b/frameworks/src/core/components/component_utils.cpp @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2020-2021 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. + */ + +#include "component_utils.h" +#include "ace_log.h" +#include "component.h" +#include "descriptor_utils.h" + +namespace OHOS { +namespace ACELite { +UIView* ComponentUtils::GetViewFromBindingObject(jerry_value_t value) +{ + Component* component = GetComponentFromBindingObject(value); + return component ? component->GetComponentRootView() : nullptr; +} + +Component* ComponentUtils::GetComponentFromBindingObject(jerry_value_t value) +{ + if (IS_UNDEFINED(value)) { + return nullptr; + } + + Component* component = nullptr; + bool isBinded = jerry_get_object_native_pointer(value, reinterpret_cast(&component), nullptr); + if (!isBinded || (component == nullptr)) { + return nullptr; + } + return component; +} + +void ComponentUtils::ReleaseComponents(Component *rootComponent) +{ + if (rootComponent == nullptr) { + return; + } + // for list component, release all the list items first + if (rootComponent->GetComponentName() != K_LIST) { + JSValue descriptors = rootComponent->GetDescriptors(); + if (!JSUndefined::Is(descriptors)) { + DescriptorUtils::ReleaseDescriptorOrElements(descriptors); + } + } + Component *child = const_cast(rootComponent->GetChildHead()); + if (child == nullptr) { + // has no children, can be released directly + rootComponent->Release(); + delete rootComponent; + return; + } + while (child != nullptr) { + ReleaseComponents(child); + child = const_cast(child->GetNextSibling()); + } +} + +uint16_t ComponentUtils::GetComponentType(jerry_value_t options) +{ + if (IS_UNDEFINED(options)) { + return 0; + } + jerry_value_t attrsPropValue = jerryx_get_property_str(options, ATTR_ATTRS); + // create component according to attribute type + const char * const attrType = "type"; + jerry_value_t typeValHandler = jerryx_get_property_str(attrsPropValue, attrType); + uint16_t typeId = 0; + if (!jerry_value_is_undefined(typeValHandler)) { + uint16_t len = 0; + char *type = MallocStringOf(typeValHandler, &len); + typeId = KeyParser::ParseKeyId(type, len); + ACE_FREE(type); + } + ReleaseJerryValue(typeValHandler, attrsPropValue, VA_ARG_END_FLAG); + return typeId; +} +} // namespace ACELite +} // namespace OHOS diff --git a/src/core/components/component_utils.h b/frameworks/src/core/components/component_utils.h old mode 100755 new mode 100644 similarity index 84% rename from src/core/components/component_utils.h rename to frameworks/src/core/components/component_utils.h index fff9c61..8b7ee02 --- a/src/core/components/component_utils.h +++ b/frameworks/src/core/components/component_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -36,6 +36,11 @@ public: * @brief Easy method to get the the component binded to the given JS object. */ static Component* GetComponentFromBindingObject(jerry_value_t value); + static void ReleaseComponents(Component *rootComponent); + /** + * @brief Easy method to get the the component type. + */ + static uint16_t GetComponentType(jerry_value_t options); }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/components/div_component.cpp b/frameworks/src/core/components/div_component.cpp new file mode 100644 index 0000000..5468ca5 --- /dev/null +++ b/frameworks/src/core/components/div_component.cpp @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2020-2021 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. + */ + +#include "div_component.h" +#include "ace_log.h" +#include "key_parser.h" +#include "keys.h" + +namespace OHOS { +namespace ACELite { +DivComponent::DivComponent(jerry_value_t options, + jerry_value_t children, + AppStyleManager* styleManager) + : Component(options, children, styleManager), + isSecondaryAxisAlignSet_(false) +{ + SetComponentName(K_DIV); + nativeView_.SetStyle(STYLE_BACKGROUND_OPA, 0); +} + + +inline UIView *DivComponent::GetComponentRootView() const +{ + return const_cast(&nativeView_); +} + +bool DivComponent::ApplyPrivateStyle(const AppStyleItem* style) +{ + // Set default value + if (!isSecondaryAxisAlignSet_) { + nativeView_.SetSecondaryAxisAlign(OHOS::ALIGN_START); + } + uint16_t stylePropNameId = GetStylePropNameId(style); + if (!KeyParser::IsKeyValid(stylePropNameId)) { + return false; + } + const char * const strValue = GetStyleStrValue(style); + if (strValue == nullptr) { + return false; + } + + bool applyResult = true; + uint16_t valueId = KeyParser::ParseKeyId(strValue, GetStyleStrValueLen(style)); + switch (stylePropNameId) { + case K_FLEX_DIRECTION: { + switch (valueId) { + case K_COLUMN: + nativeView_.SetLayoutDirection(LAYOUT_VER); + break; + case K_ROW: + nativeView_.SetLayoutDirection(LAYOUT_HOR); + break; + case K_ROW_REVERSE: + nativeView_.SetLayoutDirection(LAYOUT_HOR_R); + break; + case K_COLUMN_REVERSE: + nativeView_.SetLayoutDirection(LAYOUT_VER_R); + break; + default: + applyResult = false; + break; + } + break; + } + case K_JUSTIFY_CONTENT: { + switch (valueId) { + case K_FLEX_START: + nativeView_.SetMajorAxisAlign(OHOS::ALIGN_START); + break; + case K_FLEX_END: + nativeView_.SetMajorAxisAlign(OHOS::ALIGN_END); + break; + case K_CENTER: + nativeView_.SetMajorAxisAlign(OHOS::ALIGN_CENTER); + break; + case K_SPACE_BETWEEN: + nativeView_.SetMajorAxisAlign(OHOS::ALIGN_BETWEEN); + break; + case K_SPACE_AROUND: + nativeView_.SetMajorAxisAlign(OHOS::ALIGN_EVENLY); + break; + default: + applyResult = false; + break; + } + break; + } + case K_ALIGN_ITEMS: { + switch (valueId) { + case K_FLEX_START: + nativeView_.SetSecondaryAxisAlign(OHOS::ALIGN_START); + break; + case K_FLEX_END: + nativeView_.SetSecondaryAxisAlign(OHOS::ALIGN_END); + break; + case K_CENTER: + nativeView_.SetSecondaryAxisAlign(OHOS::ALIGN_CENTER); + break; + default: + applyResult = false; + break; + } + if (applyResult) + isSecondaryAxisAlignSet_ = true; + break; + } + case K_FLEX_WRAP: { + if (valueId == K_WRAP) { + nativeView_.SetFlexWrap(FlexLayout::WRAP); + } else { + nativeView_.SetFlexWrap(FlexLayout::NOWRAP); + } + break; + } + default: + applyResult = false; + break; + } + + return applyResult; +} + +bool DivComponent::ProcessChildren() +{ + // add all children to this container + AppendChildren(this); + + return true; +} + +void DivComponent::PostUpdate(uint16_t attrKeyId) +{ + nativeView_.LayoutChildren(); +} + +void DivComponent::AttachView(const Component *child) +{ + if (child == nullptr) { + return; + } + nativeView_.Add(child->GetComponentRootView()); +} + +void DivComponent::LayoutChildren() +{ + nativeView_.LayoutChildren(); +} +} // namespace ACELite +} // namespace OHOS diff --git a/src/core/components/div_component.h b/frameworks/src/core/components/div_component.h old mode 100755 new mode 100644 similarity index 75% rename from src/core/components/div_component.h rename to frameworks/src/core/components/div_component.h index 8055685..ec97481 --- a/src/core/components/div_component.h +++ b/frameworks/src/core/components/div_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -23,29 +23,23 @@ namespace OHOS { namespace ACELite { class DivComponent final : public Component { public: - enum LayoutType { - POSITION, - FLEX - }; ACE_DISALLOW_COPY_AND_MOVE(DivComponent); DivComponent() = delete; - DivComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager, const LayoutType type); + DivComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager); ~DivComponent() override {} protected: - bool CreateNativeViews() override; - void ReleaseNativeViews() override; UIView *GetComponentRootView() const override; bool ApplyPrivateStyle(const AppStyleItem* style) override; bool ProcessChildren() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; + void PostUpdate(uint16_t attrKeyId) override; + void AttachView(const Component *child) override; + void LayoutChildren() override; private: bool isSecondaryAxisAlignSet_; - const AppStyle* combinedStyle_; - UIViewGroup* nativeView_; - LayoutType layoutType_; + FlexLayout nativeView_; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/event_listener.cpp b/frameworks/src/core/components/event_listener.cpp similarity index 67% rename from src/core/components/event_listener.cpp rename to frameworks/src/core/components/event_listener.cpp index e670351..220f1ec 100755 --- a/src/core/components/event_listener.cpp +++ b/frameworks/src/core/components/event_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -115,51 +115,26 @@ bool ViewOnTouchCancelListener::OnCancel(UIView &view, const CancelEvent &event) } #endif // JS_TOUCH_EVENT_SUPPORT -bool ViewOnSwipeListener::OnDragStart(UIView &view, const DragEvent &event) +bool ViewOnSwipeListener::OnDragStart(UIView& view, const DragEvent &event) { - UNUSED(view); UNUSED(event); HILOG_DEBUG(HILOG_MODULE_ACE, "OnDragStart received"); - return true; + return isStopPropagation_; } -bool ViewOnSwipeListener::OnDragEnd(UIView &view, const DragEvent &event) +bool ViewOnSwipeListener::OnDragEnd(UIView& view, const DragEvent &event) { - UNUSED(view); - if (jerry_value_is_undefined(fn_)) { + if (JSUndefined::Is(fn_)) { HILOG_ERROR(HILOG_MODULE_ACE, "OnDragEnd received, but no JS function to call"); - return false; + return isStopPropagation_; } HILOG_DEBUG(HILOG_MODULE_ACE, "OnDragEnd received"); - jerry_value_t directionValue; - switch (event.GetDragDirection()) { - case DragEvent::DIRECTION_LEFT_TO_RIGHT: - directionValue = jerry_create_string(reinterpret_cast(SWIPE_RIGHT)); - break; - case DragEvent::DIRECTION_RIGHT_TO_LEFT: - directionValue = jerry_create_string(reinterpret_cast(SWIPE_LEFT)); - break; - case DragEvent::DIRECTION_TOP_TO_BOTTOM: - directionValue = jerry_create_string(reinterpret_cast(SWIPE_DOWN)); - break; - case DragEvent::DIRECTION_BOTTOM_TO_TOP: - directionValue = jerry_create_string(reinterpret_cast(SWIPE_UP)); - break; - default: - directionValue = UNDEFINED; - break; - } + JSValue arg = EventUtil::CreateSwipeEvent(view, event); + EventUtil::InvokeCallback(JSUndefined::Create(), fn_, arg); - jerry_value_t args[1] = {jerry_create_object()}; - const char * const directionName = "direction"; - jerry_value_t result = jerryx_set_property_str(args[0], directionName, directionValue); - if (!jerry_value_is_error(result)) { - CallJSFunctionAutoRelease(fn_, UNDEFINED, args, 1); - } - ReleaseJerryValue(result, args[0], directionValue, VA_ARG_END_FLAG); - return true; + return isStopPropagation_; } } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/event_listener.h b/frameworks/src/core/components/event_listener.h similarity index 64% rename from src/core/components/event_listener.h rename to frameworks/src/core/components/event_listener.h index 7ff5ecf..78de13a 100755 --- a/src/core/components/event_listener.h +++ b/frameworks/src/core/components/event_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,6 +16,8 @@ #ifndef OHOS_ACELITE_EVENT_LISTENER_H #define OHOS_ACELITE_EVENT_LISTENER_H +#include "ace_log.h" +#include "event_util.h" #include "js_fwk_common.h" #include "keys.h" #include "non_copyable.h" @@ -31,43 +33,29 @@ namespace ACELite { class StateChangeListener final : public UICheckBox::OnChangeListener { public: ACE_DISALLOW_COPY_AND_MOVE(StateChangeListener); - StateChangeListener(jerry_value_t fn, uint16_t componentId) + StateChangeListener(jerry_value_t fn) { fn_ = jerry_acquire_value(fn); - componentId_ = componentId; isChanging_ = false; - radio_ = nullptr; - value_ = nullptr; - state_ = UICheckBox::UICheckBoxState::UNSELECTED; + state_ = false; } bool OnChange(UICheckBox::UICheckBoxState state) override { - if (radio_ != nullptr) { - state_ = state; + bool stateRes = (state == UICheckBox::UICheckBoxState::SELECTED); + if (stateRes == state_) { + return true; } + state_ = stateRes; if (isChanging_) { return false; } isChanging_ = true; jerry_value_t args[1]; - bool result = (UICheckBox::UICheckBoxState::SELECTED == state) ? true : false; - jerry_value_t resultProp = jerry_create_boolean(result); + jerry_value_t resultProp = jerry_create_boolean(state_); args[0] = jerry_create_object(); const char * const checked = "checked"; ReleaseJerryValue(jerryx_set_property_str(args[0], checked, resultProp), resultProp, VA_ARG_END_FLAG); - if (radio_ != nullptr) { - const char * const name = "name"; - if (radio_->GetName() != nullptr) { - jerry_value_t nameVal = jerry_create_string(reinterpret_cast(radio_->GetName())); - ReleaseJerryValue(jerryx_set_property_str(args[0], name, nameVal), nameVal, VA_ARG_END_FLAG); - } - } - if (value_ != nullptr) { - const char * const valueName = "value"; - jerry_value_t valueProp = jerry_create_string(reinterpret_cast(value_)); - ReleaseJerryValue(jerryx_set_property_str(args[0], valueName, valueProp), valueProp, VA_ARG_END_FLAG); - } jerry_value_t globalObject = jerry_get_global_object(); jerry_value_t appViewModel = jerryx_get_property_str(globalObject, ATTR_APP); if (jerry_value_is_function(fn_)) { @@ -78,37 +66,9 @@ public: return true; } - void TriggerChange(UIView *view) + void SetState(bool state) { - UICheckBox::UICheckBoxState state = UICheckBox::UICheckBoxState::UNSELECTED; - if (componentId_ == K_SWITCH) { - UIToggleButton *toggleButton = reinterpret_cast(view); - if (toggleButton) { - state = (toggleButton->GetState()) ? UICheckBox::UICheckBoxState::SELECTED - : UICheckBox::UICheckBoxState::UNSELECTED; - } - } else if (componentId_ == K_CHECKBOX) { - UICheckBox *checkbox = reinterpret_cast(view); - if (checkbox) { - state = checkbox->GetState(); - } - } else if (radio_ != nullptr) { - state = radio_->GetState(); - if (state == state_) { - return; - } - } - OnChange(state); - } - - void SetView(UIRadioButton* radioButton) - { - radio_ = radioButton; - } - - void SetValue(char* value) - { - value_ = value; + state_ = state; } ~StateChangeListener() @@ -118,43 +78,37 @@ public: private: jerry_value_t fn_; - uint16_t componentId_; - char* value_; - UIRadioButton* radio_; - UICheckBox::UICheckBoxState state_; + bool state_; bool isChanging_; // the flag to avoid change event cycle execute }; class ViewOnClickListener final : public UIView::OnClickListener { public: ACE_DISALLOW_COPY_AND_MOVE(ViewOnClickListener); - explicit ViewOnClickListener(jerry_value_t fn, const uint16_t id) - : fn_(jerry_acquire_value(fn)), -#ifdef JS_TOUCH_EVENT_SUPPORT - id_(id), -#endif - changeListener_(nullptr) {} + + ViewOnClickListener(jerry_value_t fn, bool isStopPropagation) + : changeListener_(nullptr), + fn_(jerry_acquire_value(fn)), + isStopPropagation_(isStopPropagation) {} + ~ViewOnClickListener() { jerry_release_value(fn_); } - bool OnClick(UIView &view, const ClickEvent &event) override + bool OnClick(UIView& view, const ClickEvent &event) override { if (changeListener_) { - changeListener_->TriggerChange(&view); + UICheckBox *checkbox = reinterpret_cast(&view); + changeListener_->OnChange(checkbox->GetState()); } - if (jerry_value_is_undefined(fn_)) { - return false; + if (JSUndefined::Is(fn_)) { + return isStopPropagation_; } -#ifdef JS_TOUCH_EVENT_SUPPORT - jerry_value_t *args = ConvertBaseEventInfo(event, id_); - jerry_release_value(CallJSFunctionOnRoot(fn_, args, 1)); - ClearEventListener(args, 1); -#else - jerry_release_value(CallJSFunctionOnRoot(fn_, nullptr, 0)); -#endif - return true; + JSValue arg = EventUtil::CreateEvent(EventUtil::EVENT_CLICK, view, event); + EventUtil::InvokeCallback(JSUndefined::Create(), fn_, arg); + + return isStopPropagation_; } void SetComponentListener(StateChangeListener *changeListener) @@ -163,54 +117,42 @@ public: } private: - jerry_value_t fn_; -#ifdef JS_TOUCH_EVENT_SUPPORT - uint16_t id_; -#endif StateChangeListener *changeListener_; + jerry_value_t fn_; + bool isStopPropagation_; }; class ViewOnLongPressListener final : public UIView::OnLongPressListener { public: ACE_DISALLOW_COPY_AND_MOVE(ViewOnLongPressListener); - explicit ViewOnLongPressListener(jerry_value_t fn, const uint16_t id) : -#ifdef JS_TOUCH_EVENT_SUPPORT - id_(id), -#endif - fn_(jerry_acquire_value(fn)) {} + ViewOnLongPressListener(jerry_value_t fn, bool isStopPropagation) + : fn_(jerry_acquire_value(fn)), isStopPropagation_(isStopPropagation) {} ~ViewOnLongPressListener() { jerry_release_value(fn_); } - bool OnLongPress(UIView &view, const LongPressEvent &event) override + bool OnLongPress(UIView& view, const LongPressEvent &event) override { if (jerry_value_is_undefined(fn_)) { - return false; + return isStopPropagation_; } -#ifdef JS_TOUCH_EVENT_SUPPORT - jerry_value_t *args = ConvertBaseEventInfo(event, id_); - jerry_release_value(CallJSFunctionOnRoot(fn_, args, 1)); - ClearEventListener(args, 1); -#else - jerry_release_value(CallJSFunctionOnRoot(fn_, nullptr, 0)); -#endif - return true; - } -private: -#ifdef JS_TOUCH_EVENT_SUPPORT - uint16_t id_; -#endif + JSValue arg = EventUtil::CreateEvent(EventUtil::EVENT_LONGPRESS, view, event); + EventUtil::InvokeCallback(JSUndefined::Create(), fn_, arg); + + return isStopPropagation_; + } jerry_value_t fn_; + bool isStopPropagation_; }; #ifdef JS_TOUCH_EVENT_SUPPORT class ViewOnTouchStartListener final : public UIView::OnTouchListener { public: ACE_DISALLOW_COPY_AND_MOVE(ViewOnTouchStartListener); - explicit ViewOnTouchStartListener(jerry_value_t fn, const uint16_t id); + ViewOnTouchStartListener(jerry_value_t fn, const uint16_t id); ~ViewOnTouchStartListener(); bool OnPress(UIView &view, const PressEvent &event) override; @@ -258,7 +200,7 @@ private: class KeyBoardEventListener final : public RootView::OnKeyActListener { public: ACE_DISALLOW_COPY_AND_MOVE(KeyBoardEventListener); - explicit KeyBoardEventListener(jerry_value_t fn, const uint16_t id); + KeyBoardEventListener(jerry_value_t fn, const uint16_t id); ~KeyBoardEventListener(); bool OnKeyAct(UIView &view, const KeyEvent &event) override; @@ -271,10 +213,9 @@ private: class ViewOnSwipeListener final : public UIView::OnDragListener { public: ACE_DISALLOW_COPY_AND_MOVE(ViewOnSwipeListener); - explicit ViewOnSwipeListener(jerry_value_t fn) - : SWIPE_LEFT("left"), SWIPE_RIGHT("right"), SWIPE_UP("up"), SWIPE_DOWN("down") + ViewOnSwipeListener(jerry_value_t fn, bool isStopPropagation) + : fn_(jerry_acquire_value(fn)), isStopPropagation_(isStopPropagation) { - fn_ = jerry_acquire_value(fn); } ~ViewOnSwipeListener() @@ -283,14 +224,11 @@ public: } bool OnDragStart(UIView& view, const DragEvent& event) override; - bool OnDragEnd(UIView &view, const DragEvent &event) override; + bool OnDragEnd(UIView& view, const DragEvent &event) override; private: jerry_value_t fn_; - const char * const SWIPE_LEFT; - const char * const SWIPE_RIGHT; - const char * const SWIPE_UP; - const char * const SWIPE_DOWN; + bool isStopPropagation_; }; class SliderEventListener final : public UISlider::UISliderEventListener { @@ -301,17 +239,18 @@ public: { jerry_release_value(bindChangeFunc_); } - void OnChange(int16_t progress) override + void OnChange(int32_t progress) override { jerry_value_t knobValue = jerry_create_number(progress); jerry_value_t args[1]; args[0] = jerry_create_object(); - constexpr char sliderAttrProgress[] = "progress"; - jerry_value_t result = jerryx_set_property_str(args[0], sliderAttrProgress, knobValue); - if (!jerry_value_is_error(result)) { + jerry_value_t result1 = jerryx_set_property_str(args[0], "value", knobValue); + // progress will be deprecated in next versions. + jerry_value_t result2 = jerryx_set_property_str(args[0], "progress", knobValue); + if (!jerry_value_is_error(result1) && !jerry_value_is_error(result2)) { CallJSFunctionAutoRelease(bindChangeFunc_, UNDEFINED, args, 1); } - ReleaseJerryValue(result, args[0], knobValue, VA_ARG_END_FLAG); + ReleaseJerryValue(result1, result2, args[0], knobValue, VA_ARG_END_FLAG); } void SetBindChangeFuncName(jerry_value_t bindChageFunc) diff --git a/frameworks/src/core/components/horizon_progress_component.cpp b/frameworks/src/core/components/horizon_progress_component.cpp new file mode 100644 index 0000000..f55d54e --- /dev/null +++ b/frameworks/src/core/components/horizon_progress_component.cpp @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "horizon_progress_component.h" + +namespace OHOS { +namespace ACELite { +HorizonProgressComponent::HorizonProgressComponent(jerry_value_t options, + jerry_value_t children, AppStyleManager *styleManager) + : Component(options, children, styleManager), + hStrokeWidth_(0) +{ +} + +bool HorizonProgressComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) +{ + if (attrKeyId == K_PERCENT) { + int16_t rangeMax = 100; + int16_t rangeMin = 0; + progressView_.SetRange(rangeMax, rangeMin); + progressView_.SetValue(IntegerOf(attrValue)); + return true; + } + + return false; +} + +bool HorizonProgressComponent::ApplyPrivateStyle(const AppStyleItem *style) +{ + return SetHorizonProgressStyle(style); +} + +bool HorizonProgressComponent::CreateNativeViews() +{ + // set default style for progress & background + Style progressStyle = StyleDefault::GetBrightColorStyle(); + Style backStyle = StyleDefault::GetBrightStyle(); + progressView_.SetForegroundStyle(progressStyle); + progressView_.SetBackgroundStyle(backStyle); + + // set default progress self border width + progressView_.SetForegroundStyle(STYLE_BORDER_WIDTH, 0); + progressView_.SetBackgroundStyle(STYLE_BORDER_WIDTH, 0); + const double alpha = 0.15; + progressView_.SetBackgroundStyle(STYLE_BACKGROUND_COLOR, + Color::GetColorFromRGBA(0xFF, 0xFF, 0xFF, alpha * 0xFF).full); + // set defaut progress stroke width & canvas width & canvas height & border width + const int16_t width = 4; + hStrokeWidth_ = width; + return true; +} + + +UIView *HorizonProgressComponent::GetComponentRootView() const +{ + return const_cast(&progressView_); +} + +bool HorizonProgressComponent::SetHorizonProgressStyle(const AppStyleItem *style) +{ + uint16_t stylePropNameId = GetStylePropNameId(style); + + switch (stylePropNameId) { + // Get stroke width. + case K_STROKE_WIDTH: { + hStrokeWidth_ = GetStylePixelValue(style); + break; + } + // Set horizon progress style: color. + case K_COLOR: { + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + if (!GetStyleColorValue(style, color, alpha)) { + return false; + } + progressView_.SetForegroundStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); + progressView_.SetForegroundStyle(STYLE_BACKGROUND_OPA, alpha); + break; + } + case K_BACKGROUND_COLOR: { + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + if (!GetStyleColorValue(style, color, alpha)) { + return false; + } + progressView_.SetBackgroundStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); + progressView_.SetBackgroundStyle(STYLE_BACKGROUND_OPA, alpha); + break; + } + default: { + return false; + } + } + return true; +} + +void HorizonProgressComponent::OnViewAttached() +{ + HandleExtraUpdate(); +} + +void HorizonProgressComponent::PostUpdate(uint16_t attrKeyId) +{ + UNUSED(attrKeyId); + HandleExtraUpdate(); +} + +void HorizonProgressComponent::HandleExtraUpdate() +{ + // set width & height of progress + if (progressView_.GetWidth() < 0) { + progressView_.SetValidWidth(0); + } else { + progressView_.SetValidWidth(progressView_.GetWidth()); + } + progressView_.SetValidHeight(hStrokeWidth_); +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/horizon_progress_component.h b/frameworks/src/core/components/horizon_progress_component.h new file mode 100644 index 0000000..774160e --- /dev/null +++ b/frameworks/src/core/components/horizon_progress_component.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_HORIZON_PROGRESS_COMPONENT_H +#define OHOS_ACELITE_HORIZON_PROGRESS_COMPONENT_H + +#include "component.h" +#include "non_copyable.h" +#include "ui_abstract_progress.h" + +namespace OHOS { +namespace ACELite { +class HorizonProgressComponent final : public Component { +public: + ACE_DISALLOW_COPY_AND_MOVE(HorizonProgressComponent); + HorizonProgressComponent() = delete; + HorizonProgressComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager); + ~HorizonProgressComponent() override {} + +protected: + UIView *GetComponentRootView() const override; + bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; + bool ApplyPrivateStyle(const AppStyleItem* style) override; + void PostUpdate(uint16_t attrKeyId) override; + void OnViewAttached() override; + void HandleExtraUpdate(); + bool CreateNativeViews() override; + +private: + bool SetHorizonProgressStyle(const AppStyleItem* style); + UIBoxProgress progressView_; + int16_t hStrokeWidth_; +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_HORIZON_PROGRESS_COMPONENT_H diff --git a/src/core/components/image_animator_component.cpp b/frameworks/src/core/components/image_animator_component.cpp similarity index 86% rename from src/core/components/image_animator_component.cpp rename to frameworks/src/core/components/image_animator_component.cpp index f06c194..6eacce0 100755 --- a/src/core/components/image_animator_component.cpp +++ b/frameworks/src/core/components/image_animator_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -30,6 +30,8 @@ constexpr char FUNC_GET_STATE[] = "getState"; constexpr char STATUS_PLAYING[] = "playing"; constexpr char STATUS_PAUSED[] = "paused"; constexpr char STATUS_STOPED[] = "stopped"; +constexpr char FILL_MODE_FORWRADS[] = "forwards"; +constexpr char FILL_MODE_NONE[] = "none"; ImageAnimatorComponent::ImageAnimatorComponent(jerry_value_t options, jerry_value_t children, @@ -53,13 +55,12 @@ ImageAnimatorComponent::ImageAnimatorComponent(jerry_value_t options, bool ImageAnimatorComponent::CreateNativeViews() { viewGroup_ = new UIViewGroup(); - if (viewGroup_ == nullptr) { return false; } viewGroup_->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); - imageAnimator_ = new UIImageAnimatorView(); + imageAnimator_ = new UIImageAnimatorView(); if (imageAnimator_ == nullptr) { delete (viewGroup_); viewGroup_ = nullptr; @@ -82,6 +83,19 @@ void ImageAnimatorComponent::ReleaseNativeViews() ACE_DELETE(onStopListener_); } +void ImageAnimatorComponent::SetViewExtraMsg() +{ + jerry_value_t *elementPtr = GetDomElementPointer(); + UIView::ViewExtraMsg *extraMsg = new UIView::ViewExtraMsg(); + if (extraMsg == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Failed to mapping native view with DOM element."); + return; + } + extraMsg->elementPtr = (void *)elementPtr; + viewGroup_->SetExtraMsg(extraMsg); + imageAnimator_->SetExtraMsg(extraMsg); +} + inline UIView *ImageAnimatorComponent::GetComponentRootView() const { return viewGroup_; @@ -90,6 +104,8 @@ inline UIView *ImageAnimatorComponent::GetComponentRootView() const bool ImageAnimatorComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) { switch (attrKeyId) { + case K_FILL_MODE: + return ParseToFillMode(attrValue); case K_FIXED_SIZE: return ParseToFixedSize(attrValue); case K_IMAGES: @@ -110,14 +126,16 @@ void ImageAnimatorComponent::PostRender() UpdateAnimator(); } -void ImageAnimatorComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) +void ImageAnimatorComponent::PostUpdate(uint16_t attrKeyId) { if ((K_IMAGES == attrKeyId) || (K_DURATION == attrKeyId)) { UpdateAnimator(); } } -bool ImageAnimatorComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +bool ImageAnimatorComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) { if (eventTypeId == K_STOP) { onStopListener_ = new ImageAnimatorStopListener(funcValue); @@ -132,6 +150,26 @@ bool ImageAnimatorComponent::RegisterPrivateEventListener(uint16_t eventTypeId, return false; } +bool ImageAnimatorComponent::ParseToFillMode(jerry_value_t value) const +{ + uint16_t size = 0; + char *fillMode = MallocStringOf(value, &size); + if (size == 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "fillmode is null or empty."); + ACE_FREE(fillMode); + return false; + } + if (!strcmp(fillMode, FILL_MODE_NONE)) { + imageAnimator_->SetFillMode(false); + } else if (!strcmp(fillMode, FILL_MODE_FORWRADS)) { + imageAnimator_->SetFillMode(true); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "fillmode is invalid."); + } + ACE_FREE(fillMode); + return true; +} + bool ImageAnimatorComponent::ParseToFixedSize(jerry_value_t value) const { if (!jerry_value_is_boolean(value)) { @@ -150,9 +188,9 @@ void ImageAnimatorComponent::ReleaseFrame() for (uint8_t idx = 0; idx < framesSize_; ++idx) { ImageAnimatorInfo frame = frames_[idx]; - if (frame.imageInfo != nullptr) { - ace_free(const_cast(frame.imageInfo)); - frame.imageInfo = nullptr; + if (frame.imagePath != nullptr) { + ace_free(const_cast(frame.imagePath)); + frame.imagePath = nullptr; } } ACE_FREE(frames_); @@ -194,7 +232,7 @@ bool ImageAnimatorComponent::ParseToFrames(jerry_value_t value) } ImageAnimatorInfo frame = {0}; - frame.imageInfo = ParseImageSrc(src); + frame.imagePath = ParseImageSrc(src); jerry_release_value(src); frame.width = JerryGetIntegerProperty(image, ATTR_WIDTH); frame.height = JerryGetIntegerProperty(image, ATTR_HEIGHT); @@ -202,6 +240,7 @@ bool ImageAnimatorComponent::ParseToFrames(jerry_value_t value) point.x = JerryGetIntegerProperty(image, ATTR_LEFT); point.y = JerryGetIntegerProperty(image, ATTR_TOP); frame.pos = point; + frame.imageType = IMG_SRC_FILE_PATH; jerry_release_value(image); frames_[idx] = frame; } @@ -255,7 +294,7 @@ bool ImageAnimatorComponent::ParseToDuration(jerry_value_t value) void ImageAnimatorComponent::UpdateAnimator() const { if (frames_ != nullptr && framesSize_ != 0 && duration_ != nullptr) { - imageAnimator_->SetImageAnimatorSrc(reinterpret_cast(frames_), framesSize_); + imageAnimator_->SetImageAnimatorSrc(frames_, framesSize_); int32_t millions = ParseToMilliseconds(duration_); uint16_t timeOfUpdate = 0; @@ -275,6 +314,7 @@ jerry_value_t ImageAnimatorComponent::StartAnimator(const jerry_value_t func, const jerry_value_t args[], const jerry_length_t size) { + UNUSED(func); ImageAnimatorComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); if (component == nullptr) { @@ -294,6 +334,7 @@ jerry_value_t ImageAnimatorComponent::PauseAnimator(const jerry_value_t func, const jerry_value_t args[], const jerry_length_t size) { + UNUSED(func); ImageAnimatorComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); if (component == nullptr) { @@ -313,6 +354,7 @@ jerry_value_t ImageAnimatorComponent::ResumeAnimator(const jerry_value_t func, const jerry_value_t args[], const jerry_length_t size) { + UNUSED(func); ImageAnimatorComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); if (component == nullptr) { @@ -332,6 +374,7 @@ jerry_value_t ImageAnimatorComponent::StopAnimator(const jerry_value_t func, const jerry_value_t args[], const jerry_length_t size) { + UNUSED(func); ImageAnimatorComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); if (component == nullptr) { @@ -352,6 +395,7 @@ jerry_value_t ImageAnimatorComponent::GetAnimatorState(const jerry_value_t func, const jerry_value_t args[], const jerry_length_t size) { + UNUSED(func); ImageAnimatorComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); if (component == nullptr) { diff --git a/src/core/components/image_animator_component.h b/frameworks/src/core/components/image_animator_component.h old mode 100755 new mode 100644 similarity index 94% rename from src/core/components/image_animator_component.h rename to frameworks/src/core/components/image_animator_component.h index 3926576..a571d15 --- a/src/core/components/image_animator_component.h +++ b/frameworks/src/core/components/image_animator_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -58,14 +58,16 @@ public: protected: bool CreateNativeViews() override; void ReleaseNativeViews() override; + void SetViewExtraMsg() override; UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; void PostRender() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; + void PostUpdate(uint16_t attrKeyId) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; private: void ReleaseFrame(); + bool ParseToFillMode(jerry_value_t value) const; bool ParseToFixedSize(jerry_value_t value) const; bool ParseToFrames(jerry_value_t value); bool ParseToIteration(jerry_value_t value) const; diff --git a/src/core/components/image_component.cpp b/frameworks/src/core/components/image_component.cpp old mode 100755 new mode 100644 similarity index 62% rename from src/core/components/image_component.cpp rename to frameworks/src/core/components/image_component.cpp index 9542ba0..244e550 --- a/src/core/components/image_component.cpp +++ b/frameworks/src/core/components/image_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -24,37 +24,23 @@ namespace OHOS { namespace ACELite { ImageComponent::ImageComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) - : Component(options, children, styleManager), imageView_(nullptr) + : Component(options, children, styleManager) { SetComponentName(K_IMAGE); } bool ImageComponent::CreateNativeViews() { - imageView_ = new UIImageView(); - - if (imageView_ == nullptr) { - return false; - } else { - // set default value - imageView_->SetAutoEnable(false); - const int16_t defaultOpacity = 0; - imageView_->SetStyle(STYLE_BACKGROUND_OPA, defaultOpacity); - } + // set default value + imageView_.SetAutoEnable(false); + const int16_t defaultOpacity = 0; + imageView_.SetStyle(STYLE_BACKGROUND_OPA, defaultOpacity); return true; } -void ImageComponent::ReleaseNativeViews() -{ - if (imageView_) { - delete imageView_; - imageView_ = nullptr; - } -} - inline UIView *ImageComponent::GetComponentRootView() const { - return imageView_; + return const_cast(&imageView_); } bool ImageComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) @@ -63,7 +49,7 @@ bool ImageComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrV switch (attrKeyId) { case K_SRC: { char *src = const_cast(ParseImageSrc(attrValue)); - imageView_->SetSrc(src); + imageView_.SetSrc(src); ACE_FREE(src); break; } @@ -74,18 +60,5 @@ bool ImageComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrV return setResult; } - -bool ImageComponent::ApplyPrivateStyle(const AppStyleItem *style) -{ - uint16_t styleKey = style->GetPropNameId(); - switch (styleKey) { - case K_OPACITY: { - SetOpacity(*imageView_, *style); - return true; - } - default: - return false; - } -} } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/image_component.h b/frameworks/src/core/components/image_component.h old mode 100755 new mode 100644 similarity index 88% rename from src/core/components/image_component.h rename to frameworks/src/core/components/image_component.h index 3f1e2ee..7fe8633 --- a/src/core/components/image_component.h +++ b/frameworks/src/core/components/image_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -33,13 +33,11 @@ public: protected: bool CreateNativeViews() override; - void ReleaseNativeViews() override; UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; - bool ApplyPrivateStyle(const AppStyleItem *style) override; private: - UIImageView *imageView_; + UIImageView imageView_; }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/components/input_button_component.cpp b/frameworks/src/core/components/input_button_component.cpp new file mode 100755 index 0000000..6172a98 --- /dev/null +++ b/frameworks/src/core/components/input_button_component.cpp @@ -0,0 +1,251 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "input_button_component.h" +#include "ace_log.h" +#include "ace_mem_base.h" +#include "font/ui_font_header.h" +#include "js_app_context.h" +#include "js_fwk_common.h" +#include "key_parser.h" +#include "keys.h" +#include "product_adapter.h" +#include "ui_button.h" + +namespace OHOS { +namespace ACELite { +bool InputButtonComponent::CreateNativeViews() +{ + fontSize_ = ProductAdapter::GetDefaultFontSize(); + // set font family + if (!CopyFontFamily(fontFamily_, ProductAdapter::GetDefaultFontFamilyName())) { + return false; + } + const uint8_t defaultWidth = 100; + const uint8_t defaultHeight = 50; + button_.SetWidth(defaultWidth); + button_.SetHeight(defaultHeight); + button_.SetStateForStyle(UIButton::ButtonState::PRESSED); + button_.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + button_.SetStateForStyle(UIButton::ButtonState::RELEASED); + button_.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + return true; +} + +void InputButtonComponent::ReleaseNativeViews() +{ + if (clickListener_ != nullptr) { + delete clickListener_; + clickListener_ = nullptr; + } + ACE_FREE(textValue_); + ACE_FREE(fontFamily_); + ACE_FREE(normalBackGroundImg_); + ACE_FREE(pressedBackGroundImg_); +} +bool InputButtonComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) +{ + switch (attrKeyId) { + case K_VALUE: + ACE_FREE(textValue_); + textValue_ = MallocStringOf(attrValue); + return true; + default: + return false; + } +} + +bool InputButtonComponent::ApplyPrivateStyle(const AppStyleItem *style) +{ + bool result = true; + uint16_t styleKey = GetStylePropNameId(style); + switch (styleKey) { + case K_FONT_SIZE: + result = SetFontSize(style); + break; + case K_FONT_FAMILY: + if (IsStyleValueTypeString(style)) { + // the style would be freed after this method + result = CopyFontFamily(fontFamily_, GetStyleStrValue(style)); + } else { + result = false; + } + break; + case K_TEXT_ALIGN: + result = SetTextAlign(style); + break; + case K_COLOR: + result = SetColor(*style); + break; + case K_BACKGROUND_COLOR: + result = SetBackgroundColor(*style); + break; + case K_BACKGROUND_IMAGE: + result = HandleBackgroundImg(*style, pressedBackGroundImg_, normalBackGroundImg_); + break; + case K_PADDING: + // fall through + case K_PADDING_BOTTOM: + // fall through + case K_PADDING_LEFT: + // fall through + case K_PADDING_RIGHT: + // fall through + case K_PADDING_TOP: + // fall through + case K_BORDER_BOTTOM_WIDTH: + // fall through + case K_BORDER_LEFT_WIDTH: + // fall through + case K_BORDER_RIGHT_WIDTH: + // fall through + case K_BORDER_TOP_WIDTH: + // fall through + case K_BORDER_WIDTH: + // fall through + case K_BORDER_BOTTOM_COLOR: + // fall through + case K_BORDER_LEFT_COLOR: + // fall through + case K_BORDER_RIGHT_COLOR: + // fall through + case K_BORDER_TOP_COLOR: + // fall through + case K_BORDER_COLOR: + // fall through + case K_BORDER_RADIUS: { + button_.SetStateForStyle(UIButton::ButtonState::PRESSED); + bool pressResult = ApplyCommonStyle(button_, style); + button_.SetStateForStyle(UIButton::ButtonState::RELEASED); + bool releaseResult = ApplyCommonStyle(button_, style); + result = pressResult && releaseResult; + break; + } + default: + result = false; + break; + } + return result; +} + +bool InputButtonComponent::SetBackgroundColor(const AppStyleItem &style) +{ + if (style.GetPseudoClassType() != PSEUDO_CLASS_ACTIVE) { + // let parent handle the normal state background color style, + // will be set for released state style of ui button + button_.SetStateForStyle(UIButton::ButtonState::PRESSED); + Component::SetBackgroundColor(button_, style); + button_.SetStateForStyle(UIButton::ButtonState::RELEASED); + Component::SetBackgroundColor(button_, style); + return true; + } + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + if (!GetStyleColorValue(&style, color, alpha)) { + return false; + } + pressedBackGroundColorValue_ = color; + pressedOpacityValue_ = alpha; + return true; +} + +bool InputButtonComponent::SetColor(const AppStyleItem &style) +{ + uint32_t color = 0; + uint8_t alpha = OPA_OPAQUE; + if (GetStyleColorValue(&style, color, alpha)) { + button_.SetLabelStyle(STYLE_TEXT_COLOR, GetRGBColor(color).full); + button_.SetLabelStyle(STYLE_TEXT_OPA, alpha); + return true; + } + return false; +} + +bool InputButtonComponent::SetTextAlign(const AppStyleItem *style) +{ + if ((!IsStyleValueTypeString(style)) || (!GetStyleStrValue(style))) { + HILOG_ERROR(HILOG_MODULE_ACE, "the type of style align is error"); + return false; + } + uint16_t valueId = KeyParser::ParseKeyId(GetStyleStrValue(style), GetStyleStrValueLen(style)); + switch (valueId) { + case K_LEFT: + button_.SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT); + return true; + case K_CENTER: + button_.SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); + return true; + case K_RIGHT: + button_.SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_RIGHT); + return true; + default: + HILOG_ERROR(HILOG_MODULE_ACE, "the value of text-align in input component is error"); + return false; + } +} + +bool InputButtonComponent::SetFontSize(const AppStyleItem *style) +{ + fontSize_ = GetStylePixelValue(style); + return true; +} +void InputButtonComponent::PostRender() +{ + if (textValue_ != nullptr && fontFamily_ != nullptr) { + button_.SetFont(fontFamily_, fontSize_); + button_.SetText(textValue_); + } + if (clickListener_ != nullptr) { + button_.SetOnClickListener(clickListener_); + } + if (pressedBackGroundColorValue_ >= 0) { + button_.SetStateForStyle(UIButton::ButtonState::PRESSED); + button_.SetStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(pressedBackGroundColorValue_).full); + button_.SetStyle(STYLE_BACKGROUND_OPA, pressedOpacityValue_); + } + if (normalBackGroundImg_ != nullptr || pressedBackGroundImg_ != nullptr) { + // make sure the normal and pressed image same in case user only set one of them + char *normalImg = (normalBackGroundImg_ == nullptr) ? pressedBackGroundImg_ : normalBackGroundImg_; + char *pressedImg = (pressedBackGroundImg_ == nullptr) ? normalBackGroundImg_ : pressedBackGroundImg_; + button_.SetImageSrc(normalImg, pressedImg); + } + ACE_FREE(normalBackGroundImg_); + ACE_FREE(pressedBackGroundImg_); +} + +void InputButtonComponent::PostUpdate(uint16_t attrKeyId) +{ + if (!KeyParser::IsKeyValid(attrKeyId)) { + HILOG_ERROR(HILOG_MODULE_ACE, "input component post update check args failed"); + return; + } + switch (attrKeyId) { + case K_VALUE: + if (textValue_ != nullptr) { + button_.SetText(textValue_); + } + break; + case K_FONT_SIZE: + case K_FONT_FAMILY: + if (fontFamily_ != nullptr) { + button_.SetFont(fontFamily_, fontSize_); + } + break; + default: + break; + } +} +} // namespace ACELite +} // namespace OHOS diff --git a/src/core/components/input_component.h b/frameworks/src/core/components/input_button_component.h similarity index 61% rename from src/core/components/input_component.h rename to frameworks/src/core/components/input_button_component.h index 6030319..6c39371 100755 --- a/src/core/components/input_component.h +++ b/frameworks/src/core/components/input_button_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2021 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 @@ -12,28 +12,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef OHOS_ACELITE_INPUT_COMPONENT_H -#define OHOS_ACELITE_INPUT_COMPONENT_H +#ifndef OHOS_ACELITE_INPUT_BUTTON_COMPONENT_H +#define OHOS_ACELITE_INPUT_BUTTON_COMPONENT_H #include "component.h" #include "key_parser.h" #include "non_copyable.h" -#include "ui_checkbox.h" #include "ui_label_button.h" -#include "ui_radio_button.h" namespace OHOS { namespace ACELite { -class InputComponent final : public Component { +class InputButtonComponent final : public Component { public: - ACE_DISALLOW_COPY_AND_MOVE(InputComponent); - InputComponent() = delete; - InputComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *manager) + ACE_DISALLOW_COPY_AND_MOVE(InputButtonComponent); + InputButtonComponent() = delete; + InputButtonComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *manager) : Component(options, children, manager), options_(options), - checkbox_(nullptr), - button_(nullptr), - radioButton_(nullptr), - changeListener_(nullptr), clickListener_(nullptr), pressedBackGroundColorValue_(-1), normalBackGroundImg_(nullptr), @@ -46,41 +40,29 @@ public: pressedOpacityValue_ = pressedOpacityValue; SetComponentName(K_INPUT); } - ~InputComponent() override {} + ~InputButtonComponent() override {}; bool CreateNativeViews() override; void ReleaseNativeViews() override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; bool ApplyPrivateStyle(const AppStyleItem *style) override; void PostRender() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; + void PostUpdate(uint16_t attrKeyId) override; protected: UIView *GetComponentRootView() const override { - if (checkbox_ != nullptr) { - return checkbox_; - } else if (radioButton_ != nullptr) { - return radioButton_; - } else { - return button_; - } + return const_cast(&button_); } private: - bool SetTextAlign(const AppStyleItem *style) const; + bool SetTextAlign(const AppStyleItem *style); bool SetFontSize(const AppStyleItem *style); - bool HandleButtonBackGroundImg(const AppStyleItem &styleItem); void DealEvent(); - void CreateCheckboxOrRadio(); bool SetBackgroundColor(const AppStyleItem &style); - bool SetColor(const AppStyleItem &style) const; + bool SetColor(const AppStyleItem &style); bool HandleImage(const AppStyleItem &style); jerry_value_t options_; - UICheckBox *checkbox_; - UILabelButton *button_; - UIRadioButton *radioButton_; - StateChangeListener *changeListener_; + UILabelButton button_; ViewOnClickListener *clickListener_; int32_t pressedBackGroundColorValue_; uint8_t pressedOpacityValue_; @@ -92,4 +74,4 @@ private: }; } // namespace ACELite } // namespace OHOS -#endif // OHOS_ACELITE_INPUT_COMPONENT_H +#endif // OHOS_ACELITE_INPUT_BUTTON_COMPONENT_H diff --git a/frameworks/src/core/components/input_checkbox_component.cpp b/frameworks/src/core/components/input_checkbox_component.cpp new file mode 100755 index 0000000..f4021ca --- /dev/null +++ b/frameworks/src/core/components/input_checkbox_component.cpp @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "input_checkbox_component.h" +#include "ace_log.h" +#include "ace_mem_base.h" +#include "js_app_context.h" +#include "js_fwk_common.h" +#include "key_parser.h" +#include "keys.h" + +namespace OHOS { +namespace ACELite { +InputCheckboxComponent::~InputCheckboxComponent() +{ + if (changeListener_ != nullptr) { + delete changeListener_; + changeListener_ = nullptr; + } + if (clickListener_ != nullptr) { + delete clickListener_; + clickListener_ = nullptr; + } + ACE_FREE(normalBackGroundImg_); + ACE_FREE(pressedBackGroundImg_); +} + +bool InputCheckboxComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) +{ + switch (attrKeyId) { + case K_CHECKED: + // set the state of checkbox and radioButton + if (jerry_value_is_boolean(attrValue)) { + bool checked = jerry_get_boolean_value(attrValue); + UICheckBox::UICheckBoxState state = + checked ? UICheckBox::UICheckBoxState::SELECTED : UICheckBox::UICheckBoxState::UNSELECTED; + checkbox_.SetState(state); + return true; + } + HILOG_ERROR(HILOG_MODULE_ACE, "the checkbox checked is error value"); + return false; + default: + return false; + } +} + +bool InputCheckboxComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) +{ + if (eventTypeId == K_CHANGE) { + changeListener_ = new StateChangeListener(funcValue); + if (changeListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create change listener failed"); + return false; + } + return true; + } + if (eventTypeId == K_CLICK) { + clickListener_ = new ViewOnClickListener(funcValue, isStopPropagation); + if (clickListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); + return false; + } + return true; + } + HILOG_DEBUG(HILOG_MODULE_ACE, "go to common click event"); + return false; +} + +bool InputCheckboxComponent::ApplyPrivateStyle(const AppStyleItem *style) +{ + uint16_t styleKey = GetStylePropNameId(style); + if (styleKey == K_BACKGROUND_IMAGE) { + return HandleBackgroundImg(*style, pressedBackGroundImg_, normalBackGroundImg_); + } + + return false; +} + +void InputCheckboxComponent::PostRender() +{ + DealEvent(); + ACE_FREE(normalBackGroundImg_); + ACE_FREE(pressedBackGroundImg_); +} + +void InputCheckboxComponent::DealEvent() +{ + if (changeListener_ != nullptr) { + bool state = (checkbox_.GetState() == UICheckBox::UICheckBoxState::SELECTED); + changeListener_->SetState(state); + checkbox_.SetOnChangeListener(changeListener_); + if (clickListener_ == nullptr) { + // trigger changeEvent + clickListener_ = new ViewOnClickListener(UNDEFINED, true); + if (clickListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); + return; + } + } + clickListener_->SetComponentListener(changeListener_); + checkbox_.SetOnClickListener(clickListener_); + } + + if (normalBackGroundImg_ != nullptr || pressedBackGroundImg_ != nullptr) { + // make sure the normal and pressed image same in case user only set one of them + char *normalImg = (normalBackGroundImg_ == nullptr) ? pressedBackGroundImg_ : normalBackGroundImg_; + char *pressedImg = (pressedBackGroundImg_ == nullptr) ? normalBackGroundImg_ : pressedBackGroundImg_; + checkbox_.SetImages(pressedImg, normalImg); + } +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/input_checkbox_component.h b/frameworks/src/core/components/input_checkbox_component.h new file mode 100755 index 0000000..493041e --- /dev/null +++ b/frameworks/src/core/components/input_checkbox_component.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef OHOS_ACELITE_INPUT_CHECKBOX_COMPONENT_H +#define OHOS_ACELITE_INPUT_CHECKBOX_COMPONENT_H +#include "component.h" +#include "key_parser.h" +#include "non_copyable.h" +#include "ui_checkbox.h" + +namespace OHOS { +namespace ACELite { +class InputCheckboxComponent final : public Component { +public: + ACE_DISALLOW_COPY_AND_MOVE(InputCheckboxComponent); + InputCheckboxComponent() = delete; + InputCheckboxComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *manager) + : Component(options, children, manager), + changeListener_(nullptr), + clickListener_(nullptr), + normalBackGroundImg_(nullptr), + pressedBackGroundImg_(nullptr) + { + SetComponentName(K_INPUT); + } + ~InputCheckboxComponent() override; + bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; + bool ApplyPrivateStyle(const AppStyleItem *style) override; + void PostRender() override; + +protected: + UIView *GetComponentRootView() const override + { + return const_cast(&checkbox_); + } + +private: + void DealEvent(); + UICheckBox checkbox_; + StateChangeListener *changeListener_; + ViewOnClickListener *clickListener_; + char *normalBackGroundImg_; + char *pressedBackGroundImg_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_INPUT_CHECKBOX_COMPONENT_H diff --git a/frameworks/src/core/components/input_radio_component.cpp b/frameworks/src/core/components/input_radio_component.cpp new file mode 100755 index 0000000..ef5e64e --- /dev/null +++ b/frameworks/src/core/components/input_radio_component.cpp @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "input_radio_component.h" +#include "ace_log.h" +#include "ace_mem_base.h" +#include "js_app_context.h" +#include "js_fwk_common.h" +#include "key_parser.h" +#include "keys.h" + + +namespace OHOS { +namespace ACELite { +void InputRadioComponent::ReleaseNativeViews() +{ + if (changeListener_ != nullptr) { + delete changeListener_; + changeListener_ = nullptr; + } + if (clickListener_ != nullptr) { + delete clickListener_; + clickListener_ = nullptr; + } + ACE_FREE(normalBackGroundImg_); + ACE_FREE(pressedBackGroundImg_); +} +bool InputRadioComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) +{ + switch (attrKeyId) { + case K_CHECKED: { + if (jerry_value_is_boolean(attrValue)) { + bool checked = jerry_get_boolean_value(attrValue); + UICheckBox::UICheckBoxState state = + checked ? UICheckBox::UICheckBoxState::SELECTED : UICheckBox::UICheckBoxState::UNSELECTED; + radioButton_.SetState(state); + return true; + } + HILOG_ERROR(HILOG_MODULE_ACE, "the checkbox checked is error value"); + return false; + } + case K_NAME: { + char *name = MallocStringOf(attrValue); + if (name == nullptr) { + const char * const tmpName = ""; + radioButton_.SetName(tmpName); + } else { + radioButton_.SetName(name); + ACE_FREE(name); + } + return true; + } + default: + break; + } + return false; +} + +bool InputRadioComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) +{ + if (eventTypeId == K_CHANGE) { + changeListener_ = new StateChangeListener(funcValue); + if (changeListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create change listener failed"); + return false; + } + return true; + } + if (eventTypeId == K_CLICK) { + clickListener_ = new ViewOnClickListener(funcValue, isStopPropagation); + if (clickListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); + return false; + } + return true; + } + return false; +} + +bool InputRadioComponent::ApplyPrivateStyle(const AppStyleItem *style) +{ + uint16_t styleKey = GetStylePropNameId(style); + if (styleKey == K_BACKGROUND_IMAGE) { + return HandleBackgroundImg(*style, pressedBackGroundImg_, normalBackGroundImg_); + } + return false; +} + +void InputRadioComponent::PostRender() +{ + DealEvent(); + ACE_FREE(normalBackGroundImg_); + ACE_FREE(pressedBackGroundImg_); +} + +void InputRadioComponent::DealEvent() +{ + if (changeListener_ != nullptr) { + bool state = (radioButton_.GetState() == UICheckBox::UICheckBoxState::SELECTED); + changeListener_->SetState(state); + radioButton_.SetOnChangeListener(changeListener_); + } + + if (clickListener_ == nullptr) { + // trigger changeEvent + clickListener_ = new ViewOnClickListener(UNDEFINED, true); + if (clickListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); + return; + } + } + + clickListener_->SetComponentListener(changeListener_); + radioButton_.SetOnClickListener(clickListener_); + + if (normalBackGroundImg_ != nullptr || pressedBackGroundImg_ != nullptr) { + // make sure the normal and pressed image same in case user only set one of them + char *normalImg = (normalBackGroundImg_ == nullptr) ? pressedBackGroundImg_ : normalBackGroundImg_; + char *pressedImg = (pressedBackGroundImg_ == nullptr) ? normalBackGroundImg_ : pressedBackGroundImg_; + radioButton_.SetImages(pressedImg, normalImg); + } +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/input_radio_component.h b/frameworks/src/core/components/input_radio_component.h new file mode 100755 index 0000000..12df8ef --- /dev/null +++ b/frameworks/src/core/components/input_radio_component.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef OHOS_ACELITE_INPUT_RADIO_COMPONENT_H +#define OHOS_ACELITE_INPUT_RADIO_COMPONENT_H +#include "component.h" +#include "key_parser.h" +#include "non_copyable.h" +#include "ui_radio_button.h" + +namespace OHOS { +namespace ACELite { +class InputRadioComponent final : public Component { +public: + ACE_DISALLOW_COPY_AND_MOVE(InputRadioComponent); + InputRadioComponent() = delete; + InputRadioComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *manager) + : Component(options, children, manager), + changeListener_(nullptr), + clickListener_(nullptr), + normalBackGroundImg_(nullptr), + pressedBackGroundImg_(nullptr) + { + SetComponentName(K_INPUT); + } + ~InputRadioComponent() override {} + void ReleaseNativeViews() override; + bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; + bool ApplyPrivateStyle(const AppStyleItem *style) override; + void PostRender() override; + +protected: + UIView *GetComponentRootView() const override + { + return const_cast(&radioButton_); + } + +private: + void DealEvent(); + UIRadioButton radioButton_; + StateChangeListener *changeListener_; + ViewOnClickListener *clickListener_; + char *normalBackGroundImg_; + char *pressedBackGroundImg_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_INPUT_RADIO_COMPONENT_H diff --git a/src/core/components/list_adapter.cpp b/frameworks/src/core/components/list_adapter.cpp similarity index 90% rename from src/core/components/list_adapter.cpp rename to frameworks/src/core/components/list_adapter.cpp index 70af92e..57b04f5 100755 --- a/src/core/components/list_adapter.cpp +++ b/frameworks/src/core/components/list_adapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -22,14 +22,17 @@ #include "component_utils.h" #include "directive/descriptor_utils.h" #include "fatal_handler.h" -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) namespace OHOS { namespace ACELite { ListAdapter::ListAdapter() - : listItems_(nullptr), headNode_(nullptr), tailNode_(nullptr), itemsCount_(0), listItemsCount_(0) + : listItems_(nullptr), + headNode_(nullptr), + tailNode_(nullptr), + itemsCount_(0), + listItemsCount_(0), + uiListContentParam_() { } @@ -182,22 +185,19 @@ int16_t ListAdapter::CalculateItemIndex(int16_t itemIndex) const return FAILED; } -// 1. get UIView according to index which will show in list. -// 2. delete inView if it is not null(if inView not null, it means this view is out of the list visible area, need -// delete.) if the UIView found belongs to "For type" child, need create it dynamically, or else just get it from native -// Element. UIView *ListAdapter::GetView(UIView *inView, int16_t index) { if (index < 0) { return nullptr; } - - // find listItemsIndex according the item index + // 1. get UIView according to index which will show in list. int16_t listItemsIndex = CalculateItemIndex(index); if (listItemsIndex < 0) { return nullptr; } - // delete "For type" UIView that are not visible in list + // 2. delete inView if it is not null(if inView not null, it means this view is out of the list visible area, need + // delete.) if the UIView found belongs to "For type" child, need create it dynamically, + // or else just get it from native Element. if (inView != nullptr) { // this function will check whether the inView is For type UIView, if it is, delete it, or else do nothing. DeleteItem(inView); @@ -234,17 +234,14 @@ JSValue ListAdapter::GetElement(int16_t listItemsIndex, int16_t index, bool &isF // if it is a for or for+if type list-item, we need create view dynamically. if (isFor) { // get render argument - const int8_t argsLen = 2; JSValue item = jerry_get_property_by_index(getterRetList, index - startIndex); if (jerry_value_is_undefined(item)) { HILOG_ERROR(HILOG_MODULE_ACE, "List adapter: Get item from getterRetList failed."); return UNDEFINED; } JSValue itemIdx = jerry_create_number(index - startIndex); - JSValue args[argsLen]; - args[0] = {item}; - args[1] = {itemIdx}; - + const int8_t argsLen = 2; + JSValue args[argsLen] = {item, itemIdx}; // get render function JSValue renderPropValue = jerryx_get_property_str(descriptorOrElement, DESCRIPTOR_ATTR_RENDER); if (!jerry_value_is_function(renderPropValue)) { @@ -252,15 +249,13 @@ JSValue ListAdapter::GetElement(int16_t listItemsIndex, int16_t index, bool &isF ReleaseJerryValue(item, itemIdx, renderPropValue, VA_ARG_END_FLAG); return UNDEFINED; } - // excute render function, get nativeElement JSValue nativeElement = CallJSFunction(renderPropValue, UNDEFINED, args, argsLen); if (jerry_value_is_undefined(nativeElement)) { ReleaseJerryValue(item, itemIdx, renderPropValue, nativeElement, VA_ARG_END_FLAG); return UNDEFINED; } - - // if it is a for+if type list-item, here will ignore if attribure + // if it is a for+if type list-item, here will ignore if attribute if (DescriptorUtils::IsIfDescriptor(nativeElement)) { element = DescriptorUtils::GetDescriptorRendered(nativeElement); if (IS_UNDEFINED(element)) { @@ -280,14 +275,24 @@ JSValue ListAdapter::GetElement(int16_t listItemsIndex, int16_t index, bool &isF } else { // if it is a common list-item element = descriptorOrElement; } + BuildItemViewTree(element); return element; } +void ListAdapter::BuildItemViewTree(const JSValue element) const +{ + Component *component = ComponentUtils::GetComponentFromBindingObject(element); + if (component == nullptr) { + return; + } + ConstrainedParameter parentParam = uiListContentParam_; + Component::BuildViewTree(component, nullptr, parentParam); + component->OnViewAttached(); +} + void ListAdapter::InsertItem(JSValue nativeElement, UIView *uiView) { - ViewNativePair *insertNode; - - insertNode = (ViewNativePair *)ace_malloc(sizeof(ViewNativePair)); + ViewNativePair *insertNode = reinterpret_cast(ace_malloc(sizeof(ViewNativePair))); if (insertNode == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "List adapter: insertNode failed to allocate memory!"); return; @@ -312,12 +317,8 @@ void ListAdapter::InsertItem(JSValue nativeElement, UIView *uiView) void ListAdapter::DeleteItem(const UIView *uiView) { - ViewNativePair *delNode; - ViewNativePair *preNode; - - // delNode point to head node. - delNode = headNode_; - preNode = nullptr; + ViewNativePair *delNode = headNode_; + ViewNativePair *preNode = nullptr; // if viewNativePair not exsit, can not confirm whether the uiView is belongs For type child or common child, // although it can not be deleted, does not effect rendering new View. @@ -348,7 +349,7 @@ void ListAdapter::DeleteItem(const UIView *uiView) tailNode_ = preNode; } } else { - // Do nothing + HILOG_WARN(HILOG_MODULE_ACE, "item to be deleted is not found"); } DescriptorUtils::ReleaseDescriptorOrElement(delNode->nativeElement); @@ -371,5 +372,10 @@ void ListAdapter::CleanUp() listItems_ = nullptr; } } + +void ListAdapter::UpdateContentAlignParam(ConstrainedParameter param) +{ + uiListContentParam_ = param; +} } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/list_adapter.h b/frameworks/src/core/components/list_adapter.h old mode 100755 new mode 100644 similarity index 83% rename from src/core/components/list_adapter.h rename to frameworks/src/core/components/list_adapter.h index b88bf37..b865e91 --- a/src/core/components/list_adapter.h +++ b/frameworks/src/core/components/list_adapter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -17,6 +17,7 @@ #define OHOS_ACELITE_LIST_ADAPTER_H #include "abstract_adapter.h" +#include "component.h" #include "js_fwk_common.h" #include "non_copyable.h" @@ -45,8 +46,14 @@ public: ListAdapter(); ~ListAdapter(); bool Initialize(const JSValue descriptors); - // Get the view from index. - // if inView is null, adapter will new a view. if not, adapter will delete the inView and new a view. + + /** + * @brief get view from index. + * if inView is null, adapter will new a view. if not, adapter will delete the inView and new a view. + * @param inview the list object + * index the item index + * @return the special number view in list + */ UIView *GetView(UIView *inView, int16_t index) override; void DeleteView(UIView *&view) override {} @@ -57,6 +64,8 @@ public: void CleanUp(); + void UpdateContentAlignParam(ConstrainedParameter param); + private: bool GenerateListItems(const JSValue descriptors, int16_t size); int16_t CalculateItemIndex(int16_t itemIndex) const; @@ -64,11 +73,14 @@ private: bool AddForDescriptorToList(JSValue descriptorOrElement, int16_t listItemsIndex) const; void InsertItem(JSValue nativeElement, UIView *uiView); void DeleteItem(const UIView *uiView); + void BuildItemViewTree(const JSValue element) const; ListItemValue *listItems_; ViewNativePair *headNode_; ViewNativePair *tailNode_; int16_t itemsCount_; int16_t listItemsCount_; + // the content area + ConstrainedParameter uiListContentParam_; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/list_component.cpp b/frameworks/src/core/components/list_component.cpp similarity index 62% rename from src/core/components/list_component.cpp rename to frameworks/src/core/components/list_component.cpp index c01df3a..0c14417 100755 --- a/src/core/components/list_component.cpp +++ b/frameworks/src/core/components/list_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -26,62 +26,30 @@ namespace ACELite { const char * const ListComponent::FUNC_SCROLLTO = "scrollTo"; const char * const ListComponent::INDEX_SCROLLTO = "index"; ListComponent::ListComponent(JSValue options, JSValue children, AppStyleManager *styleManager) - : Component(options, children, styleManager), - list_(nullptr), - adapter_(nullptr), - combinedStyle_(nullptr), - listEventListener_(nullptr), - flexDirectionDefault("column") + : Component(options, children, styleManager) { SetComponentName(K_LIST); RegisterNamedFunction(FUNC_SCROLLTO, ListScrollTo); - combinedStyle_ = styleManager->GetCombinedStyle(); +#ifdef FEATURE_ROTATION_API + RegisterNamedFunction(FUNC_ROTATION_NAME, HandleRotationRequest); +#endif // FEATURE_ROTATION_API } // Create list bool ListComponent::CreateNativeViews() { - if (combinedStyle_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "get list style failed"); - return false; - } - - // Step1. get list flex-direction - const AppStyleItem *item = combinedStyle_->GetStyleItemByNameId(K_FLEX_DIRECTION); - const char * const directionValue = (item == nullptr) ? flexDirectionDefault : item->GetStrValue(); - if (directionValue == nullptr) { - return false; - } - size_t directionValueLength = (item == nullptr) ? strlen(flexDirectionDefault) : item->GetStrValueLen(); - uint16_t directionValueId = KeyParser::ParseKeyId(directionValue, directionValueLength); - // Step2. create list - if (directionValueId == K_ROW) { - list_ = new UIList(UIList::HORIZONTAL); - } else { - list_ = new UIList(UIList::VERTICAL); - } - - if (list_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create native list view failed"); - return false; - } - // set list default attributes - list_->SetThrowDrag(true); + list_.SetThrowDrag(true); // list event listener position const int16_t listenPosition = 10; - list_->SetSelectPosition(listenPosition); - + list_.SetSelectPosition(listenPosition); return true; } void ListComponent::ReleaseNativeViews() { - if (list_) { - list_->RemoveAll(); - delete list_; - list_ = nullptr; - } + list_.RemoveAll(); + // only let list component release its children when the whole application // is not in fatal error handling process, as FatalHandler will do the recycle if (!FatalHandler::GetInstance().IsFatalErrorHandling()) { @@ -89,32 +57,36 @@ void ListComponent::ReleaseNativeViews() DescriptorUtils::ReleaseDescriptorOrElements(GetDescriptors()); } } - if (adapter_) { - delete adapter_; - adapter_ = nullptr; - } - if (listEventListener_) { - delete listEventListener_; - listEventListener_ = nullptr; - } } UIView *ListComponent::GetComponentRootView() const { - return list_; + return const_cast(&list_); } -bool ListComponent::RegisterPrivateEventListener(uint16_t eventTypeId, JSValue funcValue) +bool ListComponent::ApplyPrivateStyle(const AppStyleItem *style) { - if (listEventListener_ == nullptr) { - listEventListener_ = new ListEventListener(); - if (listEventListener_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create list listener failed"); - return false; - } - list_->SetScrollStateListener(listEventListener_); + uint16_t stylePropNameId = GetStylePropNameId(style); + if (stylePropNameId != K_FLEX_DIRECTION) { + return false; } + const char * const strValue = GetStyleStrValue(style); + if (strValue == nullptr) { + return true; + } + + uint16_t valueId = KeyParser::ParseKeyId(strValue, GetStyleStrValueLen(style)); + if (valueId == K_ROW) { + list_.SetDirection(UIList::HORIZONTAL); + } + return true; +} + +bool ListComponent::RegisterPrivateEventListener(uint16_t eventTypeId, JSValue funcValue, bool isStopPropagation) +{ + list_.SetScrollStateListener(&listEventListener_); + switch (eventTypeId) { // list specific event switch #ifdef FEATURE_LIST_SPECIFIC_EVENT_ENABLE @@ -129,7 +101,7 @@ bool ListComponent::RegisterPrivateEventListener(uint16_t eventTypeId, JSValue f #endif // FEATURE_LIST_SPECIFIC_EVENT_ENABLE // when scroll end, this listening event will be triggered case K_SCROLLEND: - listEventListener_->SetBindScrollEndFuncName(funcValue); + listEventListener_.SetBindScrollEndFuncName(funcValue); break; default: return false; @@ -150,32 +122,26 @@ bool ListComponent::ProcessChildren() HandleListForDireactive(); // Step3. create list adapter - adapter_ = new ListAdapter(); - if (adapter_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create list adapter failed"); - return false; - } - bool ret = adapter_->Initialize(descriptors); + bool ret = adapter_.Initialize(descriptors); if (!ret) { - delete adapter_; - adapter_ = nullptr; HILOG_ERROR(HILOG_MODULE_ACE, "Initialize list adapter failed."); return false; } - // Step4. add children to list dynamically. - list_->SetAdapter(adapter_); - return true; } +void ListComponent::OnViewAttached() +{ + ConstrainedParameter listParameter; + GetConstrainedParam(listParameter); + adapter_.UpdateContentAlignParam(listParameter); + // Step4. add children to list dynamically. + list_.SetAdapter(&adapter_); +} + bool ListComponent::UpdateForView() { - if ((adapter_ == nullptr) || (list_ == nullptr)) { - HILOG_ERROR(HILOG_MODULE_ACE, "List Component: adapter or list is null, UpdateForView failed."); - return false; - } - // Step1. get new children, if not exsit, return false. const JSValue descriptors = GetDescriptors(); if (jerry_value_is_undefined(descriptors)) { @@ -186,22 +152,22 @@ bool ListComponent::UpdateForView() // free listItems_ array memory and reset listItemCount_. // here not need delete UIView and free viewNativePair_ link list memory, // it will be excuted in RefreshList() function. - adapter_->CleanUp(); + adapter_.CleanUp(); // save all children's information into listItems_ array(contain For type child and common child). - bool ret = adapter_->Initialize(descriptors); + bool ret = adapter_.Initialize(descriptors); if (!ret) { HILOG_ERROR(HILOG_MODULE_ACE, "Initialize list adapter failed."); return false; } // refresh the list, load new child dynamically in list. - list_->RefreshList(); + list_.RefreshList(); return true; } -JSValue - ListComponent::ListScrollTo(const JSValue func, const JSValue dom, const JSValue args[], const jerry_length_t size) +JSValue ListComponent::ListScrollTo(const JSValue func, const JSValue dom, + const JSValue args[], const jerry_length_t size) { if (size != 1) { HILOG_ERROR(HILOG_MODULE_ACE, "scrollTo function parameter error"); diff --git a/src/core/components/list_component.h b/frameworks/src/core/components/list_component.h similarity index 84% rename from src/core/components/list_component.h rename to frameworks/src/core/components/list_component.h index e059df2..59db3ad 100755 --- a/src/core/components/list_component.h +++ b/frameworks/src/core/components/list_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -33,16 +33,16 @@ protected: bool CreateNativeViews() override; void ReleaseNativeViews() override; UIView *GetComponentRootView() const override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, JSValue funcValue) override; + bool ApplyPrivateStyle(const AppStyleItem* style) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, JSValue funcValue, bool isStopPropagation) override; bool ProcessChildren() override; + void OnViewAttached() override; bool UpdateForView() override; private: - UIList *list_; - ListAdapter *adapter_; - const AppStyle *combinedStyle_; - ListEventListener *listEventListener_; - const char *flexDirectionDefault; + UIList list_; + ListAdapter adapter_; + ListEventListener listEventListener_; static const char * const FUNC_SCROLLTO; static const char * const INDEX_SCROLLTO; static JSValue ListScrollTo(const JSValue func, const JSValue dom, const JSValue args[], const jerry_length_t size); diff --git a/src/core/components/marquee_component.cpp b/frameworks/src/core/components/marquee_component.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/marquee_component.cpp rename to frameworks/src/core/components/marquee_component.cpp diff --git a/src/core/components/marquee_component.h b/frameworks/src/core/components/marquee_component.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/marquee_component.h rename to frameworks/src/core/components/marquee_component.h diff --git a/src/core/components/panel_view.cpp b/frameworks/src/core/components/panel_view.cpp similarity index 98% rename from src/core/components/panel_view.cpp rename to frameworks/src/core/components/panel_view.cpp index 38095e6..41c42b7 100755 --- a/src/core/components/panel_view.cpp +++ b/frameworks/src/core/components/panel_view.cpp @@ -124,8 +124,8 @@ void PanelView::SetTextInPanel(UILabel *label) void PanelView::SetVideoSlider() { - if (videoSlider_ == nullptr || curTimeLabel_ == nullptr || totalTimeLabel_ == nullptr || playImage_ == nullptr - || mutedImage_ == nullptr) { + if (videoSlider_ == nullptr || curTimeLabel_ == nullptr || totalTimeLabel_ == nullptr || + playImage_ == nullptr || mutedImage_ == nullptr) { return; } const int8_t sliderWidth = 5; // default slider width diff --git a/src/core/components/panel_view.h b/frameworks/src/core/components/panel_view.h similarity index 98% rename from src/core/components/panel_view.h rename to frameworks/src/core/components/panel_view.h index 50c75fd..9045ee5 100755 --- a/src/core/components/panel_view.h +++ b/frameworks/src/core/components/panel_view.h @@ -27,7 +27,6 @@ #include "ui_image_view.h" #include "ui_label.h" #include "ui_slider.h" -#include "ui_text_language.h" #include "video_panel_image_res.h" namespace OHOS { diff --git a/src/core/components/picker_view_component.cpp b/frameworks/src/core/components/picker_view_component.cpp similarity index 95% rename from src/core/components/picker_view_component.cpp rename to frameworks/src/core/components/picker_view_component.cpp index f8f9632..da430eb 100755 --- a/src/core/components/picker_view_component.cpp +++ b/frameworks/src/core/components/picker_view_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -18,6 +18,7 @@ #include "ace_mem_base.h" #include "key_parser.h" #include "keys.h" +#include "product_adapter.h" #include "ui_font.h" namespace OHOS { @@ -42,7 +43,7 @@ void DatePickerListener::OnDatePickerStoped(UIDatePicker &picker) } #endif // FEATURE_COMPONENT_DATE_PICKER -void TextPickerListener::OnPickerStoped(UIPicker& picker) +void TextPickerListener::OnPickerStoped(UIPicker &picker) { if (!jerry_value_is_function(textCallback_)) { HILOG_ERROR(HILOG_MODULE_ACE, "TextPickerListener: callback type invalid!"); @@ -97,6 +98,10 @@ PickerViewComponent::PickerViewComponent(jerry_value_t options, jerry_value_t ch timeSelected_(nullptr) { SetComponentName(K_PICKER_VIEW); + fontSize_ = ProductAdapter::GetDefaultFontSize(); +#ifdef FEATURE_ROTATION_API + RegisterNamedFunction(FUNC_ROTATION_NAME, HandleRotationRequest); +#endif // FEATURE_ROTATION_API } bool PickerViewComponent::CreateNativeViews() @@ -131,8 +136,8 @@ bool PickerViewComponent::CreateNativeViews() result = false; } if (result) { - result = (CopyFontFamily(fontFamily_, DEFAULT_FONT_FAMILY)) && - (CopyFontFamily(selectedFontFamily_, DEFAULT_FONT_FAMILY)); + result = (CopyFontFamily(fontFamily_, ProductAdapter::GetDefaultFontFamilyName())) && + (CopyFontFamily(selectedFontFamily_, ProductAdapter::GetDefaultFontFamilyName())); } return result; } @@ -261,9 +266,9 @@ void PickerViewComponent::PostRender() UpdatePickerAttrs(); } -void PickerViewComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) +void PickerViewComponent::PostUpdate(uint16_t attrKeyId) { - if ((pickerView_ == nullptr) || !updateResult) { + if (pickerView_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "PickerViewComponent: post update failed!"); return; } @@ -295,12 +300,11 @@ void PickerViewComponent::UpdatePickerStyles() const HILOG_ERROR(HILOG_MODULE_ACE, "PickerViewComponent: update picker styles failed!"); return; } - if ((fontFamily_ == nullptr) || (fontSize_ == 0) || - (selectedFontFamily_ == nullptr) || (selectedFontSize_ == 0)) { + if ((fontFamily_ == nullptr) || (fontSize_ == 0) || (selectedFontFamily_ == nullptr) || (selectedFontSize_ == 0)) { HILOG_ERROR(HILOG_MODULE_ACE, "PickerViewComponent: font family or size invalid!"); return; } - UIFont* font = UIFont::GetInstance(); + UIFont *font = UIFont::GetInstance(); if (font == nullptr) { return; } @@ -450,7 +454,9 @@ bool PickerViewComponent::ApplyPrivateStyle(const AppStyleItem *styleItem) return true; } -bool PickerViewComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +bool PickerViewComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) { bool result = false; switch (eventTypeId) { diff --git a/src/core/components/picker_view_component.h b/frameworks/src/core/components/picker_view_component.h old mode 100755 new mode 100644 similarity index 96% rename from src/core/components/picker_view_component.h rename to frameworks/src/core/components/picker_view_component.h index cd76307..1aca88b --- a/src/core/components/picker_view_component.h +++ b/frameworks/src/core/components/picker_view_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -134,16 +134,16 @@ protected: UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; bool ApplyPrivateStyle(const AppStyleItem* styleItem) override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; void PostRender() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; + void PostUpdate(uint16_t attrKeyId) override; /** * @enum PickerType * * @brief Values that represent different types of picker-view */ - enum class PickerType { + enum class PickerType : uint8_t { UNKNOWN, TEXT, TIME, diff --git a/frameworks/src/core/components/qrcode_component.cpp b/frameworks/src/core/components/qrcode_component.cpp new file mode 100755 index 0000000..601ff31 --- /dev/null +++ b/frameworks/src/core/components/qrcode_component.cpp @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2021 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. + */ +#include "acelite_config.h" + +#ifdef FEATURE_COMPONENT_QRCODE +#include "qrcode_component.h" +#include "ace_log.h" +#include "ace_mem_base.h" +#include "js_app_context.h" +#include "js_fwk_common.h" +#include "key_parser.h" +#include "keys.h" + +namespace OHOS { +namespace ACELite { +QrcodeComponent::QrcodeComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *manager) + : Component(options, children, manager), qrcodeValue_(nullptr) +{ + qrcodeColor_ = Color::Black(); + qrcodeBackGroundColor_ = Color::White(); + SetComponentName(K_QRCODE); +} + +void QrcodeComponent::ReleaseNativeViews() +{ + ACE_FREE(qrcodeValue_); +} + +bool QrcodeComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) +{ + bool setResult = true; + switch (attrKeyId) { + case K_VALUE: { + ACE_FREE(qrcodeValue_); + qrcodeValue_ = MallocStringOf(attrValue); + break; + } + default: { + setResult = false; + break; + } + } + return setResult; +} + +void QrcodeComponent::PostUpdate(uint16_t attrKeyId) +{ + switch (attrKeyId) { + case K_BACKGROUND_COLOR: + // same as below + case K_BORDER_WIDTH: + // same as below + case K_COLOR: + // same as below + case K_HEIGHT: + // same as below + case K_WIDTH: + // same as below + case K_VALUE: { + DrawQrcode(); + break; + } + default: + break; + } +} + +bool QrcodeComponent::ApplyPrivateStyle(const AppStyleItem *style) +{ + bool result = true; + uint16_t styleKey = GetStylePropNameId(style); + switch (styleKey) { + case K_BACKGROUND_COLOR: { + result = SetColor(*style, qrcodeBackGroundColor_); + break; + } + case K_COLOR: { + result = SetColor(*style, qrcodeColor_); + break; + } + default: { + result = false; + break; + } + } + return result; +} + +void QrcodeComponent::OnViewAttached() +{ + DrawQrcode(); +} + +bool QrcodeComponent::SetColor(const AppStyleItem &style, ColorType &colortype) +{ + uint32_t color = 0; + uint8_t alpha = 255; + if (!GetStyleColorValue(&style, color, alpha)) { + return false; + } + colortype = GetRGBColor(color); + return true; +} + +void QrcodeComponent::DrawQrcode() +{ + const uint16_t defaultWidth = GetWidth(); + const uint16_t defaultHeight = GetHeight(); + uint16_t length = static_cast(strlen(qrcodeValue_)); + if (length > QRCODE_VAL_MAX || length == 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "Invalid value. target size[%d]", length); + return; + } + + qrcode_.SetQrcodeInfo(qrcodeValue_, qrcodeBackGroundColor_, qrcodeColor_); + qrcode_.SetWidth(defaultWidth); + qrcode_.SetHeight(defaultHeight); +} +} // namespace ACELite +} // namespace OHOS +#endif // FEATURE_COMPONENT_QRCODE diff --git a/frameworks/src/core/components/qrcode_component.h b/frameworks/src/core/components/qrcode_component.h new file mode 100755 index 0000000..406cb57 --- /dev/null +++ b/frameworks/src/core/components/qrcode_component.h @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2021 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. + */ + + +#include "acelite_config.h" + +#ifdef FEATURE_COMPONENT_QRCODE +#include "component.h" +#include "key_parser.h" +#include "non_copyable.h" +#include "ui_qrcode.h" + +namespace OHOS { +namespace ACELite { +class QrcodeComponent final : public Component { +public: + ACE_DISALLOW_COPY_AND_MOVE(QrcodeComponent); + QrcodeComponent() = delete; + QrcodeComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *manager); + ~QrcodeComponent() override {} + void ReleaseNativeViews() override; + +protected: + UIView *GetComponentRootView() const override + { + return (const_cast(&qrcode_)); + } + bool ApplyPrivateStyle(const AppStyleItem *style) override; + void OnViewAttached() override; + void PostUpdate(uint16_t attrKeyId) override; + bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; + +private: + bool SetColor(const AppStyleItem &style, ColorType &colortype); + void DrawQrcode(); + + UIQrcode qrcode_; + char *qrcodeValue_; + ColorType qrcodeBackGroundColor_; + ColorType qrcodeColor_; + + static constexpr uint16_t QRCODE_VAL_MAX = 256; +}; +} // namespace ACELite +} // namespace OHOS +#endif // #ifdef FEATURE_COMPONENT_QRCODE diff --git a/src/core/components/scroll_layer.cpp b/frameworks/src/core/components/scroll_layer.cpp similarity index 71% rename from src/core/components/scroll_layer.cpp rename to frameworks/src/core/components/scroll_layer.cpp index 5490615..85b9410 100755 --- a/src/core/components/scroll_layer.cpp +++ b/frameworks/src/core/components/scroll_layer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,12 +15,14 @@ #include "scroll_layer.h" #include "ace_log.h" +#include "component.h" #include "component_utils.h" +#include "fatal_handler.h" #include "root_view.h" namespace OHOS { namespace ACELite { -ScrollLayer::ScrollLayer() : scroll_(nullptr), origView_(nullptr) {} +ScrollLayer::ScrollLayer() : scroll_(nullptr), pageRootView_(nullptr) {} ScrollLayer::~ScrollLayer() { @@ -28,7 +30,8 @@ ScrollLayer::~ScrollLayer() delete (scroll_); scroll_ = nullptr; } - origView_ = nullptr; + pageRootView_ = nullptr; + FatalHandler::GetInstance().SetCurrentPageRootView(nullptr); } UIScrollView *ScrollLayer::AddScrollLayer(UIView &view) const @@ -69,26 +72,33 @@ UIScrollView *ScrollLayer::AddScrollLayer(UIView &view) const scroll->Add(&view); scroll->SetReboundSize(0); return scroll; - } else { - return nullptr; } + return nullptr; } -void ScrollLayer::AppendScrollLayer(jerry_value_t nativeElement) +void ScrollLayer::AppendScrollLayer(Component *rootComponent) { - if (IS_UNDEFINED(nativeElement)) { - HILOG_ERROR(HILOG_MODULE_ACE, "Scroll Layer: AppendScrollLayer function parameter nativeElement error."); + if (rootComponent == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Scroll Layer: AppendScrollLayer function parameter rootComponent error."); return; } - UIView *view = ComponentUtils::GetViewFromBindingObject(nativeElement); + uint16_t horizontalResolution = GetHorizontalResolution(); + uint16_t verticalResolution = GetVerticalResolution(); + ConstrainedParameter rootViewParam(horizontalResolution, verticalResolution); + Component::BuildViewTree(rootComponent, nullptr, rootViewParam); + // root view will be attached soon, invoke the callback + rootComponent->OnViewAttached(); + + UIView *view = rootComponent->GetComponentRootView(); if (view == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "Scroll Layer: Failed to get view from js object."); return; } scroll_ = AddScrollLayer(*view); - origView_ = view; + pageRootView_ = (scroll_ == nullptr) ? view : scroll_; + FatalHandler::GetInstance().SetCurrentPageRootView(pageRootView_); } void ScrollLayer::Hide() const @@ -98,10 +108,22 @@ void ScrollLayer::Hide() const HILOG_ERROR(HILOG_MODULE_ACE, "get rootView is nullptr"); return; } - rootView->RemoveAll(); + DetachFromRootView(); rootView->Invalidate(); } +void ScrollLayer::DetachFromRootView() const +{ + if (pageRootView_ == nullptr) { + return; + } + RootView *rootView = RootView::GetInstance(); + if (rootView == nullptr) { + return; + } + rootView->Remove(pageRootView_); +} + void ScrollLayer::Show() const { RootView *rootView = RootView::GetInstance(); @@ -112,15 +134,7 @@ void ScrollLayer::Show() const rootView->SetPosition(0, 0); rootView->SetWidth(GetHorizontalResolution()); rootView->SetHeight(GetVerticalResolution()); -#ifdef FEATURE_ROOTVIEW_CUSTOM_BACKGROUND_COLOR - // set no-blank background color on root view for easy using before the window's mouse showing is optimized - rootView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Olive().full); -#endif - if (scroll_ == nullptr) { - rootView->Add(origView_); - } else { - rootView->Add(scroll_); - } + rootView->Add(pageRootView_); rootView->Invalidate(); } } // namespace ACELite diff --git a/src/core/components/scroll_layer.h b/frameworks/src/core/components/scroll_layer.h old mode 100755 new mode 100644 similarity index 81% rename from src/core/components/scroll_layer.h rename to frameworks/src/core/components/scroll_layer.h index 4dcb355..2979f22 --- a/src/core/components/scroll_layer.h +++ b/frameworks/src/core/components/scroll_layer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,6 +16,7 @@ #ifndef OHOS_ACELITE_SCROLL_LAYER_H #define OHOS_ACELITE_SCROLL_LAYER_H +#include "component.h" #include "js_fwk_common.h" #include "non_copyable.h" #include "ui_scroll_view.h" @@ -27,14 +28,15 @@ public: ACE_DISALLOW_COPY_AND_MOVE(ScrollLayer); ScrollLayer(); ~ScrollLayer(); - void AppendScrollLayer(jerry_value_t nativeElement); + void AppendScrollLayer(Component *rootComponent); void Hide() const; void Show() const; + void DetachFromRootView() const; private: UIScrollView *AddScrollLayer(UIView &view) const; - UIScrollView *scroll_; - UIView *origView_; + UIScrollView *scroll_ = nullptr; + UIView *pageRootView_ = nullptr; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/slider_component.cpp b/frameworks/src/core/components/slider_component.cpp similarity index 50% rename from src/core/components/slider_component.cpp rename to frameworks/src/core/components/slider_component.cpp index 2644f0b..31d8e7b 100755 --- a/src/core/components/slider_component.cpp +++ b/frameworks/src/core/components/slider_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -26,47 +26,19 @@ SliderComponent::SliderComponent(jerry_value_t options, jerry_value_t children, minValue_(0), maxValue_(DEFAULT_VALUE), value_(0), - visibleWidth_(0), - visibleHeight_(0), startPosition_({0, 0}), - sliderView_(nullptr), - eventListener_(nullptr), direction_(UISlider::Direction::DIR_LEFT_TO_RIGHT) { SetComponentName(K_SLIDER); +#ifdef FEATURE_ROTATION_API + RegisterNamedFunction(FUNC_ROTATION_NAME, HandleRotationRequest); +#endif // FEATURE_ROTATION_API } -bool SliderComponent::CreateNativeViews() -{ - sliderView_ = new UISlider(); - if (sliderView_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create native slider view failed"); - return false; - } - eventListener_ = new SliderEventListener(); - if (eventListener_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create listener event failed"); - return false; - } - return true; -} - -void SliderComponent::ReleaseNativeViews() -{ - if (sliderView_) { - delete sliderView_; - sliderView_ = nullptr; - } - - if (eventListener_) { - delete eventListener_; - eventListener_ = nullptr; - } -} inline UIView *SliderComponent::GetComponentRootView() const { - return sliderView_; + return const_cast(&sliderView_); } bool SliderComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) @@ -90,35 +62,21 @@ bool SliderComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attr return true; } -bool SliderComponent::RegisterEventListener(uint16_t eventTypeId, jerry_value_t funcValue) -{ - if ((sliderView_ == nullptr) || !KeyParser::IsKeyValid(eventTypeId) || IS_UNDEFINED(funcValue)) { - return false; - } - - // slider's event type has bigger priority than common ones, so try private handler first - bool registerResult = RegisterPrivateEventListener(eventTypeId, funcValue); - if (registerResult) { - return true; - } - // try common ones if no private ones get hitted - registerResult = RegisterCommonEventListener(*sliderView_, eventTypeId, funcValue); - return registerResult; -} - -bool SliderComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +bool SliderComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) { switch (eventTypeId) { case K_CHANGE: - sliderView_->SetSliderEventListener(eventListener_); - eventListener_->SetBindChangeFuncName(funcValue); + sliderView_.SetSliderEventListener(&eventListener_); + eventListener_.SetBindChangeFuncName(funcValue); break; default: return false; } - sliderView_->SetDraggable(true); - sliderView_->SetTouchable(true); + sliderView_.SetDraggable(true); + sliderView_.SetTouchable(true); return true; } @@ -133,8 +91,8 @@ bool SliderComponent::ApplyPrivateStyle(const AppStyleItem *style) if (!GetStyleColorValue(style, color, alpha)) { return false; } - sliderView_->SetBackgroundStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); - sliderView_->SetBackgroundStyle(STYLE_BACKGROUND_OPA, alpha); + sliderView_.SetBackgroundStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); + sliderView_.SetBackgroundStyle(STYLE_BACKGROUND_OPA, alpha); break; } case K_SELECTED_COLOR: { @@ -142,8 +100,8 @@ bool SliderComponent::ApplyPrivateStyle(const AppStyleItem *style) if (!GetStyleColorValue(style, color, alpha)) { return false; } - sliderView_->SetForegroundStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); - sliderView_->SetForegroundStyle(STYLE_BACKGROUND_OPA, alpha); + sliderView_.SetForegroundStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); + sliderView_.SetForegroundStyle(STYLE_BACKGROUND_OPA, alpha); break; } case K_BLOCK_COLOR: { @@ -151,8 +109,8 @@ bool SliderComponent::ApplyPrivateStyle(const AppStyleItem *style) if (!GetStyleColorValue(style, color, alpha)) { return false; } - sliderView_->SetKnobStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); - sliderView_->SetKnobStyle(STYLE_BACKGROUND_OPA, alpha); + sliderView_.SetKnobStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); + sliderView_.SetKnobStyle(STYLE_BACKGROUND_OPA, alpha); break; } case K_LEFT: { @@ -167,14 +125,6 @@ bool SliderComponent::ApplyPrivateStyle(const AppStyleItem *style) SetDirection(GetStyleStrValue(style)); break; } - case K_HEIGHT: { - visibleHeight_ = GetStylePixelValue(style); - break; - } - case K_WIDTH: { - visibleWidth_ = GetStylePixelValue(style); - break; - } default: { return false; } @@ -182,74 +132,75 @@ bool SliderComponent::ApplyPrivateStyle(const AppStyleItem *style) return true; } -void SliderComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) +void SliderComponent::PostUpdate(uint16_t attrKeyId) { - if ((sliderView_ == nullptr) || !updateResult || !KeyParser::IsKeyValid(attrKeyId)) { + if (!KeyParser::IsKeyValid(attrKeyId)) { HILOG_ERROR(HILOG_MODULE_ACE, "slider component post update check args failed"); return; } switch (attrKeyId) { case K_LEFT: case K_TOP: - sliderView_->SetPosition(startPosition_.x, startPosition_.y); - sliderView_->Invalidate(); + sliderView_.SetPosition(startPosition_.x, startPosition_.y); + sliderView_.Invalidate(); break; case K_HEIGHT: - case K_WIDTH: - sliderView_->SetHeight(visibleHeight_); - sliderView_->SetWidth(visibleWidth_); + case K_WIDTH: { + int16_t visibleHeight = GetHeight(); + int16_t visibleWidth = GetWidth(); + sliderView_.SetHeight(visibleHeight); + sliderView_.SetWidth(visibleWidth); if (direction_ == UISlider::Direction::DIR_BOTTOM_TO_TOP) { - sliderView_->SetValidWidth(SLIDER_WIDTH); - sliderView_->SetValidHeight(visibleHeight_ - KNOB_WIDTH); + sliderView_.SetValidWidth(SLIDER_WIDTH); + sliderView_.SetValidHeight(visibleHeight - KNOB_WIDTH); } else { - sliderView_->SetValidHeight(SLIDER_WIDTH); - sliderView_->SetValidWidth(visibleWidth_ - KNOB_WIDTH); + sliderView_.SetValidHeight(SLIDER_WIDTH); + sliderView_.SetValidWidth(visibleWidth - KNOB_WIDTH); } - sliderView_->Invalidate(); + sliderView_.Invalidate(); break; + } case K_MAX: case K_MIN: case K_VALUE: - sliderView_->SetRange(maxValue_, minValue_); - sliderView_->SetValue(value_); - sliderView_->Invalidate(); + sliderView_.SetRange(maxValue_, minValue_); + sliderView_.SetValue(value_); + sliderView_.Invalidate(); break; default: break; } } -void SliderComponent::PostRender() +void SliderComponent::OnViewAttached() { - if (sliderView_ == nullptr) { - return; - } - if (value_ < minValue_) { value_ = minValue_; } else if (value_ > maxValue_) { value_ = maxValue_; } - sliderView_->SetDirection(direction_); - sliderView_->SetPosition(startPosition_.x, startPosition_.y); - sliderView_->SetRange(maxValue_, minValue_); - sliderView_->SetHeight(visibleHeight_); - sliderView_->SetWidth(visibleWidth_); + sliderView_.SetDirection(direction_); + sliderView_.SetPosition(startPosition_.x, startPosition_.y); + sliderView_.SetRange(maxValue_, minValue_); + int16_t visibleHeight = GetHeight(); + int16_t visibleWidth = GetWidth(); + sliderView_.SetHeight(visibleHeight); + sliderView_.SetWidth(visibleWidth); if (direction_ == UISlider::Direction::DIR_BOTTOM_TO_TOP) { - sliderView_->SetValidWidth(SLIDER_WIDTH); - sliderView_->SetValidHeight(visibleHeight_ - KNOB_WIDTH); + sliderView_.SetValidWidth(SLIDER_WIDTH); + sliderView_.SetValidHeight(visibleHeight - KNOB_WIDTH); } else { - sliderView_->SetValidHeight(SLIDER_WIDTH); - sliderView_->SetValidWidth(visibleWidth_ - KNOB_WIDTH); + sliderView_.SetValidHeight(SLIDER_WIDTH); + sliderView_.SetValidWidth(visibleWidth - KNOB_WIDTH); } - sliderView_->SetKnobWidth(KNOB_WIDTH); - sliderView_->SetSliderRadius(DEFAULT_BORDER_RADIUS, DEFAULT_BORDER_RADIUS, KNOB_RADIUS); - sliderView_->SetBackgroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); - sliderView_->SetForegroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); - sliderView_->SetBackgroundStyle(STYLE_BORDER_WIDTH, 0); - sliderView_->SetForegroundStyle(STYLE_BORDER_WIDTH, 0); - sliderView_->SetKnobStyle(STYLE_BORDER_WIDTH, 0); - sliderView_->SetValue(value_); + sliderView_.SetKnobWidth(KNOB_WIDTH); + sliderView_.SetSliderRadius(DEFAULT_BORDER_RADIUS, DEFAULT_BORDER_RADIUS, KNOB_RADIUS); + sliderView_.SetBackgroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); + sliderView_.SetForegroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); + sliderView_.SetBackgroundStyle(STYLE_BORDER_WIDTH, 0); + sliderView_.SetForegroundStyle(STYLE_BORDER_WIDTH, 0); + sliderView_.SetKnobStyle(STYLE_BORDER_WIDTH, 0); + sliderView_.SetValue(value_); } void SliderComponent::SetDirection(const char * const directionValue) diff --git a/src/core/components/slider_component.h b/frameworks/src/core/components/slider_component.h old mode 100755 new mode 100644 similarity index 81% rename from src/core/components/slider_component.h rename to frameworks/src/core/components/slider_component.h index c5fd4c0..8548a8a --- a/src/core/components/slider_component.h +++ b/frameworks/src/core/components/slider_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -31,15 +31,12 @@ public: ~SliderComponent() override {} protected: - bool CreateNativeViews() override; - void ReleaseNativeViews() override; UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; - bool RegisterEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; bool ApplyPrivateStyle(const AppStyleItem* style) override; - void PostRender() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; + void OnViewAttached() override; + void PostUpdate(uint16_t attrKeyId) override; private: static const int16_t DEFAULT_VALUE = 100; @@ -52,11 +49,9 @@ private: int16_t minValue_; int16_t maxValue_; int16_t value_; - int16_t visibleWidth_; - int16_t visibleHeight_; Point startPosition_; - UISlider* sliderView_; - SliderEventListener* eventListener_; + UISlider sliderView_; + SliderEventListener eventListener_; UISlider::Direction direction_; }; } // namespace ACELite diff --git a/frameworks/src/core/components/stack_component.cpp b/frameworks/src/core/components/stack_component.cpp new file mode 100644 index 0000000..b98967f --- /dev/null +++ b/frameworks/src/core/components/stack_component.cpp @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "stack_component.h" +#include "ace_log.h" +#include "key_parser.h" +#include "keys.h" + +namespace OHOS { +namespace ACELite { +StackComponent::StackComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager) + : Component(options, children, styleManager) +{ + SetComponentName(K_STACK); + nativeView_.SetStyle(STYLE_BACKGROUND_OPA, 0); +} + +UIView *StackComponent::GetComponentRootView() const +{ + return const_cast(&nativeView_); +} + +bool StackComponent::ProcessChildren() +{ + // add all children to this container + AppendChildren(this); + return true; +} + +void StackComponent::PostUpdate(uint16_t attrKeyId) +{ + nativeView_.LayoutChildren(); +} + +void StackComponent::AttachView(const Component *child) +{ + if (child == nullptr) { + return; + } + nativeView_.Add(child->GetComponentRootView()); +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/stack_component.h b/frameworks/src/core/components/stack_component.h new file mode 100644 index 0000000..2a1ce51 --- /dev/null +++ b/frameworks/src/core/components/stack_component.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_STACK_COMPONENT_H +#define OHOS_ACELITE_STACK_COMPONENT_H +#include "component.h" +#include "flex_layout.h" +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +class StackComponent final : public Component { +public: + ACE_DISALLOW_COPY_AND_MOVE(StackComponent); + StackComponent() = delete; + StackComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager); + ~StackComponent() override {} + +protected: + UIView *GetComponentRootView() const override; + bool ProcessChildren() override; + void PostUpdate(uint16_t attrKeyId) override; + void AttachView(const Component *child) override; + +private: + UIViewGroup nativeView_; +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_STACK_COMPONENT_H diff --git a/src/core/components/swiper_component.cpp b/frameworks/src/core/components/swiper_component.cpp similarity index 68% rename from src/core/components/swiper_component.cpp rename to frameworks/src/core/components/swiper_component.cpp index 325ab52..c7af27b 100755 --- a/src/core/components/swiper_component.cpp +++ b/frameworks/src/core/components/swiper_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -21,32 +21,21 @@ namespace OHOS { namespace ACELite { -SwiperComponent::SwiperComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager) +SwiperComponent::SwiperComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) : Component(options, children, styleManager), - swiperView_(nullptr), hasChildren_(false), index_(0), changeListener_(nullptr) { SetComponentName(K_SWIPER); -} - -bool SwiperComponent::CreateNativeViews() -{ - swiperView_ = new UISwipeView(); - if (swiperView_ == nullptr) { - return false; - } - swiperView_->SetLoopState(true); - return true; + swiperView_.SetLoopState(true); +#ifdef FEATURE_ROTATION_API + RegisterNamedFunction(FUNC_ROTATION_NAME, HandleRotationRequest); +#endif // FEATURE_ROTATION_API } void SwiperComponent::ReleaseNativeViews() { - if (swiperView_) { - delete swiperView_; - swiperView_ = nullptr; - } if (changeListener_) { delete changeListener_; changeListener_ = nullptr; @@ -55,7 +44,7 @@ void SwiperComponent::ReleaseNativeViews() inline UIView *SwiperComponent::GetComponentRootView() const { - return swiperView_; + return const_cast(&swiperView_); } bool SwiperComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) @@ -66,13 +55,13 @@ bool SwiperComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attr HILOG_ERROR(HILOG_MODULE_ACE, "duration value has problem."); return false; } - swiperView_->SetAnimatorTime(duration); + swiperView_.SetAnimatorTime(duration); return true; } else if (attrKeyId == K_LOOP) { if (jerry_value_is_boolean(attrValue)) { - swiperView_->SetLoopState(BoolOf(attrValue)); + swiperView_.SetLoopState(BoolOf(attrValue)); } else { - swiperView_->SetLoopState(true); + swiperView_.SetLoopState(true); } return true; } else if (attrKeyId == K_INDEX) { @@ -85,9 +74,9 @@ bool SwiperComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attr } else if (attrKeyId == K_VERTICAL) { if (!hasChildren_) { if (jerry_value_is_boolean(attrValue)) { - swiperView_->SetDirection(BoolOf(attrValue)); + swiperView_.SetDirection(BoolOf(attrValue)); } else { - swiperView_->SetDirection(0); + swiperView_.SetDirection(0); } } } @@ -95,64 +84,63 @@ bool SwiperComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attr return false; } -void SwiperComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) -{ - if (updateResult) { - SetPageIndex(); - } -} - -void SwiperComponent::PostRender() +void SwiperComponent::PostUpdate(uint16_t attrKeyId) { SetPageIndex(); } bool SwiperComponent::ProcessChildren() { - if (swiperView_ == nullptr) { - return false; - } - AppendChildren(swiperView_); + AppendChildren(this); hasChildren_ = true; return true; } -bool SwiperComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +void SwiperComponent::AttachView(const Component *child) +{ + if (child == nullptr) { + return; + } + swiperView_.Add(child->GetComponentRootView()); + SetPageIndex(); +} + +bool SwiperComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) { if (eventTypeId == K_CHANGE) { - if (swiperView_) { - changeListener_ = new ChangeListener(funcValue); - if (changeListener_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "Create ChangeListener error."); - return false; - } - swiperView_->SetOnSwipeListener(changeListener_); - return true; + changeListener_ = new ChangeListener(funcValue); + if (changeListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Create ChangeListener error."); + return false; } + swiperView_.SetOnSwipeListener(changeListener_); + return true; } return false; } -void SwiperComponent::SetPageIndex() const +void SwiperComponent::SetPageIndex() { if (jerry_value_is_undefined(GetChildren())) { - HILOG_INFO(HILOG_MODULE_ACE, "Swiper children don't exsit."); + HILOG_INFO(HILOG_MODULE_ACE, "Swiper children don't exist."); return; } uint16_t length = jerry_get_array_length(GetChildren()); if (index_ < 0 || index_ >= length) { - swiperView_->SetCurrentPage(0); + swiperView_.SetCurrentPage(0); } else { - swiperView_->SetCurrentPage(index_); + swiperView_.SetCurrentPage(index_); } } -void SwiperComponent::ChangeListener::OnSwipe(UISwipeView& view) +void SwiperComponent::ChangeListener::OnSwipe(UISwipeView &view) { if (jerry_value_is_undefined(fn_)) { return; } - UISwipeView* swipeView = reinterpret_cast(&view); + UISwipeView *swipeView = reinterpret_cast(&view); if (swipeView == nullptr) { return; } diff --git a/src/core/components/swiper_component.h b/frameworks/src/core/components/swiper_component.h old mode 100755 new mode 100644 similarity index 87% rename from src/core/components/swiper_component.h rename to frameworks/src/core/components/swiper_component.h index 638110b..fde1893 --- a/src/core/components/swiper_component.h +++ b/frameworks/src/core/components/swiper_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -31,14 +31,13 @@ public: ~SwiperComponent() override {} protected: - bool CreateNativeViews() override; void ReleaseNativeViews() override; UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; - void PostRender() override; + void PostUpdate(uint16_t attrKeyId) override; bool ProcessChildren() override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; + void AttachView(const Component *child) override; private: class ChangeListener : public UISwipeView::OnSwipeListener { @@ -55,8 +54,8 @@ private: private: jerry_value_t fn_; }; - void SetPageIndex() const; - UISwipeView *swiperView_; + void SetPageIndex(); + UISwipeView swiperView_; bool hasChildren_; int16_t index_; ChangeListener *changeListener_; diff --git a/src/core/components/switch_component.cpp b/frameworks/src/core/components/switch_component.cpp old mode 100755 new mode 100644 similarity index 66% rename from src/core/components/switch_component.cpp rename to frameworks/src/core/components/switch_component.cpp index 5b47e0f..5737fb1 --- a/src/core/components/switch_component.cpp +++ b/frameworks/src/core/components/switch_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -23,12 +23,10 @@ namespace OHOS { namespace ACELite { SwitchComponent::SwitchComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) : Component(options, children, styleManager), - toggleButton_(nullptr), changeListener_(nullptr), clickListener_(nullptr) { SetComponentName(K_SWITCH); - combinedStyle_ = GetStyleManager()->GetCombinedStyle(); } SwitchComponent::~SwitchComponent() @@ -54,8 +52,8 @@ bool SwitchComponent::ApplyPrivateStyle(const AppStyleItem *style) uint32_t color = 0; uint8_t alpha = OPA_OPAQUE; if (GetStyleColorValue(style, color, alpha)) { - toggleButton_->SetStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); - toggleButton_->SetStyle(STYLE_BACKGROUND_OPA, alpha); + toggleButton_.SetStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); + toggleButton_.SetStyle(STYLE_BACKGROUND_OPA, alpha); return true; } } @@ -65,56 +63,43 @@ bool SwitchComponent::ApplyPrivateStyle(const AppStyleItem *style) bool SwitchComponent::CreateNativeViews() { - toggleButton_ = new UIToggleButton(); - - if (toggleButton_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create switch component fail"); - return false; - } - - toggleButton_->SetState(false); - toggleButton_->SetStyle(STYLE_BORDER_OPA, OPA_OPAQUE); - toggleButton_->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); + toggleButton_.SetState(false); + toggleButton_.SetStyle(STYLE_BORDER_OPA, OPA_OPAQUE); + toggleButton_.SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); return true; } -void SwitchComponent::ReleaseNativeViews() -{ - if (toggleButton_) { - delete toggleButton_; - toggleButton_ = nullptr; - } -} UIView *SwitchComponent::GetComponentRootView() const { - return toggleButton_; + return const_cast(&toggleButton_); } bool SwitchComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) { if (attrKeyId == K_CHECKED) { - toggleButton_->SetState(BoolOf(attrValue)); + toggleButton_.SetState(BoolOf(attrValue)); return true; } return false; } -bool SwitchComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +bool SwitchComponent::RegisterPrivateEventListener(uint16_t eventTypeId, + jerry_value_t funcValue, + bool isStopPropagation) { if (eventTypeId == K_CHANGE) { - if (toggleButton_) { - changeListener_ = new StateChangeListener(funcValue, K_SWITCH); - if (changeListener_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create change listener failed"); - return false; - } - return true; + changeListener_ = new StateChangeListener(funcValue); + if (changeListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create change listener failed"); + return false; } - } else if (eventTypeId == K_CLICK) { - clickListener_ = new ViewOnClickListener(funcValue, eventTypeId); + return true; + } + if (eventTypeId == K_CLICK) { + clickListener_ = new ViewOnClickListener(funcValue, isStopPropagation); if (clickListener_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); return false; @@ -128,10 +113,11 @@ void SwitchComponent::PostRender() { // the change event should be dealed after checked attribute if (changeListener_) { - toggleButton_->SetOnChangeListener(changeListener_); + changeListener_->SetState(toggleButton_.GetState()); + toggleButton_.SetOnChangeListener(changeListener_); if (clickListener_ == nullptr) { // trigger changeEvent - clickListener_ = new ViewOnClickListener(UNDEFINED, K_CLICK); + clickListener_ = new ViewOnClickListener(UNDEFINED, true); if (clickListener_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); return; @@ -140,7 +126,7 @@ void SwitchComponent::PostRender() } if (clickListener_) { clickListener_->SetComponentListener(changeListener_); - toggleButton_->SetOnClickListener(clickListener_); + toggleButton_.SetOnClickListener(clickListener_); } } } // namespace ACELite diff --git a/src/core/components/switch_component.h b/frameworks/src/core/components/switch_component.h old mode 100755 new mode 100644 similarity index 89% rename from src/core/components/switch_component.h rename to frameworks/src/core/components/switch_component.h index e87bb0c..9383d56 --- a/src/core/components/switch_component.h +++ b/frameworks/src/core/components/switch_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -31,17 +31,15 @@ public: protected: bool ApplyPrivateStyle(const AppStyleItem *style) override; bool CreateNativeViews() override; - void ReleaseNativeViews() override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; UIView *GetComponentRootView() const override; void PostRender() override; private: - UIToggleButton *toggleButton_; + UIToggleButton toggleButton_; StateChangeListener *changeListener_; ViewOnClickListener *clickListener_; - const AppStyle *combinedStyle_; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/components/tab_bar_component.cpp b/frameworks/src/core/components/tab_bar_component.cpp similarity index 100% rename from src/core/components/tab_bar_component.cpp rename to frameworks/src/core/components/tab_bar_component.cpp diff --git a/src/core/components/tab_bar_component.h b/frameworks/src/core/components/tab_bar_component.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/tab_bar_component.h rename to frameworks/src/core/components/tab_bar_component.h diff --git a/src/core/components/tab_content_component.cpp b/frameworks/src/core/components/tab_content_component.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/tab_content_component.cpp rename to frameworks/src/core/components/tab_content_component.cpp diff --git a/src/core/components/tab_content_component.h b/frameworks/src/core/components/tab_content_component.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/tab_content_component.h rename to frameworks/src/core/components/tab_content_component.h diff --git a/src/core/components/tabs_component.cpp b/frameworks/src/core/components/tabs_component.cpp similarity index 98% rename from src/core/components/tabs_component.cpp rename to frameworks/src/core/components/tabs_component.cpp index 5edccda..e9f5d46 100755 --- a/src/core/components/tabs_component.cpp +++ b/frameworks/src/core/components/tabs_component.cpp @@ -280,8 +280,8 @@ int16_t TabsComponent::GetInitPageIndex() ReleaseJerryValue(appViewModel, appPropName, globalObject, VA_ARG_END_FLAG); } int16_t currentPage; - if (!jerry_value_is_undefined(indexValHandler) && !jerry_value_is_error(indexValHandler) - && (jerry_value_is_number(indexValHandler) || jerry_value_is_string(indexValHandler))) { + if (!jerry_value_is_undefined(indexValHandler) && !jerry_value_is_error(indexValHandler) && + (jerry_value_is_number(indexValHandler) || jerry_value_is_string(indexValHandler))) { currentPage = IntegerOf(indexValHandler); if (currentPage >= length || currentPage < 0) { currentPage = 0; diff --git a/src/core/components/tabs_component.h b/frameworks/src/core/components/tabs_component.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/tabs_component.h rename to frameworks/src/core/components/tabs_component.h diff --git a/frameworks/src/core/components/test/unittest/BUILD.gn b/frameworks/src/core/components/test/unittest/BUILD.gn new file mode 100755 index 0000000..4ca5151 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/BUILD.gn @@ -0,0 +1,35 @@ +#Copyright (c) 2021 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. + +group("components_unittest") { + deps = [ + "common:js_frameworks_test_arc", + "common:js_frameworks_test_div", + "common:js_frameworks_test_event_bubble", + "common:js_frameworks_test_horizonprogress", + "common:js_frameworks_test_image_path_support", + "common:js_frameworks_test_input", + "common:js_frameworks_test_jsbundle", + "common:js_frameworks_test_list", + "common:js_frameworks_test_marquee", + "common:js_frameworks_test_opacity", + "common:js_frameworks_test_percent", + "common:js_frameworks_test_pickerview", + "common:js_frameworks_test_radio_switch_width", + "common:js_frameworks_test_slider", + "common:js_frameworks_test_swiper", + "common:js_frameworks_test_switch", + "common:js_frameworks_test_text", + "common:js_frameworks_test_text_exception", + ] +} diff --git a/frameworks/src/core/components/test/unittest/common/BUILD.gn b/frameworks/src/core/components/test/unittest/common/BUILD.gn new file mode 100755 index 0000000..8b9474f --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/BUILD.gn @@ -0,0 +1,213 @@ +#Copyright (c) 2021 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("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +unittest("js_frameworks_test_arc") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "arc_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_div") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "div_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_event_bubble") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/basic_tdd_test.cpp", + "event_bubble_tdd_test.cpp", + ] + deps = ace_test_deps +} +unittest("js_frameworks_test_horizonprogress") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "horizonprogress_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_image_path_support") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "image_src_path_tdd_test.cpp" ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_input") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "input_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_jsbundle") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "jsbundle_tdd_test.cpp" ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_list") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "list_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_marquee") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "marquee_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_opacity") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "opacity_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_percent") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "percent_tdd_test.cpp" ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_pickerview") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "picker_view_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_radio_switch_width") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "radio_switch_tdd_test.cpp", + "root_component_mock.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_slider") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "root_component_mock.cpp", + "slider_tdd_test.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_swiper") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "root_component_mock.cpp", + "swiper_tdd_test.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_switch") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "root_component_mock.cpp", + "switch_tdd_test.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_text") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "root_component_mock.cpp", + "text_tdd_test.cpp", + ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_text_exception") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "root_component_mock.cpp", + "text_tdd_exception_test.cpp", + ] + deps = ace_test_deps +} diff --git a/frameworks/src/core/components/test/unittest/common/arc_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/arc_tdd_test.cpp new file mode 100755 index 0000000..31c8486 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/arc_tdd_test.cpp @@ -0,0 +1,1220 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "arc_tdd_test.h" + +namespace OHOS { +namespace ACELite { +void ArcTddTest::SetCircleType() +{ + JerrySetStringProperty(attrsObj_, "type", "arc"); +} + +int16_t ArcTddTest::GetPercentage(const UICircleProgress &circleProgress) const +{ + uint16_t delta = circleProgress.GetValue() - circleProgress.GetRangeMin(); + uint16_t rangeSize = circleProgress.GetRangeMax() - circleProgress.GetRangeMin(); + if (rangeSize == 0) { + return 0; + } + + uint8_t totalPercent = 100; + uint16_t result = totalPercent * delta / rangeSize; + if (result > totalPercent) { + result = totalPercent; + } + return result; +} + +void ArcTddTest::PrintExpectInfo(const ColorType colorType, int32_t lineColor) const +{ + EXPECT_TRUE(colorType.green == GetRGBColor(lineColor).green); + EXPECT_TRUE(colorType.blue == GetRGBColor(lineColor).blue); + EXPECT_TRUE(colorType.red == GetRGBColor(lineColor).red); +} + +void ArcTddTest::ComponentProgressAttributeSetTest001() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + /** + * @tc.steps: step1. set attribute percent = 50 + */ + int8_t percentValue = 50; + JerrySetNumberProperty(attrsObj_, "percent", percentValue); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressAttributeSetTest001 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressAttributeSetTest001 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. check percent = 50 + */ + EXPECT_TRUE(GetPercentage(*circleView) == percentValue); + + /** + * @tc.steps: step2. set attribute percent = -60 + */ + int8_t percentValueNavigateNum = -60; + UpdateNumAttributeOrStyleValue(circleComponent, "percent", percentValueNavigateNum, true); + + /** + * @tc.expected: step2. check percent = 0 + */ + EXPECT_TRUE(GetPercentage(*circleView) == 0); + + /** + * @tc.steps: step3. set attribute percent = -1 + */ + UpdateNumAttributeOrStyleValue(circleComponent, "percent", -1, true); + + /** + * @tc.expected: step3. check percent = 0 + */ + EXPECT_TRUE(GetPercentage(*circleView) == 0); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressAttributeSetTest002() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressAttributeSetTest002 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressAttributeSetTest002 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + /** + * @tc.steps: step4. set attribute percent = 0 + */ + UpdateNumAttributeOrStyleValue(circleComponent, "percent", 0, true); + + /** + * @tc.expected: step4. check percent = 0 + */ + EXPECT_TRUE(GetPercentage(*circleView) == 0); + + /** + * @tc.steps: step5. set attribute percent = 100 + */ + int8_t percentValueFull = 100; + UpdateNumAttributeOrStyleValue(circleComponent, "percent", percentValueFull, true); + + /** + * @tc.expected: step5. check percent = 100 + */ + EXPECT_TRUE(GetPercentage(*circleView) == percentValueFull); + + /** + * @tc.steps: step6. set attribute percent = 101 + */ + int8_t percentValueBoundary = 101; + UpdateNumAttributeOrStyleValue(circleComponent, "percent", percentValueBoundary, true); + + /** + * @tc.expected: step6. check percent = 100 + */ + uint8_t maxPercent = 100; + EXPECT_TRUE(GetPercentage(*circleView) == maxPercent); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressAttributeSetTest003() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressAttributeSetTest003 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressAttributeSetTest003 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + /** + * @tc.steps: step6. set attribute percent = 200 + */ + uint8_t percentValueOver = 200; + UpdateNumAttributeOrStyleValue(circleComponent, "percent", percentValueOver, true); + + /** + * @tc.expected: step6. check percent = 100 + */ + uint8_t maxPercent = 100; + EXPECT_TRUE(GetPercentage(*circleView) == maxPercent); + + /** + * @tc.steps: step6. set attribute percent = "abc" + */ + UpdateCharAttributeOrStyleValue(circleComponent, "percent", "abc", true); + + /** + * @tc.expected: step6. check percent = "abc" + */ + EXPECT_TRUE(GetPercentage(*circleView) == 0); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest001() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* attributeName = "centerX"; + + /** + * @tc.steps: step1. set style centerX = 227 + */ + uint8_t centerX = 227; + JerrySetNumberProperty(styleObj_, attributeName, centerX); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest001 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest001 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. check centerX = 227 + */ + EXPECT_TRUE(circleView->GetCenterPosition().x == centerX); + + /** + * @tc.steps: step2. set attribute centerX = -32768 + */ + int16_t centerXBoundary = -32768; + UpdateNumAttributeOrStyleValue(circleComponent, attributeName, centerXBoundary, false); + + /** + * @tc.expected: step2. check centerX = -32768 + */ + EXPECT_TRUE(circleView->GetCenterPosition().x == centerXBoundary); + + /** + * @tc.steps: step3. set attribute centerX = 32765 + */ + int16_t centerXBoundaryIn = 32765; + UpdateNumAttributeOrStyleValue(circleComponent, attributeName, centerXBoundaryIn, false); + + /** + * @tc.expected: step3. check centerX = 32765 + */ + EXPECT_TRUE(circleView->GetCenterPosition().x == centerXBoundaryIn); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest002() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* attributeName = "centerX"; + + /** + * @tc.steps: step1. set style centerX = -32769 + */ + int32_t centerX = -32769; + JerrySetNumberProperty(styleObj_, attributeName, centerX); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest002 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest002 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. set normal value 20, and check centerX = 22 (use normal value set to check whether system + * run normally) + */ + uint8_t centerXNormal = 20; + UpdateNumAttributeOrStyleValue(circleComponent, "centerX", centerXNormal, false); + EXPECT_TRUE(circleView->GetCenterPosition().x == centerXNormal); + + /** + * @tc.steps: step2. set style centerX = -32766 + */ + int16_t centerXBoundary = -32766; + UpdateNumAttributeOrStyleValue(circleComponent, "centerX", centerXBoundary, false); + + /** + * @tc.steps: step3. set style centerX = "*," + */ + UpdateCharAttributeOrStyleValue(circleComponent, "centerX", "*,", false); + + /** + * @tc.expected: step3. check centerX = 0 (use normal value set to check whether system run normally) + */ + EXPECT_TRUE(circleView->GetCenterPosition().x == 0); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest003() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "centerY"; + + /** + * @tc.steps: step1. set style centerY = 227 + */ + uint8_t centerY = 227; + JerrySetNumberProperty(styleObj_, styleName, centerY); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest003 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest003 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. check centerY = 227 + */ + EXPECT_TRUE(circleView->GetCenterPosition().y == centerY); + + /** + * @tc.steps: step2. set attribute centerY = -32768 + */ + int16_t centerYBoundary = -32768; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, centerYBoundary, false); + + /** + * @tc.expected: step2. check centerY = -32768 + */ + EXPECT_TRUE(circleView->GetCenterPosition().y == centerYBoundary); + + /** + * @tc.steps: step3. set attribute centerY = 32765 + */ + int16_t centerYBoundaryIn = 32765; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, centerYBoundaryIn, false); + + /** + * @tc.expected: step3. check centerY = 32765 + */ + EXPECT_TRUE(circleView->GetCenterPosition().y == centerYBoundaryIn); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest004() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "centerY"; + + /** + * @tc.steps: step1. set style centerY = -32769 + */ + int32_t centerY = -32769; + JerrySetNumberProperty(styleObj_, styleName, centerY); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest003 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest003 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. set normal value 20, and check centerY = 22 (use normal value set to check whether system + * run normally) + */ + uint8_t centerYNormal = 20; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, centerYNormal, false); + EXPECT_TRUE(circleView->GetCenterPosition().y == centerYNormal); + + /** + * @tc.steps: step2. set style centerY = -32766 + */ + int16_t centerYBoundary = -32766; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, centerYBoundary, false); + + /** + * @tc.steps: step3. set style centerY = "abc" + */ + UpdateCharAttributeOrStyleValue(circleComponent, styleName, "abc", false); + + /** + * @tc.expected: step3. check centerY = 0 (use normal value set to check whether system run normally) + */ + EXPECT_TRUE(circleView->GetCenterPosition().y == 0); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest005() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "radius"; + + /** + * @tc.steps: step1. set style radius = 227 + */ + uint8_t radius = 227; + JerrySetNumberProperty(styleObj_, styleName, radius); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest005 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest005 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. check radius = 227 + */ + EXPECT_TRUE(circleView->GetRadius() == radius); + + /** + * @tc.steps: step2. set style radius = 0 + */ + UpdateNumAttributeOrStyleValue(circleComponent, styleName, 0, false); + + /** + * @tc.expected: step2. check radius = 0 + */ + EXPECT_TRUE(circleView->GetRadius() == 0); + + /** + * @tc.steps: step3. set style radius = 65534 + */ + uint16_t radiusBoundary = 65534; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, radiusBoundary, false); + + /** + * @tc.expected: step3. check radius = 65534 + */ + EXPECT_TRUE(circleView->GetRadius() == radiusBoundary); + + /** + * @tc.steps: step4. set style radius = "this is a string" + */ + UpdateCharAttributeOrStyleValue(circleComponent, styleName, "this is a string", false); + + /** + * @tc.expected: step4. check radius = 0 + */ + EXPECT_TRUE(circleView->GetRadius() == 0); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest006() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "radius"; + + /** + * @tc.steps: step1. set style radius = -1 + */ + JerrySetNumberProperty(styleObj_, styleName, -1); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest006 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest006 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.steps: step2. set style radius = 655355 + */ + int32_t radius = 655355; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, radius, false); + + /** + * @tc.expected: step2. set normal value 20, and check radius = 20 (use normal value set to check whether system run + * normally) + */ + uint8_t radiusNormal = 20; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, radiusNormal, false); + EXPECT_TRUE(circleView->GetRadius() == radiusNormal); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest008() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "startAngle"; + + /** + * @tc.steps: step1. set style startAngle = 0 + */ + JerrySetNumberProperty(styleObj_, styleName, 0); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest008 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest008 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. check startAngle = 0 + */ + EXPECT_TRUE(circleView->GetStartAngle() == 0); + + /** + * @tc.steps: step2. set style startAngle = 360 + */ + int16_t startAngle = 360; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, startAngle, false); + + /** + * @tc.expected: step2. check startAngle = 360 + */ + EXPECT_TRUE(circleView->GetStartAngle() == startAngle); + + /** + * @tc.steps: step3. set style startAngle = 361 + */ + int16_t startAngleBoundary = 361; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, startAngleBoundary, false); + + /** + * @tc.expected: step3. check startAngle = 360 + */ + EXPECT_TRUE(circleView->GetStartAngle() == startAngle); + + /** + * @tc.steps: step4. set style startAngle = -1 + */ + UpdateNumAttributeOrStyleValue(circleComponent, styleName, -1, false); + + /** + * @tc.expected: step4. check startAngle = 0 + */ + EXPECT_TRUE(circleView->GetStartAngle() == 0); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest009() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "startAngle"; + + /** + * @tc.steps: step1. set unnormal style startAngle = -32769 + */ + int32_t startAngle = -32769; + JerrySetNumberProperty(styleObj_, styleName, startAngle); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest009 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest009 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.steps: step2. set unnormal style startAngle = 326669 + */ + int32_t startAngleLarger = 326669; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, startAngleLarger, false); + + /** + * @tc.steps: step3. set style startAngle = 30 + */ + uint8_t startAngleNormal = 30; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, startAngleNormal, false); + + /** + * @tc.expected: step3. check startAngle = 30 + */ + EXPECT_TRUE(circleView->GetStartAngle() == startAngleNormal); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest010() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "totalAngle"; + + int16_t startAngle = 30; + JerrySetNumberProperty(styleObj_, "startAngle", startAngle); + + /** + * @tc.steps: step1. set style totalAngle = -360 + */ + int16_t totalAngle = -360; + JerrySetNumberProperty(styleObj_, styleName, totalAngle); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest010 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest010 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. check endAngle = -330 + */ + int16_t endAngle = -330; + EXPECT_TRUE(circleView->GetEndAngle() == endAngle); + + /** + * @tc.steps: step2. set style totalAngle = -361 + */ + int16_t totalAngleBoundary = -361; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, totalAngleBoundary, false); + + /** + * @tc.expected: step2. check endAngle = -330 + */ + EXPECT_TRUE(circleView->GetEndAngle() == endAngle); + + /** + * @tc.steps: step3. set style totalAngle = 360 + */ + int16_t totalAngleBoundaryIn = 360; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, totalAngleBoundaryIn, false); + + /** + * @tc.expected: step3. check endAngle = 390 + */ + int16_t endAngleUpdate = 390; + EXPECT_TRUE(circleView->GetEndAngle() == endAngleUpdate); + + /** + * @tc.steps: step4. set style totalAngle = 90 + */ + uint8_t totalAngleNormal = 90; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, totalAngleNormal, false); + + /** + * @tc.expected: step4. check endAngle = 120 + */ + uint8_t endAngleReNew = 120; + EXPECT_TRUE(circleView->GetEndAngle() == endAngleReNew); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest011() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "totalAngle"; + uint8_t startAngle = 30; + JerrySetNumberProperty(styleObj_, "startAngle", startAngle); + + /** + * @tc.steps: step1. set unnormal style totaldAngle = -32769 + */ + int32_t totalAngle = -32769; + JerrySetNumberProperty(styleObj_, styleName, totalAngle); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest011 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest011 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.steps: step2. set unnormal style totalAngle = 326669 + */ + int32_t totalAngleBoundary = 326669; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, totalAngleBoundary, false); + + /** + * @tc.steps: step3. set style totalAngle = 30 + */ + uint8_t totalAngleNormal = 30; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, totalAngleNormal, false); + + /** + * @tc.expected: step3. check endAngle = 60 + */ + uint8_t endAngle = 60; + EXPECT_TRUE(circleView->GetEndAngle() == endAngle); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest012() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "color"; + + /** + * @tc.steps: step1. set style lineColor = 227 + */ + int32_t lineColor = 227; + JerrySetNumberProperty(styleObj_, styleName, lineColor); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest012 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest012 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + ColorType tempColor; + tempColor.full = circleView->GetForegroundStyle(STYLE_LINE_COLOR); + + /** + * @tc.expected: step1. check lineColor = 227 + */ + PrintExpectInfo(tempColor, lineColor); + + /** + * @tc.steps: step2. set style lineColor = -2147483648 + */ + int32_t lineColorBoundary = INT_MIN; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineColorBoundary, false); + tempColor.full = circleView->GetForegroundStyle(STYLE_LINE_COLOR); + + /** + * @tc.expected: step2. check lineColor = -2147483648 + */ + PrintExpectInfo(tempColor, lineColorBoundary); + + /** + * @tc.steps: step3. set style lineColor = 2147483647 + */ + int32_t lineColorBoundaryPosNum = 2147483647; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineColorBoundaryPosNum, false); + tempColor.full = circleView->GetForegroundStyle(STYLE_LINE_COLOR); + + /** + * @tc.expected: step3. check lineColor = 2147483647 + */ + PrintExpectInfo(tempColor, lineColorBoundaryPosNum); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest013() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "color"; + + /** + * @tc.steps: step1. set unnormal style lineColor = -2147483648 + */ + int32_t lineColor = INT_MIN; + JerrySetNumberProperty(styleObj_, styleName, lineColor); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest013 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest013 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.steps: step2. set unnormal style lineColor = 2147483648 + */ + int32_t lineColorBoundary = 2147483648; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineColorBoundary, false); + + /** + * @tc.steps: step3. set style lineColor = 30 + */ + uint8_t lineColorNormal = 30; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineColorNormal, false); + ColorType tempColor; + tempColor.full = circleView->GetForegroundStyle(STYLE_LINE_COLOR); + + /** + * @tc.expected: step3. check lineColor = 30 + */ + PrintExpectInfo(tempColor, lineColorNormal); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest014() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "strokeWidth"; + + /** + * @tc.steps: step1. set style lineWidth = 227 + */ + int16_t lineWidth = 227; + JerrySetNumberProperty(styleObj_, styleName, lineWidth); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest014 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest014 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.expected: step1. check lineWidth = 227 + */ + EXPECT_TRUE(circleView->GetForegroundStyle(STYLE_LINE_WIDTH) == lineWidth); + + /** + * @tc.steps: step2. set style lineWidth = -32768 + */ + int16_t lineWidthBoundary = -32768; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineWidthBoundary, false); + + /** + * @tc.expected: step2. check lineWidth = -32768 + */ + EXPECT_TRUE(circleView->GetForegroundStyle(STYLE_LINE_WIDTH) == lineWidthBoundary); + + /** + * @tc.steps: step3. set style lineWidth = 32767 + */ + int16_t lineWidthBoundaryPosNum = 32767; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineWidthBoundaryPosNum, false); + + /** + * @tc.expected: step3. check lineWidth = 32767 + */ + EXPECT_TRUE(circleView->GetForegroundStyle(STYLE_LINE_WIDTH) == lineWidthBoundaryPosNum); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::ComponentProgressStyleSetTest015() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("progress"); + SetCircleType(); + + const char* styleName = "strokeWidth"; + + /** + * @tc.steps: step1. set unnormal style lineWidth = -32769 + */ + int32_t lineWidth = -32769; + JerrySetNumberProperty(styleObj_, styleName, lineWidth); + + Component* circleComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + if (circleComponent == nullptr) { + printf("ComponentProgressStyleSetTest015 fail\n"); + TDD_CASE_END(); + return; + } + UICircleProgress* circleView = reinterpret_cast(circleComponent->GetComponentRootView()); + if (circleView == nullptr) { + printf("ComponentProgressStyleSetTest015 fail\n"); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); + return; + } + + /** + * @tc.steps: step2. set unnormal style lineWidth = 326669 + */ + int32_t lineWidthBoundary = 326669; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineWidthBoundary, false); + + /** + * @tc.steps: step3. set style lineWidth = 30 + */ + uint8_t lineWidthNormal = 30; + UpdateNumAttributeOrStyleValue(circleComponent, styleName, lineWidthNormal, false); + + /** + * @tc.expected: step3. check lineWidth = 30 + */ + EXPECT_TRUE(circleView->GetForegroundStyle(STYLE_LINE_WIDTH) == lineWidthNormal); + delete(circleComponent); + circleComponent = nullptr; + TDD_CASE_END(); +} + +void ArcTddTest::RunTests() +{ + ComponentProgressAttributeSetTest001(); + ComponentProgressStyleSetTest001(); + ComponentProgressStyleSetTest002(); + ComponentProgressStyleSetTest003(); + ComponentProgressStyleSetTest004(); + ComponentProgressStyleSetTest005(); + ComponentProgressStyleSetTest006(); + ComponentProgressStyleSetTest008(); + ComponentProgressStyleSetTest009(); + ComponentProgressStyleSetTest010(); + ComponentProgressStyleSetTest011(); + ComponentProgressStyleSetTest012(); + ComponentProgressStyleSetTest013(); + ComponentProgressStyleSetTest014(); + ComponentProgressStyleSetTest015(); +} + +#ifdef TDD_ASSERTIONS +/** +* @tc.name: ComponentProgressAttributeSetTest001 +* @tc.desc: Verify circleprogress percent attribute can set normally. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcAttr001, TestSize.Level1) +{ + ArcTddTest::ComponentProgressAttributeSetTest001(); +} + +/** +* @tc.name: ComponentProgressAttributeSetTest002 +* @tc.desc: Verify circleprogress percent attribute can set normally. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcAttr002, TestSize.Level1) +{ + ArcTddTest::ComponentProgressAttributeSetTest002(); +} + +/** +* @tc.name: ComponentProgressAttributeSetTest003 +* @tc.desc: Verify circleprogress percent attribute can set normally. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcAttr003, TestSize.Level1) +{ + ArcTddTest::ComponentProgressAttributeSetTest003(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest001 +* @tc.desc: Verify circleprogress centerX style can set normally. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle001, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest001(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest002 +* @tc.desc: Verify circleprogress centerX style can deal unNormally value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle002, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest002(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest003 +* @tc.desc: Verify circleprogress centerY style can set normally. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle003, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest003(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest004 +* @tc.desc: Verify circleprogress centerY style can deal unNormally value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle004, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest004(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest005 +* @tc.desc: Verify circleprogress radius style can set normally. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle005, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest005(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest006 +* @tc.desc: Verify circleprogress radius style can deal unNormally value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle006, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest006(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest008 +* @tc.desc: Verify circleprogress startAngle style can set normal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle008, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest008(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest009 +* @tc.desc: Verify circleprogress startAngle style can deal unNormal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle009, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest009(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest010 +* @tc.desc: Verify circleprogress totalAngle style can set normal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle010, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest010(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest011 +* @tc.desc: Verify circleprogress totalAngle style can deal unNormal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle011, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest011(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest012 +* @tc.desc: Verify circleprogress lineColor style can set normal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle012, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest012(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest013 +* @tc.desc: Verify circleprogress lineColor style can deal unNormal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle013, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest013(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest014 +* @tc.desc: Verify circleprogress lineWidth style can set normal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle014, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest014(); +} + +/** +* @tc.name: ComponentProgressStyleSetTest015 +* @tc.desc: Verify circleprogress lineWidth style can deal unNormal value. +* @tc.require: AR000DSEFE +*/ +HWTEST_F(ArcTddTest, arcStyle015, TestSize.Level1) +{ + ArcTddTest::ComponentProgressStyleSetTest015(); +} +#endif +} +} \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/arc_tdd_test.h b/frameworks/src/core/components/test/unittest/common/arc_tdd_test.h new file mode 100755 index 0000000..72c99e6 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/arc_tdd_test.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_ARC_H +#define OHOS_ACELITE_TEST_ARC_H + +#include "base_test.h" +#include "circle_progress_component.h" +#include "ui_abstract_progress.h" +#include "ui_circle_progress.h" + +namespace OHOS { +namespace ACELite { +class ArcTddTest : public BaseTest { +public: + void SetCircleType(); + int16_t GetPercentage(const UICircleProgress &circleProgress) const; + void PrintExpectInfo(const ColorType colorType, int32_t lineColor) const; + void ComponentProgressAttributeSetTest001(); + void ComponentProgressAttributeSetTest002(); + void ComponentProgressAttributeSetTest003(); + void ComponentProgressStyleSetTest001(); + void ComponentProgressStyleSetTest002(); + void ComponentProgressStyleSetTest003(); + void ComponentProgressStyleSetTest004(); + void ComponentProgressStyleSetTest005(); + void ComponentProgressStyleSetTest006(); + void ComponentProgressStyleSetTest008(); + void ComponentProgressStyleSetTest009(); + void ComponentProgressStyleSetTest010(); + void ComponentProgressStyleSetTest011(); + void ComponentProgressStyleSetTest012(); + void ComponentProgressStyleSetTest013(); + void ComponentProgressStyleSetTest014(); + void ComponentProgressStyleSetTest015(); + void RunTests(); +}; +} +} +#endif // OHOS_ACELITE_TEST_ARC_H diff --git a/frameworks/src/core/components/test/unittest/common/div_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/div_tdd_test.cpp new file mode 100755 index 0000000..9da25b0 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/div_tdd_test.cpp @@ -0,0 +1,1189 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "div_tdd_test.h" +#include "base_test.h" +#include "div_component.h" +#include "js_app_environment.h" +#include "stylemgr/app_style_manager.h" + +namespace OHOS { +namespace ACELite { +DivTddTest::DivTddTest() : BaseTest() +{ + uint8_t componentNameLength = 3; + componentNameId_ = KeyParser::ParseKeyId("div", componentNameLength); +} + +void DivTddTest::ComponentDivAttributeSetTest015() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set unsupported attribute aaa = "abc" + */ + JerrySetStringProperty(attrsObj_, "aaa", "abc"); + + /* * + * @tc.steps: step2. set normal attribute width = "100" + */ + JerrySetStringProperty(attrsObj_, "id", "div01"); + + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check width set correctly + */ + if (!strcmp(divView->GetViewId(), "div01")) { + printf("ComponentDivAttributeSetTest015 pass\n"); + } else { + printf("ComponentDivAttributeSetTest015 fail\n"); + } + EXPECT_STREQ(divView->GetViewId(), "div01"); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest008() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style width = 0 + */ + JerrySetNumberProperty(styleObj_, "width", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. check width = 0 + */ + if (divView->GetWidth() == 0) { + printf("ComponentDivStyleSetTest008 pass\n"); + } else { + printf("ComponentDivStyleSetTest008 fail\n"); + } + EXPECT_TRUE(divView->GetWidth() == 0); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style width = 20 + */ + uint8_t width = 20; + JerrySetNumberProperty(styleObj_, "width", width); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check width = 20 + */ + if (divView->GetWidth() == width) { + printf("ComponentDivStyleSetTest008 pass\n"); + } else { + printf("ComponentDivStyleSetTest008 fail\n"); + } + EXPECT_TRUE(divView->GetWidth() == width); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest009() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set width = -32768 + */ + int16_t width = -32768; + JerrySetNumberProperty(styleObj_, "width", width); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. get width = 1 + */ + if (divView->GetWidth() == 1) { + printf("ComponentDivStyleSetTest009 pass\n"); + } else { + printf("ComponentDivStyleSetTest009 fail\n"); + } + EXPECT_TRUE(divView->GetWidth() == 1); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set width = 32767 + */ + int16_t widthBoundaryPosNum = 32767; + JerrySetNumberProperty(styleObj_, "width", widthBoundaryPosNum); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. get width = 32767 + */ + if (divView->GetWidth() == widthBoundaryPosNum) { + printf("ComponentDivStyleSetTest009 pass\n"); + } else { + printf("ComponentDivStyleSetTest009 fail\n"); + } + EXPECT_TRUE(divView->GetWidth() == widthBoundaryPosNum); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest010() +{ + TDD_CASE_BEGIN(); + const char *styleName = "width"; + /* * + * @tc.steps: step1. set width = -32769, set width = 3276888 + */ + int32_t width = -32769; + JerrySetNumberProperty(styleObj_, styleName, width); + + int32_t widthLarge = 1000000; + JerrySetNumberProperty(styleObj_, styleName, widthLarge); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style width = "10" + */ + uint8_t widthNormal = 10; + JerrySetNumberProperty(styleObj_, styleName, widthNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + uint8_t widthIn = 5; + JerrySetNumberProperty(styleObj_, styleName, widthIn); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + printf("%d\n", divView->GetWidth()); + if (divView->GetWidth() == widthIn) { + printf("ComponentDivStyleSetTest010 pass\n"); + } else { + printf("ComponentDivStyleSetTest010 fail\n"); + } + EXPECT_TRUE(divView->GetWidth() == widthIn); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest011() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style height = 0 + */ + JerrySetNumberProperty(styleObj_, "height", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. check height = 0 + */ + if (divView->GetHeight() == 0) { + printf("ComponentDivStyleSetTest011 pass\n"); + } else { + printf("ComponentDivStyleSetTest011 fail\n"); + } + EXPECT_TRUE(divView->GetHeight() == 0); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style height = 20 + */ + uint8_t height = 20; + JerrySetNumberProperty(styleObj_, "height", height); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check height = 20 + */ + if (divView->GetHeight() == height) { + printf("ComponentDivStyleSetTest011 pass\n"); + } else { + printf("ComponentDivStyleSetTest011 fail\n"); + } + EXPECT_TRUE(divView->GetHeight() == height); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest012() +{ + TDD_CASE_BEGIN(); + const char *styleName = "height"; + /* * + * @tc.steps: step1. set height = -32769, set height = 3276888 + */ + int32_t height = -32769; + JerrySetNumberProperty(styleObj_, styleName, height); + + int32_t heightBoundary = 3276888; + JerrySetNumberProperty(styleObj_, styleName, heightBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style height = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + uint8_t heightNormal = 5; + JerrySetNumberProperty(styleObj_, styleName, heightNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + printf("%d\n", divView->GetHeight()); + if (divView->GetHeight() == heightNormal) { + printf("ComponentDivStyleSetTest012 pass\n"); + } else { + printf("ComponentDivStyleSetTest012 fail\n"); + } + EXPECT_TRUE(divView->GetHeight() == heightNormal); + delete (component); + component = nullptr; + + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest013() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style margin = 0 + */ + JerrySetNumberProperty(styleObj_, "margin", 0); + + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. check margin = 0 + */ + if (divView->GetStyle(STYLE_MARGIN_LEFT) == 0 && divView->GetStyle(STYLE_MARGIN_TOP) == 0 && + divView->GetStyle(STYLE_MARGIN_RIGHT) == 0 && divView->GetStyle(STYLE_MARGIN_BOTTOM) == 0) { + printf("ComponentDivStyleSetTest013 pass\n"); + } else { + printf("ComponentDivStyleSetTest013 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_LEFT) == 0); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_TOP) == 0); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_RIGHT) == 0); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_BOTTOM) == 0); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style margin = 20 + */ + uint8_t margin = 20; + JerrySetNumberProperty(styleObj_, "margin", margin); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check margin = 20 + */ + if (divView->GetStyle(STYLE_MARGIN_LEFT) == margin && divView->GetStyle(STYLE_MARGIN_TOP) == margin && + divView->GetStyle(STYLE_MARGIN_RIGHT) == margin && divView->GetStyle(STYLE_MARGIN_BOTTOM) == margin) { + printf("ComponentDivStyleSetTest013 pass\n"); + } else { + printf("ComponentDivStyleSetTest013 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_LEFT) == margin); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_TOP) == margin); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_RIGHT) == margin); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_BOTTOM) == margin); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest014() +{ + TDD_CASE_BEGIN(); + const char *styleName = "margin"; + /* * + * @tc.steps: step1. set margin = -32769, set margin = 3276888 + */ + int32_t margin = -32769; + JerrySetNumberProperty(styleObj_, styleName, margin); + + int32_t marginBoundary = 3276888; + JerrySetNumberProperty(styleObj_, styleName, marginBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + /* * + * @tc.steps: step2. set style margin = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + uint8_t marginNormal = 5; + JerrySetNumberProperty(styleObj_, styleName, marginNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + printf("%d\n", divView->GetHeight()); + if (divView->GetStyle(STYLE_MARGIN_LEFT) == marginNormal && divView->GetStyle(STYLE_MARGIN_TOP) == marginNormal && + divView->GetStyle(STYLE_MARGIN_RIGHT) == marginNormal && + divView->GetStyle(STYLE_MARGIN_BOTTOM) == marginNormal) { + printf("ComponentDivStyleSetTest014 pass\n"); + } else { + printf("ComponentDivStyleSetTest014 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_LEFT) == marginNormal); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_TOP) == marginNormal); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_RIGHT) == marginNormal); + EXPECT_TRUE(divView->GetStyle(STYLE_MARGIN_BOTTOM) == marginNormal); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest015() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style borderWidth = 0 + */ + JerrySetNumberProperty(styleObj_, "borderWidth", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. check borderWidth = 0 + */ + if (divView->GetStyle(STYLE_BORDER_WIDTH) == 0) { + printf("ComponentDivStyleSetTest015 pass\n"); + } else { + printf("ComponentDivStyleSetTest015 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_BORDER_WIDTH) == 0); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style borderWidth = 20 + */ + uint8_t borderWidth = 20; + JerrySetNumberProperty(styleObj_, "borderWidth", borderWidth); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check borderWidth = 20 + */ + if (divView->GetStyle(STYLE_BORDER_WIDTH) == borderWidth) { + printf("ComponentDivStyleSetTest015 pass\n"); + } else { + printf("ComponentDivStyleSetTest015 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_BORDER_WIDTH) == borderWidth); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest016() +{ + TDD_CASE_BEGIN(); + const char *styleName = "borderWidth"; + /* * + * @tc.steps: step1. set borderWidth = -32769, set borderWidth = 3276888 + */ + int32_t borderWidth = -32769; + JerrySetNumberProperty(styleObj_, styleName, borderWidth); + + int32_t borderWidthBoundary = 3276888; + JerrySetNumberProperty(styleObj_, styleName, borderWidthBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style borderWidth = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + uint8_t borderWidthNormal = 5; + JerrySetNumberProperty(styleObj_, styleName, borderWidthNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + printf("%d\n", divView->GetHeight()); + if (divView->GetStyle(STYLE_BORDER_WIDTH) == borderWidthNormal) { + printf("ComponentDivStyleSetTest016 pass\n"); + } else { + printf("ComponentDivStyleSetTest016 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_BORDER_WIDTH) == borderWidthNormal); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest017() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style borderRadius = 0 + */ + JerrySetNumberProperty(styleObj_, "borderRadius", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. check borderRadius = 0 + */ + if (divView->GetStyle(STYLE_BORDER_RADIUS) == 0) { + printf("ComponentDivStyleSetTest017 pass\n"); + } else { + printf("ComponentDivStyleSetTest017 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_BORDER_RADIUS) == 0); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style borderRadius = 20 + */ + uint8_t borderRadius = 20; + JerrySetNumberProperty(styleObj_, "borderRadius", borderRadius); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check borderRadius = 20 + */ + if (divView->GetStyle(STYLE_BORDER_RADIUS) == borderRadius) { + printf("ComponentDivStyleSetTest017 pass\n"); + } else { + printf("ComponentDivStyleSetTest017 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_BORDER_RADIUS) == borderRadius); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest018() +{ + TDD_CASE_BEGIN(); + const char *styleName = "borderRadius"; + /* * + * @tc.steps: step1. set borderRadius = -32769, set borderRadius = 3276888 + */ + uint32_t borderRadius = -32769; + JerrySetNumberProperty(styleObj_, styleName, borderRadius); + + uint32_t borderRadiusBoundary = 3276888; + JerrySetNumberProperty(styleObj_, styleName, borderRadiusBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style borderRadius = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + uint8_t borderRadiusNormal = 5; + JerrySetNumberProperty(styleObj_, styleName, borderRadiusNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + printf("%d\n", divView->GetHeight()); + if (divView->GetStyle(STYLE_BORDER_RADIUS) == borderRadiusNormal) { + printf("ComponentDivStyleSetTest018 pass\n"); + } else { + printf("ComponentDivStyleSetTest018 fail\n"); + } + EXPECT_TRUE(divView->GetStyle(STYLE_BORDER_RADIUS) == borderRadiusNormal); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest019() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style left = 0 + */ + JerrySetNumberProperty(styleObj_, "left", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. check left = 0 + */ + if (divView->GetX() == 0) { + printf("ComponentDivStyleSetTest019 pass\n"); + } else { + printf("ComponentDivStyleSetTest019 fail\n"); + } + EXPECT_TRUE(divView->GetX() == 0); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style left = 20 + */ + uint8_t left = 20; + JerrySetNumberProperty(styleObj_, "left", left); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check left = 20 + */ + if (divView->GetX() == left) { + printf("ComponentDivStyleSetTest019 pass\n"); + } else { + printf("ComponentDivStyleSetTest019 fail\n"); + } + EXPECT_TRUE(divView->GetX() == left); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest020() +{ + TDD_CASE_BEGIN(); + const char *styleName = "left"; + /* * + * @tc.steps: step1. set left = -32769, set left = 3276888 + */ + int32_t left = -32769; + JerrySetNumberProperty(styleObj_, styleName, left); + + int32_t leftBoundary = 3276888; + JerrySetNumberProperty(styleObj_, styleName, leftBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style left = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + uint8_t leftNormal = 5; + JerrySetNumberProperty(styleObj_, styleName, leftNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + printf("%d\n", divView->GetHeight()); + if (divView->GetX() == leftNormal) { + printf("ComponentDivStyleSetTest020 pass\n"); + } else { + printf("ComponentDivStyleSetTest020 fail\n"); + } + EXPECT_TRUE(divView->GetX() == leftNormal); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest021() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style top = 0 + */ + JerrySetNumberProperty(styleObj_, "top", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step1. check top = 0 + */ + if (divView->GetY() == 0) { + printf("ComponentDivStyleSetTest021 pass\n"); + } else { + printf("ComponentDivStyleSetTest021 fail\n"); + } + EXPECT_TRUE(divView->GetY() == 0); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style top = 20 + */ + uint8_t top = 20; + JerrySetNumberProperty(styleObj_, "top", top); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + /* * + * @tc.expected: step2. check top = 20 + */ + if (divView->GetY() == top) { + printf("ComponentDivStyleSetTest021 pass\n"); + } else { + printf("ComponentDivStyleSetTest021 fail\n"); + } + EXPECT_TRUE(divView->GetY() == top); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest022() +{ + TDD_CASE_BEGIN(); + const char *styleName = "top"; + /* * + * @tc.steps: step1. set top = -32769, set top = 3276888 + */ + int32_t top = -32769; + JerrySetNumberProperty(styleObj_, styleName, top); + + int32_t topBoundary = 3276888; + JerrySetNumberProperty(styleObj_, styleName, topBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style top = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + uint8_t topNormal = 5; + JerrySetNumberProperty(styleObj_, styleName, topNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + printf("%d\n", divView->GetHeight()); + if (divView->GetY() == topNormal) { + printf("ComponentDivStyleSetTest022 pass\n"); + } else { + printf("ComponentDivStyleSetTest022 fail\n"); + } + EXPECT_TRUE(divView->GetY() == topNormal); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest023() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style borderColor = 0 + */ + JerrySetNumberProperty(styleObj_, "borderColor", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + ColorType tempColor; + tempColor.full = divView->GetStyle(STYLE_BORDER_COLOR); + /* * + * @tc.expected: step1. check borderColor = 0 + */ + if (tempColor.blue == Color::GetColorFromRGB(0, 0, 0).blue && + tempColor.red == Color::GetColorFromRGB(0, 0, 0).red && + tempColor.green == Color::GetColorFromRGB(0, 0, 0).green) { + printf("ComponentDivStyleSetTest023 pass\n"); + } else { + printf("ComponentDivStyleSetTest023 fail\n"); + } + EXPECT_TRUE(tempColor.blue == Color::GetColorFromRGB(0, 0, 0).blue); + EXPECT_TRUE(tempColor.red == Color::GetColorFromRGB(0, 0, 0).red); + EXPECT_TRUE(tempColor.green == Color::GetColorFromRGB(0, 0, 0).green); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style borderColor = 3158454 + */ + int32_t color = 3158454; + JerrySetNumberProperty(styleObj_, "borderColor", color); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + tempColor.full = divView->GetStyle(STYLE_BORDER_COLOR); + /* * + * @tc.expected: step2. check borderColor = 3158454 + */ + if (tempColor.blue == GetRGBColor(color).blue && tempColor.red == GetRGBColor(color).red && + tempColor.green == GetRGBColor(color).green) { + printf("ComponentDivStyleSetTest023 pass\n"); + } else { + printf("ComponentDivStyleSetTest023 fail\n"); + } + EXPECT_TRUE(tempColor.blue == GetRGBColor(color).blue); + EXPECT_TRUE(tempColor.red == GetRGBColor(color).red); + EXPECT_TRUE(tempColor.green == GetRGBColor(color).green); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest024() +{ + TDD_CASE_BEGIN(); + const char *styleName = "borderColor"; + /* * + * @tc.steps: step1. set borderColor = -21474836481, set borderColor = 21474836481 + */ + int64_t borderColor = -21474836481; + jerry_value_t numValue = jerry_create_number(borderColor); + JerrySetNamedProperty(styleObj_, styleName, numValue); + jerry_release_value(numValue); + + int64_t borderColorBoundary = 21474836481; + JerrySetNumberProperty(styleObj_, styleName, borderColorBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style borderColor = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + int32_t borderColorNormal = 2735506; + JerrySetNumberProperty(styleObj_, styleName, borderColorNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + ColorType tempColor; + tempColor.full = divView->GetStyle(STYLE_BORDER_COLOR); + printf("%d\n", divView->GetHeight()); + if (tempColor.blue == GetRGBColor(borderColorNormal).blue && tempColor.red == GetRGBColor(borderColorNormal).red && + tempColor.green == GetRGBColor(borderColorNormal).green) { + printf("ComponentDivStyleSetTest024 pass\n"); + } else { + printf("ComponentDivStyleSetTest024 fail\n"); + } + EXPECT_TRUE(tempColor.blue == GetRGBColor(borderColorNormal).blue); + EXPECT_TRUE(tempColor.red == GetRGBColor(borderColorNormal).red); + EXPECT_TRUE(tempColor.green == GetRGBColor(borderColorNormal).green); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest025() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set style backgroundColor = 0 + */ + JerrySetNumberProperty(styleObj_, "backgroundColor", 0); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + ColorType tempColor; + tempColor.full = divView->GetStyle(STYLE_BACKGROUND_COLOR); + /* * + * @tc.expected: step1. check backgroundColor = 0 + */ + if (tempColor.blue == GetRGBColor(0).blue && tempColor.red == GetRGBColor(0).red && + tempColor.green == GetRGBColor(0).green) { + printf("ComponentDivStyleSetTest025 pass\n"); + } else { + printf("ComponentDivStyleSetTest025 fail\n"); + } + EXPECT_TRUE(tempColor.blue == GetRGBColor(0).blue); + EXPECT_TRUE(tempColor.red == GetRGBColor(0).red); + EXPECT_TRUE(tempColor.green == GetRGBColor(0).green); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style backgroundColor = 3158454 + */ + int32_t color = 3158454; + JerrySetNumberProperty(styleObj_, "backgroundColor", color); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + tempColor.full = divView->GetStyle(STYLE_BACKGROUND_COLOR); + /* * + * @tc.expected: step2. check backgroundColor = 3158454 + */ + if (tempColor.blue == GetRGBColor(color).blue && tempColor.red == GetRGBColor(color).red && + tempColor.green == GetRGBColor(color).green) { + printf("ComponentDivStyleSetTest025 pass\n"); + } else { + printf("ComponentDivStyleSetTest025 fail\n"); + } + EXPECT_TRUE(tempColor.blue == GetRGBColor(color).blue); + EXPECT_TRUE(tempColor.red == GetRGBColor(color).red); + EXPECT_TRUE(tempColor.green == GetRGBColor(color).green); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest026() +{ + TDD_CASE_BEGIN(); + const char *styleName = "backgroundColor"; + /* * + * @tc.steps: step1. set backgroundColor = -21474836481, set backgroundColor = 21474836481 + */ + int64_t bgColor = -21474836481; + JerrySetNumberProperty(styleObj_, styleName, bgColor); + + int64_t bgColorBoundary = 21474836481; + JerrySetNumberProperty(styleObj_, styleName, bgColorBoundary); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.steps: step2. set style backgroundColor = "10" + */ + JerrySetStringProperty(styleObj_, styleName, "10"); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + delete (component); + component = nullptr; + + /* * + * @tc.expected: step3. check system not crash(set normal value, and check it is setted correctly) + */ + int32_t bgColorNormal = 2735506; + JerrySetNumberProperty(styleObj_, styleName, bgColorNormal); + component = GetRenderedComponent(componentNameId_); + divView = reinterpret_cast(component->GetComponentRootView()); + ColorType tempColor; + tempColor.full = divView->GetStyle(STYLE_BACKGROUND_COLOR); + printf("%d\n", divView->GetHeight()); + if (tempColor.blue == GetRGBColor(bgColorNormal).blue && tempColor.red == GetRGBColor(bgColorNormal).red && + tempColor.green == GetRGBColor(bgColorNormal).green) { + printf("ComponentDivStyleSetTest026 pass\n"); + } else { + printf("ComponentDivStyleSetTest026 fail\n"); + } + EXPECT_TRUE(tempColor.blue == GetRGBColor(bgColorNormal).blue); + EXPECT_TRUE(tempColor.red == GetRGBColor(bgColorNormal).red); + EXPECT_TRUE(tempColor.green == GetRGBColor(bgColorNormal).green); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::ComponentDivStyleSetTest032() +{ + TDD_CASE_BEGIN(); + /* * + * @tc.steps: step1. set top = 50, set unsupport style, abc = 78978 + */ + uint8_t top = 50; + double abc = 78978; + JerrySetNumberProperty(styleObj_, "top", top); + JerrySetNumberProperty(styleObj_, "abc", abc); + Component *component = GetRenderedComponent(componentNameId_); + UIViewGroup *divView = reinterpret_cast(component->GetComponentRootView()); + + /* * + * @tc.steps: step2. check top = 50 + */ + if (divView->GetY() == top) { + printf("ComponentDivStyleSetTest032 pass\n"); + } else { + printf("ComponentDivStyleSetTest032 fail\n"); + } + EXPECT_TRUE(divView->GetY() == top); + delete (component); + component = nullptr; + TDD_CASE_END(); +} + +void DivTddTest::RunTests() +{ + ComponentDivAttributeSetTest015(); + ComponentDivStyleSetTest008(); + ComponentDivStyleSetTest009(); + ComponentDivStyleSetTest010(); + ComponentDivStyleSetTest011(); + ComponentDivStyleSetTest012(); + ComponentDivStyleSetTest013(); + ComponentDivStyleSetTest014(); + ComponentDivStyleSetTest015(); + ComponentDivStyleSetTest016(); + ComponentDivStyleSetTest017(); + ComponentDivStyleSetTest018(); + ComponentDivStyleSetTest019(); + ComponentDivStyleSetTest020(); + ComponentDivStyleSetTest021(); + ComponentDivStyleSetTest022(); + ComponentDivStyleSetTest023(); + ComponentDivStyleSetTest024(); + ComponentDivStyleSetTest025(); + ComponentDivStyleSetTest026(); + ComponentDivStyleSetTest032(); +} + +#ifdef TDD_ASSERTIONS +/* * + * @tc.name: ComponentDivAttributeSetTest015 + * @tc.desc: Verify attribute(which is not support) will not affect normal attribute set. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, divAttr015, TestSize.Level1) +{ + DivTddTest::ComponentDivAttributeSetTest015(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest008 + * @tc.desc: Verify width style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div008, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest008(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest009 + * @tc.desc: Verify Common style width set boundary value. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div009, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest009(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest010 + * @tc.desc: Verify Common style width set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div010, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest010(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest011 + * @tc.desc: Verify height style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div011, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest011(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest012 + * @tc.desc: Verify Common style height set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div012, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest012(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest013 + * @tc.desc: Verify margin style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div013, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest013(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest014 + * @tc.desc: Verify Common style margin set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div014, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest014(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest015 + * @tc.desc: Verify borderWidth style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div015, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest015(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest016 + * @tc.desc: Verify Common style borderWidth set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div016, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest016(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest017 + * @tc.desc: Verify borderRadius style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div017, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest017(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest018 + * @tc.desc: Verify Common style borderRadius set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div018, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest018(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest019 + * @tc.desc: Verify left style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div019, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest019(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest020 + * @tc.desc: Verify Common style left set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div020, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest020(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest021 + * @tc.desc: Verify top style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div021, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest021(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest022 + * @tc.desc: Verify Common style top set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div022, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest022(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest023 + * @tc.desc: Verify borderColor style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div023, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest023(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest024 + * @tc.desc: Verify Common style borderColor set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div024, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest024(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest025 + * @tc.desc: Verify backgroundColor style can set nomally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div025, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest025(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest026 + * @tc.desc: Verify Common style backgroundColor set value out of boundary. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div026, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest026(); +} + +/* * + * @tc.name: ComponentDivStyleSetTest032 + * @tc.desc: Verify set style which is not support, system can run normally. + * @tc.require: AR000DSEF9 + */ +HWTEST_F(DivTddTest, div032, TestSize.Level1) +{ + DivTddTest::ComponentDivStyleSetTest032(); +} +#endif +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/div_tdd_test.h b/frameworks/src/core/components/test/unittest/common/div_tdd_test.h new file mode 100755 index 0000000..37ac6e8 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/div_tdd_test.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_DIV_H +#define OHOS_ACELITE_TEST_DIV_H + +#include "base_test.h" + +namespace OHOS { +namespace ACELite { +class DivTddTest : public BaseTest { +public: + DivTddTest(); + ~DivTddTest() override {}; + void ComponentDivAttributeSetTest015(); + void ComponentDivStyleSetTest008(); + void ComponentDivStyleSetTest009(); + void ComponentDivStyleSetTest010(); + void ComponentDivStyleSetTest011(); + void ComponentDivStyleSetTest012(); + void ComponentDivStyleSetTest013(); + void ComponentDivStyleSetTest014(); + void ComponentDivStyleSetTest015(); + void ComponentDivStyleSetTest016(); + void ComponentDivStyleSetTest017(); + void ComponentDivStyleSetTest018(); + void ComponentDivStyleSetTest019(); + void ComponentDivStyleSetTest020(); + void ComponentDivStyleSetTest021(); + void ComponentDivStyleSetTest022(); + void ComponentDivStyleSetTest023(); + void ComponentDivStyleSetTest024(); + void ComponentDivStyleSetTest025(); + void ComponentDivStyleSetTest026(); + void ComponentDivStyleSetTest032(); + void RunTests(); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_DIV_H diff --git a/frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.cpp new file mode 100755 index 0000000..5366cfa --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.cpp @@ -0,0 +1,1506 @@ +/* + * Copyright (c) 2021 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. + */ +#include "event_bubble_tdd_test.h" +#include +#include "wrapper/js.h" + +namespace OHOS { +namespace ACELite { +const char BUNDLE_CLICK_BUBBBLE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { click: _vm.handleClick3 } }, [\n" + " _c('div', { staticClass: ['pane'], onBubbleEvents: { click: _vm.handleClick2 } }, [\n" + " _c('input', {\n" + " staticClass: ['button'],\n" + " attrs: { type: 'button', value: 'CLICK ME' },\n" + " onBubbleEvents: { click: _vm.handleClick1 } \n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " backgroundColor: '#f00',\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " button: {\n" + " width: 240\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleClick1: function () {\n" + " this.logs.push('handleClick1');\n" + " },\n" + " handleClick2: function () {\n" + " this.logs.push('handleClick2');\n" + " },\n" + " handleClick3: function () {\n" + " this.logs.push('handleClick3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_LONG_PRESS_BUBBLE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { longpress: _vm.handleLongPress3 } }, " + "[\n" + " _c('div', { staticClass: ['pane'], onBubbleEvents: { longpress: _vm.handleLongPress2 } }, [\n" + " _c('input', {\n" + " staticClass: ['button'],\n" + " attrs: { type: 'button', value: 'LONG PRESS ME' },\n" + " onBubbleEvents: { longpress: _vm.handleLongPress1 } \n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " backgroundColor: '#f00',\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " button: {\n" + " width: 300\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleLongPress1: function () {\n" + " this.logs.push('handleLongPress1');\n" + " },\n" + " handleLongPress2: function () {\n" + " this.logs.push('handleLongPress2');\n" + " },\n" + " handleLongPress3: function () {\n" + " this.logs.push('handleLongPress3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_SWIPE_BUBBLE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { swipe: _vm.handleSwipe3 } }, [\n" + " _c('div', { staticClass: ['pane'], onBubbleEvents: { swipe: _vm.handleSwipe2 } }, [\n" + " _c('div', {\n" + " staticClass: ['box'],\n" + " onBubbleEvents: { swipe: _vm.handleSwipe1 } \n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " backgroundColor: '#f00',\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " box: {\n" + " width: 200,\n" + " height: 200,\n" + " backgroundColor: '#0f0'\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleSwipe1: function () {\n" + " this.logs.push('handleSwipe1');\n" + " },\n" + " handleSwipe2: function () {\n" + " this.logs.push('handleSwipe2');\n" + " },\n" + " handleSwipe3: function () {\n" + " this.logs.push('handleSwipe3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_CLICK_DEFAULT_BUBBLE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { click: _vm.handleClick3 } }, [\n" + " _c('div', { staticClass: ['pane'] }, [\n" + " _c('input', {\n" + " staticClass: ['button'],\n" + " attrs: { type: 'button', value: 'CLICK ME' },\n" + " onBubbleEvents: { click: _vm.handleClick1 } \n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " backgroundColor: '#f00',\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " button: {\n" + " width: 240\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleClick1: function () {\n" + " this.logs.push('handleClick1');\n" + " },\n" + " handleClick2: function () {\n" + " this.logs.push('handleClick2');\n" + " },\n" + " handleClick3: function () {\n" + " this.logs.push('handleClick3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_LONG_PRESS_DEFAULT_BUBBLE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { longpress: _vm.handleLongPress3 } }, " + "[\n" + " _c('div', { staticClass: ['pane'] }, [\n" + " _c('input', {\n" + " staticClass: ['button'],\n" + " attrs: { type: 'button', value: 'LONG PRESS ME' },\n" + " onBubbleEvents: { longpress: _vm.handleLongPress1 } \n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " backgroundColor: '#f00',\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " button: {\n" + " width: 300\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleLongPress1: function () {\n" + " this.logs.push('handleLongPress1');\n" + " },\n" + " handleLongPress2: function () {\n" + " this.logs.push('handleLongPress2');\n" + " },\n" + " handleLongPress3: function () {\n" + " this.logs.push('handleLongPress3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_SWIPE_DEFAULT_BUBBLE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { swipe: _vm.handleSwipe3 } }, [\n" + " _c('div', { staticClass: ['pane'] }, [\n" + " _c('div', {\n" + " staticClass: ['box'],\n" + " onBubbleEvents: { swipe: _vm.handleSwipe1 } \n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " backgroundColor: '#f00',\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " box: {\n" + " width: 200,\n" + " height: 200,\n" + " backgroundColor: '#0f0'\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleSwipe1: function () {\n" + " this.logs.push('handleSwipe1');\n" + " },\n" + " handleSwipe2: function () {\n" + " this.logs.push('handleSwipe2');\n" + " },\n" + " handleSwipe3: function () {\n" + " this.logs.push('handleSwipe3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_CLICK_STOP_PROPAGATION[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { click: _vm.handleClick3 } }, [\n" + " _c('div', { staticClass: ['pane'], catchBubbleEvents: { click: _vm.handleClick2 } }, [\n" + " _c('input', {\n" + " staticClass: ['button'],\n" + " attrs: { type: 'button', value: 'CLICK ME' },\n" + " onBubbleEvents: { click: _vm.handleClick1 }\n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " button: {\n" + " width: 240\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleClick1: function () {\n" + " this.logs.push('handleClick1');\n" + " },\n" + " handleClick2: function () {\n" + " this.logs.push('handleClick2');\n" + " },\n" + " handleClick3: function () {\n" + " this.logs.push('handleClick3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_LONG_PRESS_STOP_PROPAGATION[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { longpress: _vm.handleLongPress3 } }, " + "[\n" + " _c('div', { staticClass: ['pane'], catchBubbleEvents: { longpress: _vm.handleLongPress2 } }, [\n" + " _c('input', {\n" + " staticClass: ['button'],\n" + " attrs: { type: 'button', value: 'LONG PRESS ME' },\n" + " onBubbleEvents: { longpress: _vm.handleLongPress1 }\n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " button: {\n" + " width: 240\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleLongPress1: function () {\n" + " this.logs.push('handleLongPress1');\n" + " },\n" + " handleLongPress2: function () {\n" + " this.logs.push('handleLongPress2');\n" + " },\n" + " handleLongPress3: function () {\n" + " this.logs.push('handleLongPress3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_SWIPE_STOP_PROPAGATION[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { swipe: _vm.handleSwipe3 } }, [\n" + " _c('div', { staticClass: ['pane'], catchBubbleEvents: { swipe: _vm.handleSwipe2 } }, [\n" + " _c('div', {\n" + " staticClass: ['box'],\n" + " onBubbleEvents: { swipe: _vm.handleSwipe1 } \n" + " })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " pane: {\n" + " backgroundColor: '#f00',\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " width: '70%',\n" + " height: '70%'\n" + " },\n" + " box: {\n" + " width: 200,\n" + " height: 200,\n" + " backgroundColor: '#0f0'\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " logs: []\n" + " },\n" + " handleSwipe1: function () {\n" + " this.logs.push('handleSwipe1');\n" + " },\n" + " handleSwipe2: function () {\n" + " this.logs.push('handleSwipe2');\n" + " },\n" + " handleSwipe3: function () {\n" + " this.logs.push('handleSwipe3');\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_CLICK_DELEGATION[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { click: _vm.handleClick } }, [\n" + " _c('input', { staticClass: ['button'], attrs: { type: 'button', ref: 'red', value: 'red' } }),\n" + " _c('input', { staticClass: ['button'], attrs: { type: 'button', ref: 'green', value: 'green' } }),\n" + " _c('input', { staticClass: ['button'], attrs: { type: 'button', ref: 'blue', value: 'blue' } })\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%',\n" + " },\n" + " button: {\n" + " borderRadius: 0,\n" + " width: 150\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " bgColor: '#f00'\n" + " },\n" + " handleClick: function(event) {\n" + " if (event.target === this.$refs.red) {\n" + " this.bgColor = '#f00';\n" + " } else if (event.target === this.$refs.green) {\n" + " this.bgColor = '#0f0';\n" + " } else if (event.target === this.$refs.blue) {\n" + " this.bgColor = '#00f';\n" + " } else {\n" + " console.log('Unknown element.');\n" + " }\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_LONG_PRESS_DELEGATION[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { longpress: _vm.handleLongPress } }, [\n" + " _c('input', { staticClass: ['button'], attrs: { type: 'button', ref: 'red', value: 'red' } }),\n" + " _c('input', { staticClass: ['button'], attrs: { type: 'button', ref: 'green', value: 'green' } }),\n" + " _c('input', { staticClass: ['button'], attrs: { type: 'button', ref: 'blue', value: 'blue' } })\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%',\n" + " },\n" + " button: {\n" + " borderRadius: 0,\n" + " width: 150\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " bgColor: '#f00'\n" + " },\n" + " handleLongPress: function(event) {\n" + " if (event.target === this.$refs.red) {\n" + " this.bgColor = '#f00';\n" + " } else if (event.target === this.$refs.green) {\n" + " this.bgColor = '#0f0';\n" + " } else if (event.target === this.$refs.blue) {\n" + " this.bgColor = '#00f';\n" + " } else {\n" + " console.log('Unknown element.');\n" + " }\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_SWIPE_DELEGATION[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['container'], onBubbleEvents: { swipe: _vm.handleSwipe } }, [\n" + " _c('div', { staticClass: ['box', 'box--red'], attrs: { ref: 'red' } }, [\n" + " _c('text', { staticClass: ['title'], attrs: { value: 'red'} })\n" + " ]),\n" + " _c('div', { staticClass: ['box', 'box--green'], attrs: { ref: 'green' } }, [\n" + " _c('text', { staticClass: ['title'], attrs: { value: 'green'} })\n" + " ]),\n" + " _c('div', { staticClass: ['box', 'box--blue'], attrs: { ref: 'blue' } }, [\n" + " _c('text', { staticClass: ['title'], attrs: { value: 'blue'} })\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " container: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " box: {\n" + " width: '50%',\n" + " height: 100,\n" + " justifyContent: 'center',\n" + " alignItems: 'center'\n" + " },\n" + " 'box--red': {\n" + " backgroundColor: '#f00'\n" + " },\n" + " 'box--green': {\n" + " backgroundColor: '#0f0'\n" + " },\n" + " 'box--blue': {\n" + " backgroundColor: '#00f'\n" + " },\n" + " title: {\n" + " color: '#fff'\n" + " }\n" + " }\n" + " },\n" + " data: {\n" + " text: 'none'\n" + " },\n" + " handleSwipe: function(event) {\n" + " if (event.target === this.$refs.red) {\n" + " this.text = 'red';\n" + " } else if (event.target === this.$refs.green) {\n" + " this.text = 'green';\n" + " } else if (event.target === this.$refs.blue) {\n" + " this.text = 'blue';\n" + " } else {\n" + " console.log('Unknown element.');\n" + " }\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_CLICK_PRESSURE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('text', { attrs: { value: function() { return _vm.count; } } })\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " box: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " }\n" + " },\n" + " data: {\n" + " count: 0\n" + " },\n" + " handle: function() {\n" + " this.count++;\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_LONG_PRESS_PRESSURE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { longpress: _vm.handle } }, [\n" + " _c('text', { attrs: { value: function() { return _vm.count; } } })\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " box: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " }\n" + " },\n" + " data: {\n" + " count: 0\n" + " },\n" + " handle: function() {\n" + " this.count++;\n" + " }\n" + " });\n" + "})();"; + +const char BUNDLE_SWIPE_PRESSURE[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { swipe: _vm.handle } }, [\n" + " _c('text', { attrs: { value: function() { return _vm.count; } } })\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " box: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " }\n" + " },\n" + " data: {\n" + " count: 0\n" + " },\n" + " handle: function() {\n" + " this.count++;\n" + " }\n" + " });\n" + "})();"; +const char BUNDLE_CLICK_PRESSURE2[] = + "(function () {\n" + " return new ViewModel({\n" + " render: function (vm) {\n" + " var _vm = vm || this;\n" + " return _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('div', { staticClass: ['box'], onBubbleEvents: { click: _vm.handle } }, [\n" + " _c('text', { attrs: { value: function() { return _vm.count; } } })\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ])\n" + " ]);\n" + " },\n" + " styleSheet: {\n" + " classSelectors: {\n" + " box: {\n" + " flexDirection: 'column',\n" + " justifyContent: 'center',\n" + " alignItems: 'center',\n" + " height: '100%',\n" + " width: '100%'\n" + " },\n" + " }\n" + " },\n" + " data: {\n" + " count: 0\n" + " },\n" + " handle: function() {\n" + " this.count++;\n" + " }\n" + " });\n" + "})();"; + +constexpr uint8_t NUM_TWO = 2; +constexpr uint8_t NUM_THREE = 3; + +void EventBubbleTddTest::EventBubbleTest001() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_CLICK_BUBBBLE, strlen(BUNDLE_CLICK_BUBBBLE)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + Click(centerX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_THREE); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleClick1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleClick2"); + free(content); + content = JSArray::GetString(logs, NUM_TWO); + EXPECT_STREQ(content, "handleClick3"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest002() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_LONG_PRESS_BUBBLE, strlen(BUNDLE_LONG_PRESS_BUBBLE)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + LongPress(centerX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_THREE); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleLongPress1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleLongPress2"); + free(content); + content = JSArray::GetString(logs, NUM_TWO); + EXPECT_STREQ(content, "handleLongPress3"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest003() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_SWIPE_BUBBLE, strlen(BUNDLE_SWIPE_BUBBLE)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint16_t halfDistance = 50; + const uint16_t startX = centerX - halfDistance; + const uint16_t endX = centerX + halfDistance; + Swipe(startX, centerY, endX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_THREE); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleSwipe1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleSwipe2"); + free(content); + content = JSArray::GetString(logs, NUM_TWO); + EXPECT_STREQ(content, "handleSwipe3"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest004() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_CLICK_DEFAULT_BUBBLE, strlen(BUNDLE_CLICK_DEFAULT_BUBBLE)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + Click(centerX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_TWO); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleClick1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleClick3"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest005() +{ + TDD_CASE_BEGIN(); + JSValue page = CreatePage(BUNDLE_LONG_PRESS_DEFAULT_BUBBLE, strlen(BUNDLE_LONG_PRESS_DEFAULT_BUBBLE)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + LongPress(centerX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_TWO); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleLongPress1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleLongPress3"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest006() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_SWIPE_DEFAULT_BUBBLE, strlen(BUNDLE_SWIPE_DEFAULT_BUBBLE)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint16_t halfDistance = 50; + const uint16_t startX = centerX - halfDistance; + const uint16_t endX = centerX + halfDistance; + Swipe(startX, centerY, endX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_TWO); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleSwipe1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleSwipe3"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest007() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_CLICK_STOP_PROPAGATION, strlen(BUNDLE_CLICK_STOP_PROPAGATION)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + Click(centerX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_TWO); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleClick1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleClick2"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest008() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_LONG_PRESS_STOP_PROPAGATION, strlen(BUNDLE_LONG_PRESS_STOP_PROPAGATION)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + LongPress(centerX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_TWO); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleLongPress1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleLongPress2"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest009() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_SWIPE_STOP_PROPAGATION, strlen(BUNDLE_SWIPE_STOP_PROPAGATION)); + constexpr char *propLogs = "logs"; + JSValue logs = JSObject::Get(page, propLogs); + EXPECT_EQ(JSArray::Length(logs), 0); + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint16_t halfDistance = 50; + const uint16_t startX = centerX - halfDistance; + const uint16_t endX = centerX + halfDistance; + Swipe(startX, centerY, endX, centerY); + EXPECT_EQ(JSArray::Length(logs), NUM_TWO); + char *content = JSArray::GetString(logs, 0); + EXPECT_STREQ(content, "handleSwipe1"); + free(content); + content = JSArray::GetString(logs, 1); + EXPECT_STREQ(content, "handleSwipe2"); + free(content); + content = nullptr; + JSRelease(logs); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest010() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_CLICK_DELEGATION, strlen(BUNDLE_CLICK_DELEGATION)); + constexpr char *propBgColor = "bgColor"; + constexpr char *bgRed = "#f00"; + constexpr char *bgGreen = "#0f0"; + constexpr char *bgBlue = "#00f"; + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint16_t distance = 100; + // click green button + Click(centerX, centerY); + char *content = JSObject::GetString(page, propBgColor); + EXPECT_STREQ(content, bgGreen); + free(content); + // click blue button + Click(centerX + distance, centerY); + content = JSObject::GetString(page, propBgColor); + EXPECT_STREQ(content, bgBlue); + free(content); + // click red button + Click(centerX - distance, centerY); + content = JSObject::GetString(page, propBgColor); + EXPECT_STREQ(content, bgRed); + free(content); + content = nullptr; + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest011() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_LONG_PRESS_DELEGATION, strlen(BUNDLE_LONG_PRESS_DELEGATION)); + // click green button + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint16_t distance = 100; + LongPress(centerX, centerY); + constexpr char *propBgColor = "bgColor"; + char *content = JSObject::GetString(page, propBgColor); + EXPECT_STREQ(content, "#0f0"); + free(content); + // click blue button + LongPress(centerX + distance, centerY); + content = JSObject::GetString(page, propBgColor); + EXPECT_STREQ(content, "#00f"); + free(content); + // click red button + LongPress(centerX - distance, centerY); + content = JSObject::GetString(page, propBgColor); + EXPECT_STREQ(content, "#f00"); + free(content); + content = nullptr; + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest012() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_SWIPE_DELEGATION, strlen(BUNDLE_SWIPE_DELEGATION)); + constexpr char *propText = "text"; + constexpr char *textRed = "red"; + constexpr char *textGreen = "green"; + constexpr char *textBlue = "blue"; + const uint16_t greenX = GetHorizontalResolution() / NUM_TWO; + const uint16_t greenY = GetVerticalResolution() / NUM_TWO; + constexpr uint16_t boxHeight = 100; + constexpr uint16_t halfDistance = 50; + const uint16_t startX = greenX - halfDistance; + const uint16_t endX = greenX + halfDistance; + const uint16_t redY = greenY - boxHeight; + const uint16_t blueY = greenY + boxHeight; + Swipe(startX, redY, endX, redY); + char *content = JSObject::GetString(page, propText); + EXPECT_STREQ(content, textRed); + free(content); + Swipe(startX, greenY, endX, greenY); + content = JSObject::GetString(page, propText); + EXPECT_STREQ(content, textGreen); + free(content); + Swipe(startX, blueY, endX, blueY); + content = JSObject::GetString(page, propText); + EXPECT_STREQ(content, textBlue); + free(content); + content = nullptr; + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest013() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_CLICK_PRESSURE, strlen(BUNDLE_CLICK_PRESSURE)); + constexpr char *propCount = "count"; + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint8_t diffCount = 20; + Click(centerX, centerY); + uint32_t count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount); + Click(centerX, centerY); + count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount * NUM_TWO); + Click(centerX, centerY); + count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount * NUM_THREE); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest014() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_LONG_PRESS_PRESSURE, strlen(BUNDLE_LONG_PRESS_PRESSURE)); + constexpr char *propCount = "count"; + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint8_t diffCount = 20; + LongPress(centerX, centerY); + uint32_t count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount); + LongPress(centerX, centerY); + count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount * NUM_TWO); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest015() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_SWIPE_PRESSURE, strlen(BUNDLE_SWIPE_PRESSURE)); + constexpr char *propCount = "count"; + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint16_t halfDistance = 50; + const uint16_t startX = centerX - halfDistance; + const uint16_t endX = centerX + halfDistance; + constexpr uint8_t diffCount = 20; + Swipe(startX, centerY, endX, centerY); + uint32_t count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount); + Swipe(startX, centerY, endX, centerY); + count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount * NUM_TWO); + Swipe(startX, centerY, endX, centerY); + count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount * NUM_THREE); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::EventBubbleTest016() +{ + TDD_CASE_BEGIN(); + + JSValue page = CreatePage(BUNDLE_CLICK_PRESSURE2, strlen(BUNDLE_CLICK_PRESSURE2)); + constexpr char *propCount = "count"; + const uint16_t centerX = GetHorizontalResolution() / NUM_TWO; + const uint16_t centerY = GetVerticalResolution() / NUM_TWO; + constexpr uint8_t times = 10; + constexpr uint8_t diffCount = 20; + for (uint8_t idx = 0; idx < times; ++idx) { + Click(centerX, centerY); + } + uint32_t count = static_cast(JSObject::GetNumber(page, propCount)); + EXPECT_EQ(count, diffCount * times); + DestroyPage(page); + TDD_CASE_END(); +} + +void EventBubbleTddTest::RunTests() +{ + EventBubbleTest001(); + EventBubbleTest002(); + EventBubbleTest003(); + EventBubbleTest004(); + EventBubbleTest005(); + EventBubbleTest006(); + EventBubbleTest007(); + EventBubbleTest008(); + EventBubbleTest009(); + EventBubbleTest010(); + EventBubbleTest011(); + EventBubbleTest012(); + EventBubbleTest013(); + EventBubbleTest014(); + EventBubbleTest015(); + EventBubbleTest016(); +} + +#ifdef TDD_ASSERTIONS +/* * + * @tc.name: EventBubbleTest001 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest001, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest001(); +} + +/* * + * @tc.name: EventBubbleTest002 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest002, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest002(); +} + +/* * + * @tc.name: EventBubbleTest003 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest003, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest003(); +} + +/* * + * @tc.name: EventBubbleTest004 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest004, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest004(); +} + +/* * + * @tc.name: EventBubbleTest005 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest005, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest005(); +} + +/* * + * @tc.name: EventBubbleTest006 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest006, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest006(); +} + +/* * + * @tc.name: EventBubbleTest007 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest007, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest007(); +} + +/* * + * @tc.name: EventBubbleTest008 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest008, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest008(); +} + +/* * + * @tc.name: EventBubbleTest009 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest009, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest009(); +} + +/* * + * @tc.name: EventBubbleTest010 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest010, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest010(); +} + +/* * + * @tc.name: EventBubbleTest011 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest011, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest011(); +} + +/* * + * @tc.name: EventBubbleTest012 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest012, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest012(); +} + +/* * + * @tc.name: EventBubbleTest013 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest013, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest013(); +} + +/* * + * @tc.name: EventBubbleTest014 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest014, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest014(); +} + +/* * + * @tc.name: EventBubbleTest015 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest015, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest015(); +} + +/* * + * @tc.name: EventBubbleTest016 + * @tc.desc: Verify event bubble. + * @tc.require: AR000F3PDN + */ +HWTEST_F(EventBubbleTddTest, EventBubbleTest016, TestSize.Level1) +{ + EventBubbleTddTest::EventBubbleTest016(); +} + +#endif // TDD_ASSERTIONS +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.h b/frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.h new file mode 100755 index 0000000..248b68c --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/event_bubble_tdd_test.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef OHOS_ACELITE_TEST_EVENT_BUBBLE_H +#define OHOS_ACELITE_TEST_EVENT_BUBBLE_H + +#include "basic_tdd_test.h" + +namespace OHOS { +namespace ACELite { +class EventBubbleTddTest : public BasicTddTest { +public: + EventBubbleTddTest() : BasicTddTest() {} + ~EventBubbleTddTest() override {} + + void EventBubbleTest001(); + void EventBubbleTest002(); + void EventBubbleTest003(); + void EventBubbleTest004(); + void EventBubbleTest005(); + void EventBubbleTest006(); + void EventBubbleTest007(); + void EventBubbleTest008(); + void EventBubbleTest009(); + void EventBubbleTest010(); + void EventBubbleTest011(); + void EventBubbleTest012(); + void EventBubbleTest013(); + void EventBubbleTest014(); + void EventBubbleTest015(); + void EventBubbleTest016(); + void RunTests(); +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_TEST_EVENT_BUBBLE_H \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.cpp new file mode 100755 index 0000000..d2c702b --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.cpp @@ -0,0 +1,819 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "horizonprogress_tdd_test.h" +#include "acelite_config.h" +#include "horizon_progress_component.h" +#include "js_app_environment.h" +#include "ui_box_progress.h" + +namespace OHOS { +namespace ACELite { +HorizonProgressTddTest::HorizonProgressTddTest() + : objGlob(UNDEFINED), + objAttrs(UNDEFINED), + objStaticStyle(UNDEFINED) {} + +void HorizonProgressTddTest::SetUp() +{ + printf("ACELiteHorizonProgressTest setup"); + JsAppEnvironment* appJsEnv = JsAppEnvironment::GetInstance(); + appJsEnv->InitJsFramework(); + + objGlob = jerry_get_global_object(); + + jerry_value_t keyAttrs = jerry_create_string((const jerry_char_t*)"attrs"); + objAttrs = jerry_create_object(); + jerry_set_property(objGlob, keyAttrs, objAttrs); + jerry_release_value(keyAttrs); + + jerry_value_t keyStaticStyle = jerry_create_string(reinterpret_cast("staticStyle")); + objStaticStyle = jerry_create_object(); + jerry_set_property(objGlob, keyStaticStyle, objStaticStyle); + jerry_release_value(keyStaticStyle); + rootComponentMock_.PrepareRootContainer(); +} + +void HorizonProgressTddTest::TearDown() +{ + JsAppContext::GetInstance()->ReleaseStyles(); +} + +void HorizonProgressTddTest::HorizonProgressTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting progress type=abc. + */ + jerry_value_t keyId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t valueId = jerry_create_string((const jerry_char_t*)"abc"); + jerry_set_property(objAttrs, keyId, valueId); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + UIView* progressView = reinterpret_cast(component->GetComponentRootView()); + printf("==%s\n", typeid(*progressView).name()); +#ifdef TDD_ASSERTIONS + char className[] = "N4OHOS13UIBoxProgressE"; +#else + char className[] = "class OHOS::UIBoxProgress"; +#endif + + /** + * @tc.expected: step1. get progress type = horizon(UIBoxProgress). + */ + if (strcmp(className, typeid(*progressView).name()) == 0) { + printf("[Test Case] [HorizonProgressTest001] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest001] FAILED\n"); + } + EXPECT_TRUE(strcmp(className, typeid(*progressView).name()) == 0); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting progress type=" ". + */ + jerry_value_t keyId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t valueId = jerry_create_string((const jerry_char_t*)" "); + jerry_set_property(objAttrs, keyId, valueId); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + UIView* progressView = reinterpret_cast(component->GetComponentRootView()); + printf("==%s\n", typeid(*progressView).name()); + +#ifdef TDD_ASSERTIONS + char className[] = "N4OHOS13UIBoxProgressE"; +#else + char className[] = "class OHOS::UIBoxProgress"; +#endif + /** + * @tc.expected: step1. get progress type = horizon(UIBoxProgress). + */ + if (strcmp(className, typeid(*progressView).name()) == 0) { + printf("[Test Case] [HorizonProgressTest002] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest002] FAILED\n"); + } + EXPECT_TRUE(strcmp(className, typeid(*progressView).name()) == 0); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting progress type=arc. + */ + jerry_value_t keyId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t valueId = jerry_create_string((const jerry_char_t*)"arc"); + jerry_set_property(objAttrs, keyId, valueId); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + UIView* progressView = component->GetComponentRootView(); + printf("==%s\n", typeid(*progressView).name()); + +#ifdef TDD_ASSERTIONS + char className[] = "N4OHOS16UICircleProgressE"; +#else + char className[] = "class OHOS::UICircleProgress"; +#endif + /** + * @tc.expected: step1. get progress type = circle(UICircleProgress). + */ + if (strcmp(className, typeid(*progressView).name()) == 0) { + printf("[Test Case] [HorizonProgressTest003] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest003] FAILED\n"); + } + EXPECT_TRUE(strcmp(className, typeid(*progressView).name()) == 0); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest004() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting percent=-32768. + */ + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + const int32_t percentNum = -32768; + jerry_value_t percentId = jerry_create_string((const jerry_char_t*)"percent"); + jerry_value_t percentValue = jerry_create_number(percentNum); + jerry_set_property(objAttrs, percentId, percentValue); + jerry_release_value(percentId); + jerry_release_value(percentValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + /** + * @tc.expected: step1. progress component will not crash. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValue() != percentNum) { + printf("[Test Case] [HorizonProgressTest004] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest004] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValue() != percentNum); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest005() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting percent=100. + */ + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + + jerry_value_t percentId = jerry_create_string((const jerry_char_t*)"percent"); + const int32_t percentNum = 100; + jerry_value_t percentValue = jerry_create_number(percentNum); + jerry_set_property(objAttrs, percentId, percentValue); + jerry_release_value(percentId); + jerry_release_value(percentValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + + rootComponentMock_.RenderComponent(*component); + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + /** + * @tc.expected: step1. get percent=100. + */ + if (progressView->GetValue() == percentNum) { + printf("[Test Case] [HorizonProgressTest005] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest005] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValue() == percentNum); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest006() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + + /** + * @tc.steps: step1. setting percent=32767. + */ + jerry_value_t percentId = jerry_create_string((const jerry_char_t*)"percent"); + const int32_t percentNum = 32767; + jerry_value_t percentValue = jerry_create_number(percentNum); + jerry_set_property(objAttrs, percentId, percentValue); + jerry_release_value(percentId); + jerry_release_value(percentValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.expected: step1. progress component will not crash. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValue() != percentNum) { + printf("[Test Case] [HorizonProgressTest006] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest006] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValue() != percentNum); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest007() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + /** + * @tc.steps: step1. setting percent=-32769. + */ + jerry_value_t percentId = jerry_create_string((const jerry_char_t*)"percent"); + const int32_t percentNum = -32769; + jerry_value_t percentValue = jerry_create_number(percentNum); + jerry_set_property(objAttrs, percentId, percentValue); + jerry_release_value(percentId); + jerry_release_value(percentValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.expected: step1. progress component will not crash. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValue() != percentNum) { + printf("[Test Case] [HorizonProgressTest007] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest007] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValue() != percentNum); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest008() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + /** + * @tc.steps: step1. setting percent=32768. + */ + jerry_value_t percentId = jerry_create_string((const jerry_char_t*)"percent"); + const int32_t percentNum = 32768; + jerry_value_t percentValue = jerry_create_number(percentNum); + jerry_set_property(objAttrs, percentId, percentValue); + jerry_release_value(percentId); + jerry_release_value(percentValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.expected: step1. progress component will not crash. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValue() != percentNum) { + printf("[Test Case] [HorizonProgressTest008] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest008] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValue() != percentNum); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest009() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + + /** + * @tc.steps: step1. setting color=0x000000. + */ + jerry_value_t colorKey = jerry_create_string((const jerry_char_t*)"color"); + // 0(0x000000) + const int32_t percentNum = 0x000000; + const int32_t redNum = 0x00; + const int32_t greenNum = 0x00; + const int32_t blueNum = 0x00; + jerry_value_t colorValue = jerry_create_number(percentNum); + jerry_set_property(objStaticStyle, colorKey, colorValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.expected: step1. get color=0x000000. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + ColorType tempColor; + tempColor.full = progressView->GetForegroundStyle(STYLE_BACKGROUND_COLOR); + if (tempColor.red == redNum && + tempColor.green == greenNum && + tempColor.blue == blueNum) { + printf("[Test Case] [HorizonProgressTest009] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest009] FAILED\n"); + } + EXPECT_TRUE(tempColor.red == redNum); + EXPECT_TRUE(tempColor.green == greenNum); + EXPECT_TRUE(tempColor.blue == blueNum); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest013() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + /** + * @tc.steps: step1. setting color=0x80000000. + */ + jerry_value_t colorKey = jerry_create_string((const jerry_char_t*)"color"); + // 2147483648(0x80000000) + const int32_t percentNum = 2147483648; + const int32_t redNum = 0x00; + const int32_t greenNum = 0x00; + const int32_t blueNum = 0x00; + jerry_value_t colorValue = jerry_create_number(percentNum); + jerry_set_property(objStaticStyle, colorKey, colorValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.expected: step1. get color=0x000000. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + ColorType tempColor; + tempColor.full = progressView->GetForegroundStyle(STYLE_BACKGROUND_COLOR); + if (tempColor.red == redNum && + tempColor.green == greenNum && + tempColor.blue == blueNum) { + printf("[Test Case] [HorizonProgressTest013] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest013] FAILED\n"); + } + EXPECT_TRUE(tempColor.red == redNum); + EXPECT_TRUE(tempColor.green == greenNum); + EXPECT_TRUE(tempColor.blue == blueNum); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest014() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + /** + * @tc.steps: step1. setting strokeWidth=0. + */ + jerry_value_t colorKey = jerry_create_string((const jerry_char_t*)"strokeWidth"); + const int32_t strokeWidth = 0; + jerry_value_t colorValue = jerry_create_number(strokeWidth); + jerry_set_property(objStaticStyle, colorKey, colorValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + /** + * @tc.expected: step1. get strokeWidth=0. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValidHeight() == strokeWidth) { + printf("[Test Case] [HorizonProgressTest014] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest014] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValidHeight() == strokeWidth); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest015() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + /** + * @tc.steps: step1. setting strokeWidth=32767. + */ + jerry_value_t colorKey = jerry_create_string((const jerry_char_t*)"strokeWidth"); + const int32_t strokeWidth = 32767; + jerry_value_t colorValue = jerry_create_number(strokeWidth); + jerry_set_property(objStaticStyle, colorKey, colorValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + /** + * @tc.expected: step1. get strokeWidth=32767. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValidHeight() == strokeWidth) { + printf("[Test Case] [HorizonProgressTest015] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest015] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValidHeight() == strokeWidth); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest016() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + /** + * @tc.steps: step1. setting strokeWidth=32768. + */ + jerry_value_t colorKey = jerry_create_string((const jerry_char_t*)"strokeWidth"); + const int32_t strokeWidth = 32768; + jerry_value_t colorValue = jerry_create_number(strokeWidth); + jerry_set_property(objStaticStyle, colorKey, colorValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + /** + * @tc.expected: step1. progress component will not crash. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValidHeight() != strokeWidth) { + printf("[Test Case] [HorizonProgressTest016] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest016] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValidHeight() != strokeWidth); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::HorizonProgressTest017() +{ + TDD_CASE_BEGIN(); + jerry_value_t typeId = jerry_create_string((const jerry_char_t*)"type"); + jerry_value_t typeValue = jerry_create_string((const jerry_char_t*)"horizontal"); + jerry_set_property(objAttrs, typeId, typeValue); + jerry_release_value(typeId); + jerry_release_value(typeValue); + /** + * @tc.steps: step1. setting strokeWidth=-1. + */ + jerry_value_t colorKey = jerry_create_string((const jerry_char_t*)"strokeWidth"); + const int32_t strokeWidth = -1; + jerry_value_t colorValue = jerry_create_number(strokeWidth); + jerry_set_property(objStaticStyle, colorKey, colorValue); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("progress", strlen("progress")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + if (component == nullptr) { + TDD_CASE_END(); + return; + } + rootComponentMock_.RenderComponent(*component); + /** + * @tc.expected: step1. get default strokeWidth=32. + */ + UIBoxProgress* progressView = reinterpret_cast(component->GetComponentRootView()); + if (progressView->GetValidHeight() == strokeWidth) { + printf("[Test Case] [HorizonProgressTest017] PASSED\n"); + } else { + printf("[Test Case] [HorizonProgressTest017] FAILED\n"); + } + EXPECT_TRUE(progressView->GetValidHeight() == strokeWidth); + delete (progressView); + progressView = nullptr; + TDD_CASE_END(); +} + +void HorizonProgressTddTest::RunTests() +{ + HorizonProgressTest001(); + HorizonProgressTest002(); + HorizonProgressTest003(); + HorizonProgressTest004(); + HorizonProgressTest005(); + HorizonProgressTest006(); + HorizonProgressTest007(); + HorizonProgressTest008(); + HorizonProgressTest009(); + HorizonProgressTest013(); + HorizonProgressTest014(); + HorizonProgressTest015(); + HorizonProgressTest016(); + HorizonProgressTest017(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: Component_HorizonProgress_Create_Test_001 + * @tc.desc: Verify progress component will restore the default progress type=horizontal if setting not exist type. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon001, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest001(); +} + +/** + * @tc.name: Component_HorizonProgress_Create_Test_002 + * @tc.desc: Verify progress component will restore the default progress type=horizontal if setting empty type. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon002, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest002(); +} + +/** + * @tc.name: Component_HorizonProgress_Create_Test_003 + * @tc.desc: Verify progress component setting normal progress attribute: type=arc successfully. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon003, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest003(); +} + +/** + * @tc.name: Component_HorizonProgress_Atrribute_Test_001 + * @tc.desc: Verify progress component will not crash when setting error attribute: percent=-32768. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon004, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest004(); +} + +/** + * @tc.name: Component_HorizonProgress_Atrribute_Test_002 + * @tc.desc: Verify progress component setting normal attribute: percent=100 successfully. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon005, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest005(); +} + +/** + * @tc.name: Component_HorizonProgress_Atrribute_Test_003 + * @tc.desc: Verify progress component will not crash when setting error attribute: percent=32767. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon006, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest006(); +} + +/** + * @tc.name: Component_HorizonProgress_Atrribute_Test_004 + * @tc.desc: Verify progress component will not crash when setting error attribute: percent=-32769. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon007, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest007(); +} + +/** + * @tc.name: Component_HorizonProgress_Atrribute_Test_005 + * @tc.desc: Verify progress component will not crash when setting error attribute: percent=32768. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon008, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest008(); +} + +/** + * @tc.name: Component_HorizonProgress_style_Test_001 + * @tc.desc: Verify progress component setting normal progress style: color=0x000000(0) successfully. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon009, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest009(); +} + +/** + * @tc.name: Component_HorizonProgress_style_Test_005 + * @tc.desc: Verify progress component will restore the default color=0x6B9AC7(7051975) if setting error value. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon013, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest013(); +} + +/** + * @tc.name: Component_HorizonProgress_style_Test_006 + * @tc.desc: Verify progress component setting normal progress style: strokeWidth=0 successfully. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon014, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest014(); +} + +/** + * @tc.name: Component_HorizonProgress_style_Test_007 + * @tc.desc: Verify progress component setting normal progress style: strokeWidth=32767 successfully. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon015, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest015(); +} + +/** + * @tc.name: Component_HorizonProgress_style_Test_008 + * @tc.desc: Verify progress component will not crash when setting error style: strokeWidth=32768. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon016, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest016(); +} + +/** + * @tc.name: Component_HorizonProgress_style_Test_009 + * @tc.desc: Verify progress component support setting error stroke width. + * @tc.require: AR000DSEFE + */ +HWTEST_F(HorizonProgressTddTest, horizon017, TestSize.Level1) +{ + HorizonProgressTddTest::HorizonProgressTest017(); +} +#endif +} // ACELite +} // OHOS diff --git a/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h b/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h new file mode 100755 index 0000000..715c967 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_HORIZON_H +#define OHOS_ACELITE_TEST_HORIZON_H + +#include "component_factory.h" +#include "root_component_mock.h" +#include "test_common.h" + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class HorizonProgressTddTest : public testing::Test { +#else +class HorizonProgressTddTest { +#endif +public: + HorizonProgressTddTest(); + ~HorizonProgressTddTest(){}; + void SetUp(); + void TearDown(); + void HorizonProgressTest001(); + void HorizonProgressTest002(); + void HorizonProgressTest003(); + void HorizonProgressTest004(); + void HorizonProgressTest005(); + void HorizonProgressTest006(); + void HorizonProgressTest007(); + void HorizonProgressTest008(); + void HorizonProgressTest009(); + void HorizonProgressTest013(); + void HorizonProgressTest014(); + void HorizonProgressTest015(); + void HorizonProgressTest016(); + void HorizonProgressTest017(); + void RunTests(); + + jerry_value_t objGlob; + jerry_value_t objAttrs; + jerry_value_t objStaticStyle; + +private: + RootComponentMock rootComponentMock_; +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_HORIZON_H diff --git a/frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.cpp new file mode 100755 index 0000000..9caf512 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.cpp @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "image_src_path_tdd_test.h" +#include +#include +#include "js_app_context.h" + +namespace OHOS { +namespace ACELite { +/** + * @tc.name: ImageSrcPrivateDataPathSupport001 + * @tc.desc: Verify the path contact processing + * @tc.require: AR000F3PE1 + */ +HWTEST_F(ImageSrcPathTddTest, PrivateDataPathSupport001, TestSize.Level0) +{ + /** + * @tc.steps: step1. pass nullptr for processing + */ + char *result = JsAppContext::GetInstance()->GetResourcePath(nullptr); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_EQ(result, nullptr); +} + +/** + * @tc.name: ImageSrcPrivateDataPathSupport002 + * @tc.desc: Verify the path contact processing + * @tc.require: AR000F3PE1 + */ +HWTEST_F(ImageSrcPathTddTest, PrivateDataPathSupport002, TestSize.Level0) +{ + /** + * @tc.steps: step1. pass empty string for handling + */ + char *resourcePath = JsAppContext::GetInstance()->GetResourcePath(""); + /** + * @tc.steps: step2. check if handling failed + */ + EXPECT_EQ(resourcePath, nullptr); +} + +/** + * @tc.name: ImageSrcPrivateDataPathSupport003 + * @tc.desc: Verify the path contact processing + * @tc.require: AR000F3PE1 + */ +HWTEST_F(ImageSrcPathTddTest, PrivateDataPathSupport003, TestSize.Level0) +{ + /** + * @tc.steps: step1. pass empty string for handling + */ + JsAppContext::GetInstance()->SetCurrentAbilityInfo("app/run/", "com.huawei.test", 0); + char *resourcePath = JsAppContext::GetInstance()->GetResourcePath("abc.png"); + /** + * @tc.steps: step2. check if handling failed + */ + printf("resourcePath: %s\n", resourcePath); + EXPECT_STREQ(resourcePath, "app/run/abc.png"); +} + +/** + * @tc.name: ImageSrcPrivateDataPathSupport004 + * @tc.desc: Verify the path contact processing + * @tc.require: AR000F3PE1 + */ +HWTEST_F(ImageSrcPathTddTest, PrivateDataPathSupport004, TestSize.Level0) +{ + /** + * @tc.steps: step1. pass empty string for handling + */ + char *resourcePath = JsAppContext::GetInstance()->GetResourcePath("internal://app/abc.png"); + /** + * @tc.steps: step2. check if handling failed + */ + EXPECT_EQ(resourcePath, nullptr); +} + +/** + * @tc.name: ImageSrcPrivateDataPathSupport005 + * @tc.desc: Verify the path contact processing + * @tc.require: AR000F3PE1 + */ +HWTEST_F(ImageSrcPathTddTest, PrivateDataPathSupport005, TestSize.Level0) +{ + /** + * @tc.steps: step1. pass empty string for handling + */ + char *resourcePath = JsAppContext::GetInstance()->GetResourcePath("internal://app/testa/testb/testc/abc.png"); + /** + * @tc.steps: step2. check if handling failed + */ + EXPECT_EQ(resourcePath, nullptr); +} + +/** + * @tc.name: ImageSrcPrivateDataPathSupport006 + * @tc.desc: Verify the path contact processing + * @tc.require: AR000F3PE1 + */ +HWTEST_F(ImageSrcPathTddTest, PrivateDataPathSupport006, TestSize.Level0) +{ + /** + * @tc.steps: step1. prepare one very long string, longer than 255 + */ + const char *filePath = + "internal://app/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/" + "abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc//abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/" + "abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc/abc.png"; + char *resourcePath = JsAppContext::GetInstance()->GetResourcePath(filePath); + /** + * @tc.steps: step2. check if handling failed + */ + EXPECT_EQ(resourcePath, nullptr); +} + +/** + * used for debugging TDD implementation on simulator + */ +void ImageSrcPathTddTest::RunTests() +{ +#ifndef TDD_ASSERTIONS + PrivateDataPathSupport001(); + PrivateDataPathSupport002(); + PrivateDataPathSupport003(); + PrivateDataPathSupport004(); + PrivateDataPathSupport005(); + PrivateDataPathSupport006(); +#endif // TDD_ASSERTIONS +} +} // namespace ACELite +} // namespace OHOS \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.h b/frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.h new file mode 100755 index 0000000..56b7f49 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/image_src_path_tdd_test.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef ACELITE_IMAGE_SRC_PATH_TDD_TEST_H +#define ACELITE_IMAGE_SRC_PATH_TDD_TEST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "acelite_config.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class ImageSrcPathTddTest : public testing::Test { +#else +class ImageSrcPathTddTest { +#endif +public: + ImageSrcPathTddTest() = default; + ~ImageSrcPathTddTest() = default; + void PrivateDataPathSupport001(); + void PrivateDataPathSupport002(); + void PrivateDataPathSupport003(); + void PrivateDataPathSupport004(); + void PrivateDataPathSupport005(); + void PrivateDataPathSupport006(); + void RunTests(); +}; +} +} +#endif // ACELITE_IMAGE_SRC_PATH_TDD_TEST_H diff --git a/frameworks/src/core/components/test/unittest/common/input_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/input_tdd_test.cpp new file mode 100755 index 0000000..c475163 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/input_tdd_test.cpp @@ -0,0 +1,1360 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "input_tdd_test.h" +#include "ace_log.h" +#include "component_factory.h" +#include "input_button_component.h" +#include "input_checkbox_component.h" +#include "input_radio_component.h" +#include "js_app_context.h" +#include "js_app_environment.h" +#include "js_fwk_common.h" +#include "style.h" +#include "ui_label_button.h" +#include "ui_view.h" + +namespace OHOS { +namespace ACELite { +InputTddTest::InputTddTest() + : globalObject_(UNDEFINED), + attrsObject_(UNDEFINED), + valueStaticStyle_(UNDEFINED) {} + +void InputTddTest::SetUp() +{ + JsAppEnvironment *environment = JsAppEnvironment::GetInstance(); + environment->InitJsFramework(); + globalObject_ = jerry_get_global_object(); + const char *attrName = "attrs"; + jerry_value_t keyAttrs = jerry_create_string(reinterpret_cast(attrName)); + attrsObject_ = jerry_create_object(); + jerry_release_value(jerry_set_property(globalObject_, keyAttrs, attrsObject_)); + const char *styleName = "staticStyle"; + jerry_value_t styleProp = jerry_create_string(reinterpret_cast(styleName)); + valueStaticStyle_ = jerry_create_object(); + jerry_release_value(jerry_set_property(globalObject_, styleProp, valueStaticStyle_)); + jerry_release_value(keyAttrs); + jerry_release_value(styleProp); + rootComponentMock_.PrepareRootContainer(); +} + +void InputTddTest::TearDown() +{ + ReleaseJerryValue(attrsObject_, globalObject_, valueStaticStyle_, VA_ARG_END_FLAG); + JsAppContext::GetInstance()->ReleaseStyles(); +} + +UIView *InputTddTest::GetComponent() const +{ + uint16_t componentId = KeyParser::ParseKeyId("input"); + jerry_value_t children = UNDEFINED; + Component *component = ComponentFactory::CreateComponent(componentId, globalObject_, children); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create input component error"); + return nullptr; + } + rootComponentMock_.RenderComponent(*component); + UIView *view = component->GetComponentRootView(); + if (view == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create input component error"); + } + jerry_release_value(children); + return view; +} + +void InputTddTest::AddStringProperty(jerry_value_t object, const char *name, const char *value) const +{ + jerry_value_t nameProp = jerry_create_string(reinterpret_cast(name)); + jerry_value_t valueProp = jerry_create_string(reinterpret_cast(value)); + jerry_release_value(jerry_set_property(object, nameProp, valueProp)); + ReleaseJerryValue(nameProp, valueProp, VA_ARG_END_FLAG); +} + +void InputTddTest::AddNumberProperty(jerry_value_t object, const char *name, const double value) const +{ + jerry_value_t nameProp = jerry_create_string(reinterpret_cast(name)); + jerry_value_t valueProp = jerry_create_number(value); + jerry_release_value(jerry_set_property(object, nameProp, valueProp)); + ReleaseJerryValue(nameProp, valueProp, VA_ARG_END_FLAG); +} + +void InputTddTest::AddBoolProperty(jerry_value_t object, const char *name, bool value) const +{ + jerry_value_t nameProp = jerry_create_string(reinterpret_cast(name)); + jerry_value_t valueProp = jerry_create_boolean(value); + jerry_release_value(jerry_set_property(object, nameProp, valueProp)); + ReleaseJerryValue(nameProp, valueProp, VA_ARG_END_FLAG); +} + +bool InputTddTest::CompareColor(ColorType color, uint32_t colorIntValue) const +{ + uint8_t red8 = uint8_t((colorIntValue & TEXT_RED_COLOR_MASK) >> RED_COLOR_START_BIT); + uint8_t green8 = uint8_t((colorIntValue & TEXT_GREEN_COLOR_MASK) >> GREEN_COLOR_START_BIT); + uint8_t blue8 = uint8_t((colorIntValue & TEXT_BLUE_COLOR_MASK)); + ColorType compare = Color::GetColorFromRGB(red8, green8, blue8); + return (color.blue == compare.blue && color.red == compare.red && color.green == compare.green); +} + +UIRadioButton *InputTddTest::ConvertView(const char *name) const +{ + UIView *view = GetComponent(); + if (view == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "the view is null in %s", name); + return nullptr; + } + UIRadioButton *radio = reinterpret_cast(view); + return radio; +} + +void InputTddTest::ComponentInputAttributeTest01() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step1:set the type checkbox and get the native element + */ + const char *prop = "type"; + const char *value = "checkbox"; + AddStringProperty(attrsObject_, prop, value); + UICheckBox *checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() != UICheckBox::UNSELECTED) { + HILOG_ERROR(HILOG_MODULE_ACE, "create checkbox, the checked attribute is error"); + return; + } + + /** + * @tc.steps:step2:set the checked attribute true + * @tc.expect: the value of checked is selected + */ + const char *checkedProp = "checked"; + AddBoolProperty(attrsObject_, checkedProp, true); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() != UICheckBox::SELECTED) { + HILOG_ERROR(HILOG_MODULE_ACE, "checkbox set checked true error"); + return; + } + + /** + * @tc.steps: step3:set the checked attribute false + * @tc.expect: the value of checked attribute is unselected + */ + AddBoolProperty(attrsObject_, checkedProp, false); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() != UICheckBox::UNSELECTED) { + HILOG_INFO(HILOG_MODULE_ACE, "Checkbox set checked false error"); + } + + /** + * @tc.steps: step4:set the checked attribute + * @tc.expected: the checked attribute is error + */ + const char *stringChecked = "aaaa"; + AddStringProperty(attrsObject_, checkedProp, stringChecked); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() != UICheckBox::UNSELECTED) { + HILOG_ERROR(HILOG_MODULE_ACE, "Checkbox set checked attribute error"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest01 pass"); + } + EXPECT_TRUE(checkbox->GetState() == UICheckBox::UNSELECTED); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputAttributeTest02() +{ + TDD_CASE_BEGIN(); + /** + * @steps: step1: set the attibute type button + */ + const char *type = "type"; + const char *typeValue = "button"; + AddStringProperty(attrsObject_, type, typeValue); + + /** + * @steps: step2: set the attribute value aaaa + * @tc.expected:the value of button is aaaa + */ + const char *value = "value"; + const char *valueProperty = "aaa"; + AddStringProperty(attrsObject_, value, valueProperty); + UILabelButton *button = reinterpret_cast(GetComponent()); + if (strcmp(button->GetText(), valueProperty)) { + HILOG_ERROR(HILOG_MODULE_ACE, "the attribute value of button set incorrect"); + } + + /** + * @steps: step2: set the attribute value nullptr + * @tc.expected: the value of button is nullptr + */ + jerry_value_t nullProp = UNDEFINED; + jerry_value_t valueProp = jerry_create_string(reinterpret_cast(value)); + jerry_release_value(jerry_set_property(attrsObject_, valueProp, nullProp)); + button = reinterpret_cast(GetComponent()); + if (button->GetText()) { + HILOG_ERROR(HILOG_MODULE_ACE, "execute setting value null error"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest002 passed"); + } + EXPECT_FALSE(button->GetText()); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputStyleTest04() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1:set the type attribute button + */ + const char *type = "type"; + const char *typeValue = "button"; + AddStringProperty(attrsObject_, type, typeValue); + const char *value = "value"; + const char *valueItem = "aaaa"; + AddStringProperty(attrsObject_, value, valueItem); + UILabelButton *button = reinterpret_cast(GetComponent()); + if (button == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create button failed"); + } + + /** + * @tc.steps:step2:set the color value 16711680 + * @tc.expected:the font color of UILabelButton is red + */ + const char *color = "color"; + const int32_t redValue = 16711680; + AddNumberProperty(valueStaticStyle_, color, redValue); + button = reinterpret_cast(GetComponent()); + ColorType tempColor; + tempColor.full = button->GetLabelStyle(STYLE_TEXT_COLOR); + if (!CompareColor(tempColor, redValue)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the color error"); + } + + /** + * @tc.steps: step3:set the color value 21474836481 + * @tc.expected: the font color of UILabelButton is red + */ + const int32_t max = 2147483648; + AddNumberProperty(valueStaticStyle_, color, max); + button = reinterpret_cast(GetComponent()); + tempColor.full = button->GetLabelStyle(STYLE_TEXT_COLOR); + if (!CompareColor(tempColor, max)) { + HILOG_ERROR(HILOG_MODULE_ACE, "test the value of color in button error"); + } + + /** + * @tc.steps: step4: set the color property -21474836482 + * @tc.expected: the font color of UILabelButton is red + */ + const int32_t min = INT_MIN; + AddNumberProperty(valueStaticStyle_, color, min); + button = reinterpret_cast(GetComponent()); + tempColor.full = button->GetLabelStyle(STYLE_TEXT_COLOR); + if (CompareColor(tempColor, min)) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputStyleTest04 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "test the min value of font color error"); + } + EXPECT_TRUE(CompareColor(tempColor, min)); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputStyleTest05() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step1: set the attribute type button + */ + const char *type = "type"; + const char *typeValue = "button"; + AddStringProperty(attrsObject_, type, typeValue); + UILabelButton *button = reinterpret_cast(GetComponent()); + if (button == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create button failed"); + } + + /** + * @tc.steps:step2:set the attribute textAlign center + * @tc.expected: the align attribute is UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER + */ + const char *textAlign = "textAlign"; + const char *center = "center"; + AddStringProperty(valueStaticStyle_, textAlign, center); + button = reinterpret_cast(GetComponent()); + if (button->GetAlign() != UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the center textAlign error"); + } + + /** + * @tc.steps:step3:set the attribute textAlign right + * @tc.expected:the align attribute is UITextLanguageAlignment::TEXT_ALIGNMENT_RIGHT + */ + const char *right = "right"; + AddStringProperty(valueStaticStyle_, textAlign, right); + button = reinterpret_cast(GetComponent()); + if (button->GetAlign() != UITextLanguageAlignment::TEXT_ALIGNMENT_RIGHT) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the align attribute right error"); + } + + /** + * @tc.steps:step4:set the attribute textAlign left + * @tc.expected: the align attribute is UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT + */ + const char *left = "left"; + AddStringProperty(valueStaticStyle_, textAlign, left); + button = reinterpret_cast(GetComponent()); + if (button->GetAlign() != UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the textAlign attribute left error."); + } + + /** + * @tc.steps:step5:set the attribute textAlign aaa + * @tc.expected:the align attribute is UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER + */ + const char *errorValue = "aaa"; + AddStringProperty(valueStaticStyle_, textAlign, errorValue); + button = reinterpret_cast(GetComponent()); + if (button->GetAlign() == UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputStyleTest05 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set textAlign aaa test failed"); + } + EXPECT_TRUE(button->GetAlign() == UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputAttributeTest06() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step1:set the type attribute checkbox + */ + const char *type = "type"; + const char *checkboxValue = "checkbox"; + AddStringProperty(attrsObject_, type, checkboxValue); + UICheckBox *checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() != UICheckBox::UNSELECTED) { + HILOG_ERROR(HILOG_MODULE_ACE, "checkbox is create and the status is error"); + } + + /** + * @tc.steps:step2:set the checked attribute true + * @tc.expected: the status of checkbox is selected + */ + const char *checked = "checked"; + AddBoolProperty(attrsObject_, checked, true); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() != UICheckBox::SELECTED) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the checked attribute true error"); + } + + /** + * @tc.steps:step3:set the checked attribute false + * @tc.expected: the status of checkbox is unselected + */ + AddBoolProperty(attrsObject_, checked, false); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() != UICheckBox::UNSELECTED) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the checked attribute false error"); + } + + /** + * @tc.steps: set the checked attribute aaaa + * @tc.expected:the status of checkbox is unselected + */ + const char *value = "aaaa"; + AddStringProperty(attrsObject_, checked, value); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetState() == UICheckBox::UNSELECTED) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest06 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the value aaaa error"); + } + EXPECT_TRUE(checkbox->GetState() == UICheckBox::UNSELECTED); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputAttributeTest07() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step1:set tye type attribute button + */ + const char *type = "type"; + const char *typeValue = "button"; + AddStringProperty(attrsObject_, type, typeValue); + /** + * @tc.steps:step2:set the attribute width 50 + * @tc.expected:the width of UILabelButton is 50 + */ + const char *width = "width"; + const int widthNumber = 50; + AddNumberProperty(valueStaticStyle_, width, widthNumber); + UILabelButton *button = reinterpret_cast(GetComponent()); + if (button->GetWidth() != widthNumber) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the width attribute failed"); + } + + /** + * @tc.steps:step3:set the attribute height 20 + * @tc.expected:the height of UILabelButton is 20 + */ + const char *height = "height"; + const int heightValue = 20; + AddNumberProperty(valueStaticStyle_, height, heightValue); + button = reinterpret_cast(GetComponent()); + if (button->GetHeight() != heightValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute height error"); + } + + /** + * @tc.steps:step6:set the attribute id button1 + * @tc.expected: the id of button is button1 + */ + const char *id = "id"; + const char *idValue = "button1"; + AddStringProperty(attrsObject_, id, idValue); + button = reinterpret_cast(GetComponent()); + if (!strcmp(button->GetViewId(), idValue)) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest07 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute id error"); + } + EXPECT_TRUE(!strcmp(button->GetViewId(), idValue)); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputStyleTest08() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step1:set the type button + */ + const char *type = "type"; + const char *buttonValue = "button"; + AddStringProperty(attrsObject_, type, buttonValue); + /** + * @tc.steps: step2: set the margin 100 + * @tc.expected: the value of margin is 100 + */ + const char *margin = "margin"; + const int marginValue = 100; + AddNumberProperty(valueStaticStyle_, margin, marginValue); + UILabelButton *button = reinterpret_cast(GetComponent()); + int16_t left = button->GetStyle(STYLE_MARGIN_LEFT); + int16_t right = button->GetStyle(STYLE_MARGIN_RIGHT); + int16_t top = button->GetStyle(STYLE_MARGIN_TOP); + int16_t bottom = button->GetStyle(STYLE_MARGIN_BOTTOM); + if (!(left == marginValue && right == marginValue && top == marginValue && bottom == marginValue)) { + HILOG_INFO(HILOG_MODULE_ACE, "set the attribute margin failed"); + } + /** + * @tc.steps:step3:set the attribute marginLeft 10 + * @tc.expected:the value of marginLeft is 10 + */ + const char *marginLeft = "marginLeft"; + const int marginLeftValue = 10; + AddNumberProperty(valueStaticStyle_, marginLeft, marginLeftValue); + button = reinterpret_cast(GetComponent()); + left = button->GetStyle(STYLE_MARGIN_LEFT); + if (left != marginLeftValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginLeft error"); + } + TDD_CASE_END(); + ComponentInputStyleTest08Extra(right, top, bottom); +} + +void InputTddTest::ComponentInputStyleTest08Extra(int16_t right, int16_t top, int16_t bottom) +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step4:set the attribute marginButtom 10 + * @tc.expected: the attribute of marginButton 10 + */ + const char *marginButtom = "marginBottom"; + const int marginButtomValue = 10; + AddNumberProperty(valueStaticStyle_, marginButtom, marginButtomValue); + UILabelButton *button = reinterpret_cast(GetComponent()); + bottom = button->GetStyle(STYLE_MARGIN_BOTTOM); + if (bottom != marginButtomValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginButtom failed"); + } + /** + * @tc.steps: step5: set the attribute marginRight 10 + * @tc.expected: the value of marginRight is 10 + */ + const char *marginRight = "marginRight"; + const int marginRightValue = 10; + AddNumberProperty(valueStaticStyle_, marginRight, marginRightValue); + button = reinterpret_cast(GetComponent()); + right = button->GetStyle(STYLE_MARGIN_RIGHT); + if (right != marginRightValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginRight failed"); + } + /** + * @tc.steps: step6: set the attribute marginTop 10 + * @tc.expected: the attribute marginTop is 10 + */ + const char *marginTop = "marginTop"; + const int marginTopValue = 10; + AddNumberProperty(valueStaticStyle_, marginTop, marginTopValue); + button = reinterpret_cast(GetComponent()); + top = button->GetStyle(STYLE_MARGIN_TOP); + if (top != marginTopValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginTop failed"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputStyleTest08 passed"); + } + EXPECT_FALSE(top != marginTopValue); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputStyleTest09() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1:set the attribute button + */ + const char *type = "type"; + const char *typeValue = "button"; + AddStringProperty(attrsObject_, type, typeValue); + + /** + * @tc.steps: step2:set the borderWidth 2 + * @tc.expected:the border width of button is 2 + */ + const char *borderWidth = "borderWidth"; + const int borderWidthValue = 2; + AddNumberProperty(valueStaticStyle_, borderWidth, borderWidthValue); + UILabelButton *button = reinterpret_cast(GetComponent()); + if (button->GetStyle(STYLE_BORDER_WIDTH) != borderWidthValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the borderWidth failed"); + return; + } + + /** + * @tc.steps: step3:set the borderColor red + * @tc.expected: the borderColor of UILabelButton is red + */ + const char *borderColor = "borderColor"; + const int color = 16711680; + AddNumberProperty(valueStaticStyle_, borderColor, color); + button = reinterpret_cast(GetComponent()); + ColorType tempColor; + tempColor.full = button->GetStyle(STYLE_BORDER_COLOR); + if (!CompareColor(tempColor, color)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute border color failed"); + } + + /** + * @tc.step: step4:set the radius 1 + * @tc.expected: the attribute of radius is 1 + */ + const char *radius = "borderRadius"; + const int radiusNum = 1; + AddNumberProperty(valueStaticStyle_, radius, radiusNum); + button = reinterpret_cast(GetComponent()); + if (button->GetStyle(STYLE_BORDER_RADIUS) != 1) { + HILOG_INFO(HILOG_MODULE_ACE, "set the radius failed"); + } + + /** + * @tc.steps: step5:set the attribute backgroundColor red + * @tc.expected: the backgroundColor of UILabelButton is red + */ + const char *backgroundColor = "backgroundColor"; + AddNumberProperty(valueStaticStyle_, backgroundColor, color); + button = reinterpret_cast(GetComponent()); + tempColor.full = button->GetStyle(STYLE_BACKGROUND_COLOR); + if (CompareColor(tempColor, color)) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputStyleTest09 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute backgroundColor failed"); + } + EXPECT_TRUE(CompareColor(tempColor, color)); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputAttributeTest10() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1:set the attribute button + */ + const char *type = "type"; + const char *typeValue = "checkbox"; + AddStringProperty(attrsObject_, type, typeValue); + + /** + * @tc.steps:step2:set the attribute width 50 + * @tc.expected: the width of checkbox is 50 + */ + const char *width = "width"; + const int widthValue = 50; + AddNumberProperty(valueStaticStyle_, width, widthValue); + UICheckBox *checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetWidth() != widthValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute of width failed"); + } + + /** + * @tc.steps:step3:set the attribute height 20 + * @tc.expected: the height of UILabelButton is 20 + */ + const char *height = "height"; + const int heightValue = 20; + AddNumberProperty(valueStaticStyle_, height, heightValue); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetHeight() != heightValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute height failed"); + } + + /** + * @tc.steps: step4:set the attribute id checkbox1 + * @tc.expected: the attribute id of checkbox is checkbox1 + */ + const char *id = "id"; + const char *idValue = "button1"; + AddStringProperty(attrsObject_, id, idValue); + checkbox = reinterpret_cast(GetComponent()); + if (!strcmp(idValue, checkbox->GetViewId())) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest10 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "Set the attribute id of checkbox failed"); + } + EXPECT_TRUE(!strcmp(idValue, checkbox->GetViewId())); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputStyleTest11() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step1: set the attribute type checkbox + */ + const char *type = "type"; + const char *typeValue = "checkbox"; + AddStringProperty(attrsObject_, type, typeValue); + /** + * @tc.steps:step2:set the attribute margin 10 + * @tc.expected:the attribute margin of checkbox is 10 + */ + const char *margin = "margin"; + const int marginValue = 100; + AddNumberProperty(valueStaticStyle_, margin, marginValue); + UICheckBox *checkbox = reinterpret_cast(GetComponent()); + int16_t left = checkbox->GetStyle(STYLE_MARGIN_LEFT); + int16_t right = checkbox->GetStyle(STYLE_MARGIN_RIGHT); + int16_t top = checkbox->GetStyle(STYLE_MARGIN_TOP); + int16_t bottom = checkbox->GetStyle(STYLE_MARGIN_BOTTOM); + if (!(left == marginValue && right == marginValue && top == marginValue && bottom == marginValue)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute margin failed"); + } + /** + * @tc.steps:step3:set the attribute marginLeft 10 + * @tc.expected: the attribute margin left is 10 + */ + const char *marginLeft = "marginLeft"; + const int value = 20; + AddNumberProperty(valueStaticStyle_, marginLeft, value); + checkbox = reinterpret_cast(GetComponent()); + left = checkbox->GetStyle(STYLE_MARGIN_LEFT); + if (left != value) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginLeft failed"); + } + /** + * @tc.steps: step4: set the attribute marginRight 10 + * @tc.expected: the value of marginRight is 10 + */ + const char *marginRight = "marginRight"; + AddNumberProperty(valueStaticStyle_, marginRight, value); + checkbox = reinterpret_cast(GetComponent()); + right = checkbox->GetStyle(STYLE_MARGIN_RIGHT); + if (right != value) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginRight failed"); + } + /** + * @tc.steps:step5:set the attribute marginTop 10 + * @tc.expected: the marginRight attribute of checkbox is 10 + */ + const char *marginTop = "marginTop"; + AddNumberProperty(valueStaticStyle_, marginTop, value); + checkbox = reinterpret_cast(GetComponent()); + top = checkbox->GetStyle(STYLE_MARGIN_TOP); + if (top != value) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginTop error"); + } + /** + * @tc.steps: step6:set the attribute marginButtom 10 + * @tc.expected: the attribute marginButtom of checkbox is 10 + */ + const char *marginButtom = "marginBottom"; + AddNumberProperty(valueStaticStyle_, marginButtom, value); + checkbox = reinterpret_cast(GetComponent()); + bottom = checkbox->GetStyle(STYLE_MARGIN_BOTTOM); + if (bottom == value) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputStyleTest11 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute marginButtom failed"); + } + EXPECT_TRUE(bottom == value); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputStyleTest12() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1:set the attribute type checkbox + */ + const char *type = "type"; + const char *typeValue = "checkbox"; + AddStringProperty(attrsObject_, type, typeValue); + + /** + * @tc.steps: step2:set the attribute borderWidth 2 + * @tc.expected: the borderWidth of checkbox is 2 + */ + const char *borderWidth = "borderWidth"; + const int borderWidthValue = 2; + AddNumberProperty(valueStaticStyle_, borderWidth, borderWidthValue); + UICheckBox *checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetStyle(STYLE_BORDER_WIDTH) != borderWidthValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the style borderWidth failed"); + } + + /** + * @tc.steps: step3:set the attribute borderColor red + * @tc.expected: the borderColor of checkbox is red + */ + const char *borderColor = "borderColor"; + const int color = 16711680; + AddNumberProperty(valueStaticStyle_, borderColor, color); + checkbox = reinterpret_cast(GetComponent()); + ColorType tempColor; + tempColor.full = checkbox->GetStyle(STYLE_BORDER_COLOR); + if (!CompareColor(tempColor, color)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute borderColor of checkbox failed"); + } + + /** + * @tc.steps: step4:set the attribute radius 1 + * @tc.expected:the style radius of checkbox is 1 + */ + const char *radius = "borderRadius"; + const int radiusValue = 1; + AddNumberProperty(valueStaticStyle_, radius, radiusValue); + checkbox = reinterpret_cast(GetComponent()); + if (checkbox->GetStyle(STYLE_BORDER_RADIUS) != radiusValue) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute radius failed"); + } + + /** + * @tc.steps:step5:set the backgroundColor red + * @tc.expected: the backgroundColor of checkbox is red + */ + const char *backgroundColor = "backgroundColor"; + AddNumberProperty(valueStaticStyle_, backgroundColor, color); + checkbox = reinterpret_cast(GetComponent()); + tempColor.full = checkbox->GetStyle(STYLE_BACKGROUND_COLOR); + if (CompareColor(tempColor, color)) { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputStyleTest12 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute backgroundColor failed"); + } + EXPECT_TRUE(CompareColor(tempColor, color)); + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputAttributeTest13() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1:set the attribute type button and set the attribute checked true + */ + const char *type = "type"; + const char *typeValue = "button"; + AddStringProperty(attrsObject_, type, typeValue); + const char *checked = "checked"; + AddBoolProperty(attrsObject_, checked, false); + + /** + * @tc.steps:step2:get the component + * @tc.expected: the type of component is button + */ + UIView *view = GetComponent(); + if (view) { + UILabelButton *button = reinterpret_cast(view); + if (button == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create the view failed"); + } + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "check the checked attribute in button error"); + } + + /** + * @tc.steps:step3:set the attribute type checkbox and set the attribute value aaa + */ + const char *checkboxValue = "checkbox"; + AddStringProperty(attrsObject_, type, checkboxValue); + const char *value = "value"; + const char *testValue = "aaa"; + AddStringProperty(attrsObject_, value, testValue); + + /** + * @tc.steps:step4:get the component + * @tc.expected: the type of component is checkbox + */ + view = GetComponent(); + if (view) { + UICheckBox *checkbox = reinterpret_cast(view); + if (checkbox == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create view failed"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest13 passed"); + } + EXPECT_FALSE(checkbox == nullptr); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute value in checkbox failed"); + EXPECT_FALSE(true); + } + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputAttributeTest14() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1:set the attribute type button + * @tc.expected: the class name of component is UILabelButton + */ + const char *type = "type"; + const char *button = "button"; + AddStringProperty(attrsObject_, type, button); + UIView *view = GetComponent(); + if (view) { + UILabelButton *button = reinterpret_cast(view); + if (button == nullptr) { + HILOG_INFO(HILOG_MODULE_ACE, "Create the error view"); + } + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute type button failed"); + } + + /** + * @tc.steps:step2:set the attribute type checkbox + * @tc.expected: the class name of component is UICheckbox + */ + const char *checkbox = "checkbox"; + AddStringProperty(attrsObject_, type, checkbox); + view = GetComponent(); + if (view) { + UILabelButton *button = reinterpret_cast(view); + if (button == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Create the error view"); + } + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the type attribute checkbox failed"); + } + + /** + * @tc.steps:step3:get the component object + * @tc.expected: the className of component is UILabelButton + */ + view = GetComponent(); + if (view) { + UILabelButton *button = reinterpret_cast(view); + if (button == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create the error view"); + } + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "the attribute type is error"); + } + + /** + * @tc.steps:step4:set the type value aaaa + * @tc.expected: the type of component is UILabelButton + */ + const char *testTypeValue = "aaaa"; + AddStringProperty(attrsObject_, type, testTypeValue); + view = GetComponent(); + if (view) { + UILabelButton *button = reinterpret_cast(view); + if (button == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create the error view"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest14 passed"); + } + EXPECT_FALSE(checkbox == nullptr); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the type attribute aaa failed"); + EXPECT_FALSE(true); + } + TDD_CASE_END(); +} + +void InputTddTest::ComponentInputAttributeTest15() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps:step1:set the type checkbox + */ + const char *type = "type"; + const char *typeValue = "checkbox"; + AddStringProperty(attrsObject_, type, typeValue); + + /** + * @tc.steps:step2:set the fontSize mini + * @tc.expected:the className of view is UICheckbox + */ + const char *fontSize = "fontSize"; + const char *fontSizeMini = "mini"; + AddStringProperty(valueStaticStyle_, fontSize, fontSizeMini); + UIView *view = GetComponent(); + if (view) { + UICheckBox *checkbox = reinterpret_cast(view); + if (checkbox == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create view error"); + } + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "check the fontSize in checkbox failed"); + } + + /** + * @tc.steps:step3:set the color red + * @tc.expected: the name of component is UICheckbox + */ + const char *color = "color"; + const int colorValue = 16711680; + AddNumberProperty(valueStaticStyle_, color, colorValue); + view = GetComponent(); + if (view) { + UICheckBox *checkbox = reinterpret_cast(view); + if (checkbox == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create view failed"); + } + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "use attribute color in checkbox failed"); + } + + /** + * @tc.steps: step4:set the attribute textAlign + * @tc.expected: the class name of text + */ + const char *textAlign = "textAlign"; + const char *textAlignLeft = "left"; + AddStringProperty(valueStaticStyle_, textAlign, textAlignLeft); + view = GetComponent(); + if (view) { + UICheckBox *checkbox = reinterpret_cast(view); + if (checkbox == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create the error type view"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "ComponentInputAttributeTest15 passed"); + } + EXPECT_FALSE(checkbox == nullptr); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the textAlign in checkbox failed"); + EXPECT_FALSE(true); + } + TDD_CASE_END(); +} + +void InputTddTest::ComponentRadioAttributeTest01() +{ + TDD_CASE_BEGIN(); + /** + * @steps:step1:set the type attribute radio + * @expected: create UIRadioButton + */ + const char *type = "type"; + const char *typeVal = "radio"; + AddStringProperty(attrsObject_, type, typeVal); + + /** + * @steps:step2:set the attribute checked true + * @expected:the state of radioButton is selected + */ + const char *checked = "checked"; + AddBoolProperty(attrsObject_, checked, true); + const char *tddName = "ComponentRadioAttributeTest01"; + UIRadioButton *radio = ConvertView(tddName); + if (radio == nullptr || (radio->GetState() != UICheckBox::UICheckBoxState::SELECTED)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute checked false"); + return; + } + + /** + * @steps:step3:set the attribute checked false + * @expected:the state of radioButton is unselected + */ + AddBoolProperty(attrsObject_, checked, false); + radio = ConvertView(tddName); + if (radio == nullptr || (radio->GetState() != UICheckBox::UICheckBoxState::UNSELECTED)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute checked false failed"); + return; + } + + /** + * @steps: step4:set the attribute checked aaaa + * @expected: the state of radio is unselected + */ + const char *checkedVal = "aaaa"; + AddStringProperty(attrsObject_, checked, checkedVal); + radio = ConvertView(tddName); + if (radio != nullptr && (radio->GetState() == UICheckBox::UICheckBoxState::UNSELECTED)) { + HILOG_INFO(HILOG_MODULE_ACE, "Component_Radio_Attribute_Test_01 passed"); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "set the checked attribute aaaa failed"); + } + EXPECT_TRUE(radio != nullptr && (radio->GetState() == UICheckBox::UICheckBoxState::UNSELECTED)); + TDD_CASE_END(); +} + +void InputTddTest::ComponentRadioStyleTest03() +{ + TDD_CASE_BEGIN(); + /** + * @steps:step1:set the attribute type radio + */ + const char *type = "type"; + const char *typeVal = "radio"; + AddStringProperty(attrsObject_, type, typeVal); + + /** + * @steps: step2: set the radio border width 2 + * @expected: the border width of radio is 2 + */ + const int borderWidthVal = 2; + const char *borderWidth = "borderWidth"; + AddNumberProperty(valueStaticStyle_, borderWidth, borderWidthVal); + const char *tddName = "ComponentRadioStyleTest03"; + UIRadioButton *radioButton = ConvertView(tddName); + if (radioButton != nullptr) { + Style style = radioButton->GetStyleConst(); + if (style.borderWidth_ != borderWidthVal) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the border width failed"); + return; + } + } else { + return; + } + + /** + * @steps:step3: set the radius 100 + * @expected: the radius of radioButton is 100 + */ + const char *radius = "borderRadius"; + const int radiusVal = 100; + AddNumberProperty(valueStaticStyle_, radius, radiusVal); + radioButton = ConvertView(tddName); + if (radioButton != nullptr) { + Style style = radioButton->GetStyleConst(); + if (style.borderRadius_ != radiusVal) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute radius failed"); + return; + } + } else { + return; + } + + /** + * @steps: step4: set the background color of radioButton red + * @expected: the background color of radiobutton is red + */ + const int32_t redValue = 16711680; + const char *backgroundColor = "backgroundColor"; + AddNumberProperty(valueStaticStyle_, backgroundColor, redValue); + radioButton = ConvertView(tddName); + if (radioButton != nullptr) { + Style style = radioButton->GetStyleConst(); + if (!CompareColor(style.bgColor_, redValue)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the background color failed"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "Component_Radio_Style_Test_03 passed"); + } + EXPECT_FALSE(!CompareColor(style.bgColor_, redValue)); + } else { + return; + } + TDD_CASE_END(); +} + +void InputTddTest::ComponentRadioStyleTest04() +{ + TDD_CASE_BEGIN(); + /** + * @steps:step1:set the attribute type radio + */ + const char *type = "type"; + const char *typeVal = "radio"; + AddStringProperty(attrsObject_, type, typeVal); + + /** + * @steps: step2: set the radio width 50 + * @expected: the width of radio is 50 + */ + const int widthVal = 50; + const char *width = "width"; + AddNumberProperty(valueStaticStyle_, width, widthVal); + const char *tddName = "ComponentRadioStyleTest04"; + UIRadioButton *radioButton = ConvertView(tddName); + if (radioButton == nullptr || (radioButton->GetWidth() != widthVal)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the border width failed"); + return; + } + /** + * @steps:step3: set the radiobutton height 50 + * @expected: the height of radioButton is 50 + */ + const char *height = "height"; + const int heightVal = 50; + AddNumberProperty(valueStaticStyle_, height, heightVal); + radioButton = ConvertView(tddName); + if (radioButton == nullptr || (radioButton->GetHeight() != heightVal)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the attribute height failed"); + return; + } + /** + * @steps: step4: set the attribute id radio1 + * @expected: the id of radioButton is radio1 + */ + const char *id = "id"; + const char *idVal = "radio1"; + AddStringProperty(attrsObject_, id, idVal); + radioButton = ConvertView(tddName); + if (radioButton == nullptr || (strcmp(radioButton->GetViewId(), idVal))) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the background color failed"); + return; + } + /** + * @steps:step5:set the attribute visible false + * @expected: the visible of radiobutton is false + */ + const char *show = "show"; + AddBoolProperty(attrsObject_, show, false); + radioButton = ConvertView(tddName); + if (radioButton == nullptr || (!radioButton->IsVisible())) { + HILOG_ERROR(HILOG_MODULE_ACE, "Component_Radio_Style_Test_04 passed"); + } else { + HILOG_INFO(HILOG_MODULE_ACE, "set the attribute visible false"); + } + EXPECT_TRUE(radioButton == nullptr || (!radioButton->IsVisible())); + TDD_CASE_END(); +} + +void InputTddTest::RunTests() +{ + ComponentInputAttributeTest01(); + ComponentInputAttributeTest02(); + ComponentInputStyleTest04(); + ComponentInputStyleTest05(); + ComponentInputAttributeTest06(); + ComponentInputAttributeTest07(); + ComponentInputStyleTest08(); + ComponentInputStyleTest09(); + ComponentInputAttributeTest10(); + ComponentInputStyleTest11(); + ComponentInputStyleTest12(); + ComponentInputAttributeTest13(); + ComponentInputAttributeTest14(); + ComponentInputAttributeTest15(); + ComponentRadioAttributeTest01(); + ComponentRadioStyleTest03(); + ComponentRadioStyleTest04(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: Component_Input_Attribute_Test_01 + * @tc.desc: test the attribute checked in checkbox is correct + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr001, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest01(); +} + +/** + * @tc.name: Component_Input_Attribute_Test_02 + * @tc.desc: test the attribute value + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr002, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest02(); +} + +/** + * @tc.name: Component_Input_Attribute_Test_06 + * @tc.desc: test the attribute checkbox + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr006, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest06(); +} + +/** + * @tc.name: Component_Input_Attribute_Test_07 + * @tc.desc: check the general attribute could work or not + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr007, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest07(); +} + +/** + * @tc.name: Component_Input_Attribute_Test_10 + * @tc.desc: check the general attribute of checkbox could work or not + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr010, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest10(); +} + +/** + * @tc.name: Component_Input_Attribute_Test_13 + * @tc.desc: test the attribute value in checkbox and the attribute checked in button + * @tc.type:FUNC + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr013, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest13(); +} + +/** + * @tc.name: Component_Input_Attribute_Test_14 + * @tc.desc: test the attribute type + * @tc.type:FUNC + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr014, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest14(); +} + +/** + * @tc.name: Component_Input_Attribute_Test_15 + * @tc.desc: when checkbox is created, fontSize, color,textAlign could work + * @tc.type:FUNC + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputAttr015, TestSize.Level1) +{ + InputTddTest::ComponentInputAttributeTest15(); +} + +/** + * @tc.name: Component_Input_Style_Test_04 + * @tc.desc: test the style color + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputStyle004, TestSize.Level1) +{ + InputTddTest::ComponentInputStyleTest04(); +} + +/** + * @tc.name: Component_Input_Style_Test_05 + * @tc.desc: test the style textAlign + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputStyle005, TestSize.Level1) +{ + InputTddTest::ComponentInputStyleTest05(); +} + +/** + * @tc.name: Component_Input_Style_Test_08 + * @tc.desc: check the general style could work or not + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputStyle008, TestSize.Level1) +{ + InputTddTest::ComponentInputStyleTest08(); +} + +/** + * @tc.name: Component_Input_Style_Test_09 + * @tc.desc: check the general style could work or not + * @tc.type:FUNC + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputStyle009, TestSize.Level1) +{ + InputTddTest::ComponentInputStyleTest09(); +} + +/** + * @tc.name: Component_Input_Style_Test_11 + * @tc.desc: check the general style of checkbox could work or not + * @tc.type:FUNC + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputStyle011, TestSize.Level1) +{ + InputTddTest::ComponentInputStyleTest11(); +} + +/** + * @tc.name: Component_Input_Style_Test_12 + * @tc.desc: check the general style of checkbox could work or not + * @tc.type:FUNC + * @tc.require: AR000DSEFK + */ +HWTEST_F(InputTddTest, inputStyle012, TestSize.Level1) +{ + InputTddTest::ComponentInputStyleTest12(); +} + +/** + * @tc.name: Component_Radio_Attribute_Test_01 + * @tc.desc: test the attribute checked + * @tc.type:FUNC + * @tc.require: AR000E2TCH + */ +HWTEST_F(InputTddTest, radioAttr001, TestSize.Level1) +{ + InputTddTest::ComponentRadioAttributeTest01(); +} + +/** + * @tc.name: Component_Radio_Style_Test_03 + * @tc.desc: test the common style + * @tc.type:FUNC + * @tc.require: AR000E2TCH + */ +HWTEST_F(InputTddTest, radioStyle003, TestSize.Level1) +{ + InputTddTest::ComponentRadioStyleTest03(); +} + +/** + * @tc.name: Component_Radio_Style_Test_04 + * @tc.desc: test the common attribute + * @tc.type:FUNC + * @tc.require: AR000E2TCH + */ +HWTEST_F(InputTddTest, radioStyle004, TestSize.Level1) +{ + InputTddTest::ComponentRadioStyleTest04(); +} +#endif +} +} diff --git a/frameworks/src/core/components/test/unittest/common/input_tdd_test.h b/frameworks/src/core/components/test/unittest/common/input_tdd_test.h new file mode 100755 index 0000000..75704bd --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/input_tdd_test.h @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_INPUT_H +#define OHOS_ACELITE_TEST_INPUT_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "component_factory.h" +#include "root_component_mock.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class InputTddTest : public testing::Test { +#else +class InputTddTest { +#endif +public: + InputTddTest(); + ~InputTddTest(){}; + void SetUp(); + void TearDown(); + void ComponentInputAttributeTest01(); + void ComponentInputAttributeTest02(); + void ComponentInputAttributeTest06(); + void ComponentInputAttributeTest07(); + void ComponentInputAttributeTest10(); + void ComponentInputAttributeTest13(); + void ComponentInputAttributeTest14(); + void ComponentInputAttributeTest15(); + void ComponentInputStyleTest04(); + void ComponentInputStyleTest05(); + void ComponentInputStyleTest08(); + void ComponentInputStyleTest08Extra(int16_t right, int16_t top, int16_t bottom); + void ComponentInputStyleTest09(); + void ComponentInputStyleTest11(); + void ComponentInputStyleTest12(); + void ComponentRadioAttributeTest01(); + void ComponentRadioStyleTest03(); + void ComponentRadioStyleTest04(); + UIRadioButton *ConvertView(const char *name) const; + UIView *GetComponent() const; + bool CompareColor(ColorType color, uint32_t colorIntValue) const; + void AddBoolProperty(jerry_value_t object, const char *name, bool value) const; + void AddNumberProperty(jerry_value_t object, const char *name, const double value) const; + void AddStringProperty(jerry_value_t object, const char *name, const char *value) const; + void RunTests(); + + jerry_value_t globalObject_; + jerry_value_t attrsObject_; + jerry_value_t valueStaticStyle_; + +private: + RootComponentMock rootComponentMock_; +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_INPUT_H diff --git a/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.cpp new file mode 100755 index 0000000..e2cdb82 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.cpp @@ -0,0 +1,496 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "jsbundle_tdd_test.h" +#include "component.h" +#include "component_utils.h" +#include "js_app_environment.h" +#include "js_fwk_common.h" +#include "ui_label.h" +#include "ui_view_group.h" +#include "wrapper/js.h" + +namespace OHOS { +namespace ACELite { +JsbundleTddTest::JsbundleTddTest() {} +constexpr char FUNC_CREATE_ELEMENT[] = "_c"; + +constexpr char CLASS_FLEXLAYOUT[] = "N4OHOS10FlexLayoutE"; +constexpr char CLASS_LABEL[] = "N4OHOS7UILabelE"; + +constexpr char TAG_DIV[] = "div"; +constexpr char TAG_TEXT[] = "text"; +constexpr char ARG_ATTRS[] = "attrs"; +constexpr char ARG_STYLES[] = "staticStyle"; +constexpr char ARG_VALUE[] = "value"; +constexpr char ARG_WIDTH[] = "width"; +constexpr char ARG_HEIGHT[] = "height"; +constexpr char HELLO_MESSAGE[] = "message"; + +constexpr uint8_t ARG_LENGTH_2 = 2; +constexpr uint8_t ARG_LENGTH_3 = 3; +constexpr uint8_t ATTR_VAL_WIDTH = 100; +constexpr uint8_t ATTR_VAL_HEIGHT = 100; +void JsbundleTddTest::SetUp() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + env->InitJsFramework(); +} + +void JsbundleTddTest::TearDown() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + env->Cleanup(); +} + +void JsbundleTddTest::CreateElementAttributeLength001() +{ + JSValue tag = JSString::Create(TAG_DIV); + JSValue args[1] = {tag}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, 1); + if (JSUndefined::Is(el) || jerry_value_is_error(el)) { + printf("CreateElementAttributeLength001 fail\n"); + EXPECT_FALSE(JSUndefined::Is(el) || jerry_value_is_error(el)); + } else { + UIViewGroup *viewGroup = reinterpret_cast(ComponentUtils::GetViewFromBindingObject(el)); + if (viewGroup == nullptr || strcmp(CLASS_FLEXLAYOUT, typeid(*viewGroup).name())) { + printf("CreateElementAttributeLength001 fail\n"); + } else { + printf("CreateElementAttributeLength001 pass\n"); + } + EXPECT_FALSE(viewGroup == nullptr || strcmp(CLASS_FLEXLAYOUT, typeid(*viewGroup).name())); + } + ReleaseJerryValue(el, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementAttributeLength002() +{ + const char *message = HELLO_MESSAGE; + JSValue tag = JSString::Create(TAG_TEXT); + JSValue options = JSObject::Create(); + JSValue attrs = JSObject::Create(); + JSValue value = JSString::Create(message); + JSObject::Set(attrs, ARG_VALUE, value); + JSObject::Set(options, ARG_ATTRS, attrs); + JSValue args[ARG_LENGTH_2] = {tag, options}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, ARG_LENGTH_2); + if (JSUndefined::Is(el) || jerry_value_is_error(el)) { + printf("CreateElementAttributeLength002 fail\n"); + EXPECT_FALSE(JSUndefined::Is(el) || jerry_value_is_error(el)); + } else { + Component *textComponent = ComponentUtils::GetComponentFromBindingObject(el); + if (textComponent != nullptr) { + textComponent->OnViewAttached(); + } + UILabel *label = reinterpret_cast(ComponentUtils::GetViewFromBindingObject(el)); + if (label == nullptr || strcmp(CLASS_LABEL, typeid(*label).name()) || strcmp(message, label->GetText())) { + printf("CreateElementAttributeLength002 fail\n"); + } else { + printf("CreateElementAttributeLength002 pass\n"); + } + EXPECT_FALSE(label == nullptr || strcmp(CLASS_LABEL, typeid(*label).name()) || + (label->GetText() != nullptr && strcmp(message, label->GetText()))); + } + ReleaseJerryValue(el, options, attrs, value, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementAttributeLength003() +{ + const char *message = HELLO_MESSAGE; + JSValue textTag = JSString::Create(TAG_TEXT); + JSValue textOptions = JSObject::Create(); + JSValue textAttrs = JSObject::Create(); + JSValue textValue = JSString::Create(message); + JSObject::Set(textAttrs, ARG_VALUE, textValue); + JSObject::Set(textOptions, ARG_ATTRS, textAttrs); + JSValue textArgs[ARG_LENGTH_2] = {textTag, textOptions}; + JSValue textEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, textArgs, ARG_LENGTH_2); + + JSValue divTag = JSString::Create(TAG_DIV); + JSValue divChildren = JSArray::Create(0); + JSArray::Push(divChildren, textEl); + JSValue divArgs[ARG_LENGTH_2] = {divTag, divChildren}; + JSValue divEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, divArgs, ARG_LENGTH_2); + if (JSUndefined::Is(divEl) || jerry_value_is_error(divEl)) { + printf("CreateElementAttributeLength003 fail\n"); + EXPECT_FALSE(JSUndefined::Is(divEl) || jerry_value_is_error(divEl)); + } else { + Component *textComponent = ComponentUtils::GetComponentFromBindingObject(textEl); + Component *divComponent = ComponentUtils::GetComponentFromBindingObject(divEl); + UIViewGroup *viewGroup = reinterpret_cast(ComponentUtils::GetViewFromBindingObject(divEl)); + if (textComponent == nullptr || divComponent == nullptr || + viewGroup == nullptr || strcmp(CLASS_FLEXLAYOUT, typeid(*viewGroup).name())) { + printf("CreateElementAttributeLength003 fail\n"); + EXPECT_FALSE(viewGroup == nullptr || strcmp(CLASS_FLEXLAYOUT, typeid(*viewGroup).name())); + } else { + ConstrainedParameter divContentParameter = {ATTR_VAL_WIDTH, ATTR_VAL_HEIGHT}; + Component::BuildViewTree(textComponent, divComponent, divContentParameter); + UILabel *label = reinterpret_cast(viewGroup->GetChildrenHead()); + EXPECT_FALSE(label == nullptr || strcmp(CLASS_LABEL, typeid(*label).name()) || + (label->GetText() != nullptr && strcmp(message, label->GetText()))); + } + } + ReleaseJerryValue(divEl, divChildren, divTag, textEl, textOptions, textAttrs, textValue, textTag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementAttributeLength004() +{ + const char *message = HELLO_MESSAGE; + JSValue textTag = JSString::Create(TAG_TEXT); + JSValue textOptions = JSObject::Create(); + JSValue textAttrs = JSObject::Create(); + JSValue textValue = JSString::Create(message); + JSObject::Set(textAttrs, ARG_VALUE, textValue); + JSObject::Set(textOptions, ARG_ATTRS, textAttrs); + JSValue textArgs[ARG_LENGTH_2] = {textTag, textOptions}; + JSValue textEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, textArgs, ARG_LENGTH_2); + + JSValue divTag = JSString::Create(TAG_DIV); + JSValue divOptions = JSObject::Create(); + JSValue divStyles = JSObject::Create(); + JSValue divWidth = JSNumber::Create(ATTR_VAL_WIDTH); + JSValue divHeight = JSNumber::Create(ATTR_VAL_HEIGHT); + JSObject::Set(divStyles, ARG_WIDTH, divWidth); + JSObject::Set(divStyles, ARG_HEIGHT, divHeight); + JSObject::Set(divOptions, ARG_STYLES, divStyles); + JSValue divChildren = JSArray::Create(0); + JSArray::Push(divChildren, textEl); + JSValue divArgs[ARG_LENGTH_3] = {divTag, divOptions, divChildren}; + JSValue divEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, divArgs, ARG_LENGTH_3); + if (JSUndefined::Is(divEl) || jerry_value_is_error(divEl)) { + printf("CreateElementAttributeLength004 fail\n"); + EXPECT_FALSE(JSUndefined::Is(divEl) || jerry_value_is_error(divEl)); + } else { + Component *textComponent = ComponentUtils::GetComponentFromBindingObject(textEl); + Component *divComponent = ComponentUtils::GetComponentFromBindingObject(divEl); + UIViewGroup *viewGroup = reinterpret_cast(ComponentUtils::GetViewFromBindingObject(divEl)); + if (textComponent == nullptr || divComponent == nullptr || + viewGroup == nullptr || strcmp(CLASS_FLEXLAYOUT, typeid(*viewGroup).name())) { + printf("CreateElementAttributeLength004 fail\n"); + EXPECT_FALSE(viewGroup == nullptr || strcmp(CLASS_FLEXLAYOUT, typeid(*viewGroup).name())); + } else { + ConstrainedParameter divContentParameter = {ATTR_VAL_WIDTH, ATTR_VAL_HEIGHT}; + Component::BuildViewTree(textComponent, divComponent, divContentParameter); + UILabel *label = reinterpret_cast(viewGroup->GetChildrenHead()); + if (label == nullptr || strcmp(CLASS_LABEL, typeid(*label).name()) || strcmp(message, label->GetText())) { + printf("CreateElementAttributeLength004 fail\n"); + } else { + printf("CreateElementAttributeLength004 pass\n"); + } + EXPECT_FALSE(label == nullptr || strcmp(CLASS_LABEL, typeid(*label).name()) || + ((label->GetText() != nullptr) && (strcmp(message, label->GetText())))); + } + } + ReleaseJerryValue(divEl, divChildren, divOptions, divStyles, divWidth, divHeight, divTag, textEl, textOptions, + textAttrs, textValue, textTag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementTagValidation005() +{ + JSValue tag = JSNumber::Create(1); + JSValue args[1] = {tag}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, 1); + if (!JSUndefined::Is(el)) { + printf("CreateElementTagValidation005 fail\n"); + } else { + printf("CreateElementTagValidation005 pass\n"); + } + EXPECT_TRUE(JSUndefined::Is(el)); + ReleaseJerryValue(el, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementTagValidation006() +{ + JSValue tag = JSString::Create("customized-component"); + JSValue args[1] = {tag}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, 1); + if (!JSUndefined::Is(el)) { + printf("CreateElementTagValidation006 fail\n"); + } else { + printf("CreateElementTagValidation006 pass\n"); + } + EXPECT_TRUE(JSUndefined::Is(el)); + ReleaseJerryValue(el, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementTagValidation007() +{ + JSValue tag = JSString::Create(TAG_DIV); + JSValue args[1] = {tag}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, 1); + if (JSUndefined::Is(el)) { + printf("CreateElementTagValidation007 fail\n"); + } else { + printf("CreateElementTagValidation007 pass\n"); + } + EXPECT_FALSE(JSUndefined::Is(el)); + ReleaseJerryValue(el, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElement2ndAttributeValidation008() +{ + JSValue tag = JSString::Create(TAG_TEXT); + JSValue invalidOptions = JSNumber::Create(1); + JSValue args[ARG_LENGTH_2] = {tag, invalidOptions}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, ARG_LENGTH_2); + if (JSUndefined::Is(el)) { + printf("CreateElement2ndAttributeValidation008 fail\n"); + } else { + printf("CreateElement2ndAttributeValidation008 pass\n"); + } + EXPECT_FALSE(JSUndefined::Is(el)); + ReleaseJerryValue(el, invalidOptions, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElement2ndAttributeValidation009() +{ + JSValue tag = JSString::Create(TAG_TEXT); + JSValue options = JSObject::Create(); + JSValue attrs = JSObject::Create(); + JSValue value = JSString::Create(HELLO_MESSAGE); + JSObject::Set(attrs, ARG_VALUE, value); + JSValue args[ARG_LENGTH_2] = {tag, options}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, ARG_LENGTH_2); + if (JSUndefined::Is(el)) { + printf("CreateElement2ndAttributeValidation009 fail\n"); + } else { + printf("CreateElement2ndAttributeValidation009 pass\n"); + } + EXPECT_FALSE(JSUndefined::Is(el)); + ReleaseJerryValue(el, options, attrs, value, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElement2ndAttributeValidation010() +{ + JSValue tag = JSString::Create(TAG_TEXT); + JSValue children = JSArray::Create(0); + JSValue args[ARG_LENGTH_2] = {tag, children}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, ARG_LENGTH_2); + if (JSUndefined::Is(el)) { + printf("CreateElement2ndAttributeValidation010 fail\n"); + } else { + printf("CreateElement2ndAttributeValidation010 pass\n"); + } + EXPECT_FALSE(JSUndefined::Is(el)); + ReleaseJerryValue(el, children, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElement2ndAttributeValidation011() +{ + JSValue textTag = JSString::Create(TAG_TEXT); + JSValue textArgs[1] = {textTag}; + JSValue textEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, textArgs, 1); + + JSValue divTag = JSString::Create(TAG_DIV); + JSValue divChildren = JSArray::Create(0); + JSArray::Push(divChildren, textEl); + JSValue divArgs[ARG_LENGTH_2] = {divTag, divChildren}; + JSValue divEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, divArgs, ARG_LENGTH_2); + if (JSUndefined::Is(divEl)) { + printf("CreateElement2ndAttributeValidation011 fail\n"); + } else { + printf("CreateElement2ndAttributeValidation011 pass\n"); + } + EXPECT_FALSE(JSUndefined::Is(divEl)); + ReleaseJerryValue(divEl, divChildren, divTag, textEl, textTag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementChildrenValidation012() +{ + JSValue tag = JSString::Create(TAG_DIV); + JSValue options = JSObject::Create(); + JSValue children = JSArray::Create(0); + JSValue args[ARG_LENGTH_3] = {tag, options, children}; + + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, ARG_LENGTH_3); + if (JSUndefined::Is(el)) { + printf("CreateElementChildrenValidation012 fail\n"); + } else { + printf("CreateElementChildrenValidation012 pass\n"); + } + EXPECT_FALSE(JSUndefined::Is(el)); + ReleaseJerryValue(el, children, options, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::CreateElementChildrenValidation013() +{ + JSValue tag = JSString::Create(TAG_DIV); + JSValue options = JSObject::Create(); + JSValue children = JSArray::Create(0); + JSValue number = JSNumber::Create(1); + JSArray::Push(children, number); + JSValue args[ARG_LENGTH_3] = {tag, options, children}; + JSValue el = JSGlobal::Call(FUNC_CREATE_ELEMENT, args, ARG_LENGTH_3); + if (JSUndefined::Is(el)) { + printf("CreateElementChildrenValidation013 fail\n"); + } else { + printf("CreateElementChildrenValidation013 pass\n"); + } + EXPECT_FALSE(JSUndefined::Is(el)); + ReleaseJerryValue(el, children, number, options, tag, VA_ARG_END_FLAG); +} + +void JsbundleTddTest::RunTests() +{ + TDD_CASE_BEGIN(); + CreateElementAttributeLength001(); + CreateElementAttributeLength002(); + CreateElementAttributeLength003(); + CreateElementAttributeLength004(); + CreateElementTagValidation005(); + CreateElementTagValidation006(); + CreateElementTagValidation007(); + CreateElement2ndAttributeValidation008(); + CreateElement2ndAttributeValidation009(); + CreateElement2ndAttributeValidation010(); + CreateElement2ndAttributeValidation011(); + CreateElementChildrenValidation012(); + CreateElementChildrenValidation013(); + TDD_CASE_END(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: CreateElement_Attribute_Length_001 + * @tc.desc: Verify the _c function support analysising UIView attribute. + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrlen001, TestSize.Level1) +{ + JsbundleTddTest::CreateElementAttributeLength001(); +} + +/** + * @tc.name: CreateElement_Attribute_Length_002 + * @tc.desc: Verify the _c function support analysising UILabel attribute. + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrlen002, TestSize.Level1) +{ + JsbundleTddTest::CreateElementAttributeLength002(); +} + +/** + * @tc.name: CreateElement_Attribute_Length_003 + * @tc.desc: Verify the _c function support analysising simple UIViewGroup attribute. + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrlen003, TestSize.Level1) +{ + JsbundleTddTest::CreateElementAttributeLength003(); +} + +/** + * @tc.name: CreateElement_Attribute_Length_004 + * @tc.desc: Verify the _c function support analysising complex UIViewGroup attribute. + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrlen004, TestSize.Level1) +{ + JsbundleTddTest::CreateElementAttributeLength004(); +} + +/** + * @tc.name: CreateElement_Tag_Validation_005 + * @tc.desc: Verify the _c function support handling error parameter(-1). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, tagViali005, TestSize.Level1) +{ + JsbundleTddTest::CreateElementTagValidation005(); +} + +/** + * @tc.name: CreateElement_Tag_Validation_006 + * @tc.desc: Verify the _c function support handling error parameter('customized-component'). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, tagViali006, TestSize.Level1) +{ + JsbundleTddTest::CreateElementTagValidation006(); +} + +/** + * @tc.name: CreateElement_Tag_Validation_007 + * @tc.desc: Verify the _c function support handling legal parameter('div'). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, tagViali007, TestSize.Level1) +{ + JsbundleTddTest::CreateElementTagValidation007(); +} + +/** + * @tc.name: CreateElement_2ndAttribute_Validation_008 + * @tc.desc: Verify the _c function support handling legal parameter('text', 1). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrVali008, TestSize.Level1) +{ + JsbundleTddTest::CreateElement2ndAttributeValidation008(); +} + +/** + * @tc.name: CreateElement_2ndAttribute_Validation_009 + * @tc.desc: Verify the _c function support handling legal parameter('text', { attrs: { value: 'Hello world' } }). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrVali009, TestSize.Level1) +{ + JsbundleTddTest::CreateElement2ndAttributeValidation009(); +} + +/** + * @tc.name: CreateElement_2ndAttribute_Validation_010 + * @tc.desc: Verify the _c function support handling legal parameter('text', []). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrVali010, TestSize.Level1) +{ + JsbundleTddTest::CreateElement2ndAttributeValidation010(); +} + +/** + * @tc.name: CreateElement_2ndAttribute_Validation_011 + * @tc.desc: Verify the _c function support handling legal parameter('div', [_c('text')]). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, attrVali011, TestSize.Level1) +{ + JsbundleTddTest::CreateElement2ndAttributeValidation011(); +} + +/** + * @tc.name: CreateElement_Children_Validation_012 + * @tc.desc: Verify the _c function support handling legal parameter('div', {}, []). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, ChildVali012, TestSize.Level1) +{ + JsbundleTddTest::CreateElementChildrenValidation012(); +} + +/** + * @tc.name: CreateElement_Children_Validation_013 + * @tc.desc: Verify the _c function support handling legal parameter('div', {}, [1]). + * @tc.require: AR000DT0D4 + */ +HWTEST_F(JsbundleTddTest, ChildVali013, TestSize.Level1) +{ + JsbundleTddTest::CreateElementChildrenValidation013(); +} +#endif +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h b/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h new file mode 100755 index 0000000..7530aba --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_JSBUNDLE_H +#define OHOS_ACELITE_TEST_JSBUNDLE_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class JsbundleTddTest : public testing::Test { +#else +class JsbundleTddTest { +#endif +public: + JsbundleTddTest(); + ~JsbundleTddTest(){}; + + void SetUp(); + void TearDown(); + void CreateElementAttributeLength001(); + void CreateElementAttributeLength002(); + void CreateElementAttributeLength003(); + void CreateElementAttributeLength004(); + void CreateElementTagValidation005(); + void CreateElementTagValidation006(); + void CreateElementTagValidation007(); + void CreateElement2ndAttributeValidation008(); + void CreateElement2ndAttributeValidation009(); + void CreateElement2ndAttributeValidation010(); + void CreateElement2ndAttributeValidation011(); + void CreateElementChildrenValidation012(); + void CreateElementChildrenValidation013(); + void RunTests(); +}; +} // namespace ACELite +} // namesapce OHOS + +#endif // OHOS_ACELITE_TEST_JSBUNDLE_H diff --git a/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp new file mode 100755 index 0000000..192a73e --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "list_tdd_test.h" +#include "acelite_config.h" +#include "component_factory.h" +#include "js_app_environment.h" + +namespace OHOS { +namespace ACELite { +ListTddTest::ListTddTest() + : objGlob(UNDEFINED), + objAttrs(UNDEFINED), + objStaticStyle(UNDEFINED){} +void ListTddTest::SetUp() +{ + JsAppEnvironment* appJsEnv = JsAppEnvironment::GetInstance(); + appJsEnv->InitJsFramework(); + + objGlob = jerry_get_global_object(); + + jerry_value_t keyAttrs = jerry_create_string((const jerry_char_t*)"attrs"); + objAttrs = jerry_create_object(); + jerry_set_property(objGlob, keyAttrs, objAttrs); + jerry_release_value(keyAttrs); + + jerry_value_t keyStaticStyle = jerry_create_string(reinterpret_cast("staticStyle")); + objStaticStyle = jerry_create_object(); + jerry_set_property(objGlob, keyStaticStyle, objStaticStyle); + jerry_release_value(keyStaticStyle); +} + +void ListTddTest::TearDown() +{ + JsAppContext::GetInstance()->ReleaseStyles(); +} + +void ListTddTest::ListTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting flex-direction style = row. + */ + jerry_value_t keyDirection = jerry_create_string((const jerry_char_t*)"flexDirection"); + jerry_value_t valueDirection = jerry_create_string((const jerry_char_t*)"row"); + jerry_set_property(objStaticStyle, keyDirection, valueDirection); + + jerry_value_t children = jerry_create_null(); + uint16_t componentNameId = KeyParser::ParseKeyId("list", strlen("list")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + + component->Render(); + + UIViewGroup* listView = reinterpret_cast(component->GetComponentRootView()); + +#ifdef TDD_ASSERTIONS + char className[] = "N4OHOS6UIListE"; +#else + char className[] = "class OHOS::UIList"; +#endif + + static constexpr uint8_t horizontal = 0; + + /** + * @tc.expected: step1. get flex-direction style = row. + */ + if (strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == horizontal) { + printf("[Test Case] [ListTest001] PASSED\n"); + } else { + printf("[Test Case] [ListTest001] FAILED\n"); + } + EXPECT_TRUE(strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == horizontal); + delete (listView); + listView = nullptr; + TDD_CASE_END(); +} + +void ListTddTest::ListTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting flex-direction style = column. + */ + jerry_value_t keyDirection = jerry_create_string((const jerry_char_t*)"flexDirection"); + jerry_value_t valueDirection = jerry_create_string((const jerry_char_t*)"column"); + jerry_set_property(objStaticStyle, keyDirection, valueDirection); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("list", strlen("list")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + + component->Render(); + + UIViewGroup* listView = reinterpret_cast(component->GetComponentRootView()); +#ifdef TDD_ASSERTIONS + char className[] = "N4OHOS6UIListE"; +#else + char className[] = "class OHOS::UIList"; +#endif + + static constexpr uint8_t vertical = 1; + + /** + * @tc.expected: step1. get flex-direction style = column. + */ + if (strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == vertical) { + printf("[Test Case] [ListTest002] PASSED\n"); + } else { + printf("[Test Case] [ListTest002] FAILED\n"); + } + EXPECT_TRUE(strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == vertical); + delete (listView); + listView = nullptr; + TDD_CASE_END(); +} + +void ListTddTest::ListTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. setting not exist flex-direction style = abcd. + */ + jerry_value_t keyDirection = jerry_create_string((const jerry_char_t*)"flexDirection"); + jerry_value_t valueDirection = jerry_create_string((const jerry_char_t*)"abcd"); + jerry_set_property(objStaticStyle, keyDirection, valueDirection); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("list", strlen("list")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + + component->Render(); + + UIViewGroup* listView = reinterpret_cast(component->GetComponentRootView()); + +#ifdef TDD_ASSERTIONS + char className[] = "N4OHOS6UIListE"; +#else + char className[] = "class OHOS::UIList"; +#endif + + static constexpr uint8_t vertical = 1; + + /** + * @tc.expected: step1. get flex-direction style = column. + */ + if (strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == vertical) { + printf("[Test Case] [ListTest003] PASSED\n"); + } else { + printf("[Test Case] [ListTest003] FAILED\n"); + } + EXPECT_TRUE(strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == vertical); + delete (listView); + listView = nullptr; + TDD_CASE_END(); +} + +void ListTddTest::ListTest004() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. not setting flex-direction style. + */ + jerry_value_t keyWidth = jerry_create_string((const jerry_char_t*)"width"); + jerry_value_t valueWidth = jerry_create_string((const jerry_char_t*)"240"); + jerry_set_property(objStaticStyle, keyWidth, valueWidth); + + jerry_value_t children = jerry_create_null(); + + uint16_t componentNameId = KeyParser::ParseKeyId("list", strlen("list")); + Component* component = ComponentFactory::CreateComponent(componentNameId, objGlob, children); + + component->Render(); + + UIViewGroup* listView = reinterpret_cast(component->GetComponentRootView()); + +#ifdef TDD_ASSERTIONS + char className[] = "N4OHOS6UIListE"; +#else + char className[] = "class OHOS::UIList"; +#endif + + static constexpr uint8_t vertical = 1; + + /** + * @tc.expected: step1. get flex-direction style = column. + */ + if (strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == vertical) { + printf("[Test Case] [ListTest004] PASSED\n"); + } else { + printf("[Test Case] [ListTest004] FAILED\n"); + } + EXPECT_TRUE(strcmp(className, typeid(*listView).name()) == 0 && + reinterpret_cast(listView)->GetDirection() == vertical); + delete (listView); + listView = nullptr; + TDD_CASE_END(); +} + +void ListTddTest::RunTests() +{ + ListTest001(); + ListTest002(); + ListTest003(); + ListTest004(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: Component_List_Create_Test_001 + * @tc.desc: Verify list component support setting flex-direction style = row. + * @tc.require: AR000DSEFB + */ +HWTEST_F(ListTddTest, ListTest001, TestSize.Level1) +{ + ListTddTest::ListTest001(); +} + +/** + * @tc.name: Component_List_Create_Test_002 + * @tc.desc: Verify list component support setting flex-direction style = column. + * @tc.require: AR000DSEFB + */ +HWTEST_F(ListTddTest, ListTest002, TestSize.Level1) +{ + ListTddTest::ListTest002(); +} + +/** + * @tc.name: Component_List_Create_Test_003 + * @tc.desc: Verify list component support restore the default flex-direction=column if setting not exist type. + * @tc.require: AR000DSEFB + */ +HWTEST_F(ListTddTest, ListTest003, TestSize.Level1) +{ + ListTddTest::ListTest003(); +} + +/** + * @tc.name: Component_List_Create_Test_004 + * @tc.desc: Verify list component support restore the default flex-direction=column if not setting it. + * @tc.require: AR000DSEFB + */ +HWTEST_F(ListTddTest, ListTest004, TestSize.Level1) +{ + ListTddTest::ListTest004(); +} +#endif +} +} diff --git a/frameworks/src/core/components/test/unittest/common/list_tdd_test.h b/frameworks/src/core/components/test/unittest/common/list_tdd_test.h new file mode 100755 index 0000000..e77adad --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/list_tdd_test.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_LIST_H +#define OHOS_ACELITE_TEST_LIST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif +#include "component_factory.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class ListTddTest : public testing::Test { +#else +class ListTddTest { +#endif +public: + ListTddTest(); + ~ListTddTest(){}; + void SetUp(); + void TearDown(); + void ListTest001(); + void ListTest002(); + void ListTest003(); + void ListTest004(); + void RunTests(); + + jerry_value_t objGlob; + jerry_value_t objAttrs; + jerry_value_t objStaticStyle; +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_LIST_H diff --git a/frameworks/src/core/components/test/unittest/common/marquee_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/marquee_tdd_test.cpp new file mode 100755 index 0000000..e4df20b --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/marquee_tdd_test.cpp @@ -0,0 +1,460 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "marquee_tdd_test.h" +#include "marquee_component.h" +#include "themes/theme.h" +#include "themes/theme_manager.h" + +namespace OHOS { +namespace ACELite { +void MarqueeTddTest::ComponentMarqueeStyleSetTest006() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set color = 0 + */ + const char *color = "color"; + jerry_value_t key = jerry_create_string(reinterpret_cast(color)); + jerry_value_t value = jerry_create_number(0); + jerry_set_property(styleObj_, key, value); + Component *component = GetRenderedComponent(componentNameId_); + UIView *marqueeView = component->GetComponentRootView(); + + /** + * @tc.expected: step2. get color = 0 + */ + ColorType colorRGB = GetRGBColor(0); + ColorType colorRGBSet; + colorRGBSet.full = marqueeView->GetStyle(STYLE_TEXT_COLOR); + if (colorRGB.red != colorRGBSet.red || colorRGB.green != colorRGBSet.green || colorRGB.blue != colorRGBSet.blue || + colorRGB.full != colorRGBSet.full) { + printf("Component_Marquee_StyleSet_Test_006 fail\n"); + } else { + printf("Component_Marquee_StyleSet_Test_006 pass\n"); + } + EXPECT_TRUE((colorRGB.red == colorRGBSet.red) && (colorRGB.green == colorRGBSet.green) && + (colorRGB.blue == colorRGBSet.blue) && (colorRGB.full == colorRGBSet.full)); + jerry_release_value(value); + delete component; + component = nullptr; + + /** + * @tc.expected: step3. set color = '0' + */ + const char *colorValue = "0"; + value = jerry_create_string(reinterpret_cast(colorValue)); + jerry_set_property(styleObj_, key, value); + component = GetRenderedComponent(componentNameId_); + marqueeView = component->GetComponentRootView(); + jerry_release_value(key); + jerry_release_value(value); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void MarqueeTddTest::ComponentMarqueeStyleSetTest007() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set color = 16777215 + */ + const int colorSize = 16777215; + const char color[] = "color"; + jerry_value_t key = jerry_create_string(reinterpret_cast(color)); + jerry_value_t value = jerry_create_number(colorSize); + jerry_set_property(styleObj_, key, value); + Component *component = GetRenderedComponent(componentNameId_); + UIView *marqueeView = component->GetComponentRootView(); + + /** + * @tc.expected: step2. get color = 16777215 + */ + ColorType colorRGB = GetRGBColor(colorSize); + ColorType colorRGBSet; + colorRGBSet.full = marqueeView->GetStyle(STYLE_TEXT_COLOR); + if (colorRGB.red != colorRGBSet.red || colorRGB.green != colorRGBSet.green || colorRGB.blue != colorRGBSet.blue || + colorRGB.full != colorRGBSet.full) { + printf("Component_Marquee_StyleSet_Test_007 fail\n"); + } else { + printf("Component_Marquee_StyleSet_Test_007 pass\n"); + } + EXPECT_TRUE((colorRGB.red == colorRGBSet.red) && (colorRGB.green == colorRGBSet.green) && + (colorRGB.blue == colorRGBSet.blue) && (colorRGB.full == colorRGBSet.full)); + jerry_release_value(value); + delete component; + component = nullptr; + + /** + * @tc.expected: step3. set color = '16777215' + */ + const char *colorVal = "16777215"; + value = jerry_create_string(reinterpret_cast(colorVal)); + jerry_set_property(styleObj_, key, value); + component = GetRenderedComponent(componentNameId_); + marqueeView = component->GetComponentRootView(); + jerry_release_value(key); + jerry_release_value(value); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void MarqueeTddTest::ComponentMarqueeStyleSetTest008() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set color = 65280 + */ + const int colorSize = 65280; + const char color[] = "color"; + jerry_value_t key = jerry_create_string(reinterpret_cast(color)); + jerry_value_t value = jerry_create_number(colorSize); + jerry_set_property(styleObj_, key, value); + Component *component = GetRenderedComponent(componentNameId_); + UIView *marqueeView = component->GetComponentRootView(); + + /** + * @tc.expected: step2. get color = 65280 + */ + ColorType colorRGB = GetRGBColor(colorSize); + ColorType colorRGBSet; + colorRGBSet.full = marqueeView->GetStyle(STYLE_TEXT_COLOR); + if (colorRGB.red != colorRGBSet.red || colorRGB.green != colorRGBSet.green || colorRGB.blue != colorRGBSet.blue || + colorRGB.full != colorRGBSet.full) { + printf("Component_Marquee_StyleSet_Test_008 fail\n"); + } else { + printf("Component_Marquee_StyleSet_Test_008 pass\n"); + } + EXPECT_TRUE((colorRGB.red == colorRGBSet.red) && (colorRGB.green == colorRGBSet.green) && + (colorRGB.blue == colorRGBSet.blue) && (colorRGB.full == colorRGBSet.full)); + jerry_release_value(value); + delete component; + component = nullptr; + + /** + * @tc.expected: step3. set color = '65280' + */ + const char *colorVal = "65280"; + value = jerry_create_string(reinterpret_cast(colorVal)); + jerry_set_property(styleObj_, key, value); + component = GetRenderedComponent(componentNameId_); + marqueeView = component->GetComponentRootView(); + jerry_release_value(key); + jerry_release_value(value); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void MarqueeTddTest::ComponentMarqueeStyleSetTest009() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set color = -1 + */ + const char *color = "color"; + jerry_value_t key = jerry_create_string(reinterpret_cast(color)); + int colorVal = -1; + jerry_value_t value = jerry_create_number(colorVal); + jerry_set_property(styleObj_, key, value); + Component *component = GetRenderedComponent(componentNameId_); + UIView *marqueeView = component->GetComponentRootView(); + + /** + * @tc.expected: step2. get color = -1 + */ + ColorType colorRGB = GetRGBColor(-1); + ColorType colorRGBSet; + colorRGBSet.full = marqueeView->GetStyle(STYLE_TEXT_COLOR); + if (colorRGB.red != colorRGBSet.red || colorRGB.green != colorRGBSet.green || colorRGB.blue != colorRGBSet.blue || + colorRGB.full != colorRGBSet.full) { + printf("Component_Marquee_StyleSet_Test_009 fail\n"); + } else { + printf("Component_Marquee_StyleSet_Test_009 pass\n"); + } + EXPECT_TRUE((colorRGB.red == colorRGBSet.red) && (colorRGB.green == colorRGBSet.green) && + (colorRGB.blue == colorRGBSet.blue) && (colorRGB.full == colorRGBSet.full)); + jerry_release_value(value); + delete component; + component = nullptr; + + /** + * @tc.expected: step3. set color = '-1' + */ + const char *strVal = "-1"; + value = jerry_create_string(reinterpret_cast(strVal)); + jerry_set_property(styleObj_, key, value); + component = GetRenderedComponent(componentNameId_); + marqueeView = component->GetComponentRootView(); + jerry_release_value(key); + jerry_release_value(value); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void MarqueeTddTest::ComponentMarqueeStyleSetTest010() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set color = 16777216 + */ + const int colorSize = 16777216; + const char *color = "color"; + jerry_value_t key = jerry_create_string(reinterpret_cast(color)); + jerry_value_t value = jerry_create_number(colorSize); + jerry_set_property(styleObj_, key, value); + Component *component = GetRenderedComponent(componentNameId_); + UIView *marqueeView = component->GetComponentRootView(); + + /** + * @tc.expected: step2. get color = 16777216 + */ + ColorType colorRGB = GetRGBColor(colorSize); + ColorType colorRGBSet; + colorRGBSet.full = marqueeView->GetStyle(STYLE_TEXT_COLOR); + if (colorRGB.red != colorRGBSet.red || colorRGB.green != colorRGBSet.green || colorRGB.blue != colorRGBSet.blue || + colorRGB.full != colorRGBSet.full) { + printf("Component_Marquee_StyleSet_Test_010 fail\n"); + } else { + printf("Component_Marquee_StyleSet_Test_010 pass\n"); + } + EXPECT_TRUE((colorRGB.red == colorRGBSet.red) && (colorRGB.green == colorRGBSet.green) && + (colorRGB.blue == colorRGBSet.blue) && (colorRGB.full == colorRGBSet.full)); + jerry_release_value(value); + delete component; + component = nullptr; + + /** + * @tc.expected: step3. set color = '16777216' + */ + const char *strVal = "16777216"; + value = jerry_create_string(reinterpret_cast(strVal)); + jerry_set_property(styleObj_, key, value); + component = GetRenderedComponent(componentNameId_); + marqueeView = component->GetComponentRootView(); + jerry_release_value(key); + jerry_release_value(value); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void MarqueeTddTest::ComponentMarqueeStyleSetTest011() +{ + TDD_CASE_BEGIN(); + const char *value = "value"; + const char *textVal = "hello world"; + jerry_value_t textKey = jerry_create_string(reinterpret_cast(value)); + jerry_value_t textValue = jerry_create_string(reinterpret_cast(textVal)); + jerry_release_value(jerry_set_property(attrsObj_, textKey, textValue)); + + /** + * @tc.steps: step1. set font size = 30 + */ + const int initFontSize = 30; + const char *fontSizeName = "fontSize"; + jerry_value_t key = jerry_create_string(reinterpret_cast(fontSizeName)); + jerry_value_t fontSizeVal = jerry_create_number(initFontSize); + jerry_release_value(jerry_set_property(styleObj_, key, fontSizeVal)); + + Component *component = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel *uiLabel = reinterpret_cast(component->GetComponentRootView()); + /** + * @tc.expected: step2. get font size = 16 + */ + uint16_t targetFontSize = 16; + uint16_t fontSize = uiLabel->GetFontId(); + if (targetFontSize == fontSize) { + printf("Component_Marquee_StyleSet_Test_011 pass\n"); + } else { + printf("Component_Marquee_StyleSet_Test_011 fail\n"); + } + EXPECT_TRUE(targetFontSize == fontSize); + + jerry_release_value(textKey); + jerry_release_value(textValue); + jerry_release_value(key); + jerry_release_value(fontSizeVal); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: ComponentMarqueeStyleSetTest012 + * @tc.desc: Verify Marquee style font size set correct value. + * @tc.require: SR000DSEF7 + */ +void MarqueeTddTest::ComponentMarqueeStyleSetTest012() +{ + TDD_CASE_BEGIN(); + const char *value = "value"; + const char *textVal = "hello world"; + jerry_value_t textKey = jerry_create_string(reinterpret_cast(value)); + jerry_value_t textValue = jerry_create_string(reinterpret_cast(textVal)); + jerry_release_value(jerry_set_property(attrsObj_, textKey, textValue)); + + /** + * @tc.steps: step1. set font size = 38 + */ + const int initFontSize = 38; + const char *fontSizeName = "fontSize"; + jerry_value_t key = jerry_create_string(reinterpret_cast(fontSizeName)); + jerry_value_t fontSizeVal = jerry_create_number(initFontSize); + jerry_release_value(jerry_set_property(styleObj_, key, fontSizeVal)); + Component *component = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel *uiLabel = reinterpret_cast(component->GetComponentRootView()); + + /** + * @tc.expected: step2. get font size = 18 + */ + uint16_t targetFontSize = 18; + uint16_t fontSize = uiLabel->GetFontId(); + if (targetFontSize == fontSize) { + printf("Component_Marquee_StyleSet_Test_012 pass\n"); + } else { + printf("Component_Marquee_StyleSet_Test_012 fail\n"); + } + EXPECT_TRUE(targetFontSize == fontSize); + + jerry_release_value(textKey); + jerry_release_value(textValue); + jerry_release_value(key); + jerry_release_value(fontSizeVal); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: ComponentMarqueeStyleSetTest013 + * @tc.desc: Verify Marquee style font size set incorrect value. + * @tc.require: SR000DSEF7 + */ +void MarqueeTddTest::ComponentMarqueeStyleSetTest013() +{ + TDD_CASE_BEGIN(); + const char *value = "value"; + const char *textVal = "hello world"; + jerry_value_t textKey = jerry_create_string(reinterpret_cast(value)); + jerry_value_t textValue = jerry_create_string(reinterpret_cast(textVal)); + jerry_release_value(jerry_set_property(attrsObj_, textKey, textValue)); + + /** + * @tc.steps: step1. set font size = 40 + */ + Theme *theme = ThemeManager::GetInstance().GetCurrent(); + Style style; + if (theme != nullptr) { + style = theme->GetLabelStyle(); + } else { + style = StyleDefault::GetLabelStyle(); + } + const int initFontSize = 40; + const char *fontSizeName = "fontSize"; + jerry_value_t key = jerry_create_string(reinterpret_cast(fontSizeName)); + jerry_value_t fontSizeVal = jerry_create_number(initFontSize); + jerry_release_value(jerry_set_property(styleObj_, key, fontSizeVal)); + Component *component = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel *uiLabel = reinterpret_cast(component->GetComponentRootView()); + + /** + * @tc.expected: step2. get font size = 67 + */ + uint16_t fontSize = uiLabel->GetFontId(); + if (fontSize == style.font_) { + printf("Component_Marquee_StyleSet_Test_013 pass\n"); + } else { + printf("Component_Marquee_StyleSet_Test_013 fail\n"); + } + EXPECT_TRUE(fontSize == style.font_); + + jerry_release_value(textKey); + jerry_release_value(textValue); + jerry_release_value(key); + jerry_release_value(fontSizeVal); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void MarqueeTddTest::RunTests() +{ + ComponentMarqueeStyleSetTest006(); + ComponentMarqueeStyleSetTest007(); + ComponentMarqueeStyleSetTest008(); + ComponentMarqueeStyleSetTest009(); + ComponentMarqueeStyleSetTest010(); + ComponentMarqueeStyleSetTest011(); + ComponentMarqueeStyleSetTest012(); + ComponentMarqueeStyleSetTest013(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: ComponentMarqueeStyleSetTest006 + * @tc.desc: Verify Marquee style color set boundary value. + * @tc.require: AR000DSEFH + */ +HWTEST_F(MarqueeTddTest, marStyle006, TestSize.Level1) +{ + MarqueeTddTest::ComponentMarqueeStyleSetTest006(); +} + +/** + * @tc.name: ComponentMarqueeStyleSetTest007 + * @tc.desc: Verify Marquee style color set boundary value. + * @tc.require: AR000DSEFH + */ +HWTEST_F(MarqueeTddTest, marStyle007, TestSize.Level1) +{ + MarqueeTddTest::ComponentMarqueeStyleSetTest007(); +} + +/** + * @tc.name: ComponentMarqueeStyleSetTest008 + * @tc.desc: Verify Marquee style color set normal value. + * @tc.require: AR000DSEFH + */ +HWTEST_F(MarqueeTddTest, marStyle008, TestSize.Level1) +{ + MarqueeTddTest::ComponentMarqueeStyleSetTest008(); +} + +/** + * @tc.name: ComponentMarqueeStyleSetTest009 + * @tc.desc: Verify Marquee style color set value out of boundary. + * @tc.require: AR000DSEFH + */ +HWTEST_F(MarqueeTddTest, marStyle009, TestSize.Level1) +{ + MarqueeTddTest::ComponentMarqueeStyleSetTest009(); +} + +/** + * @tc.name: ComponentMarqueeStyleSetTest010 + * @tc.desc: Verify Marquee style color set value out of boundary. + * @tc.require: AR000DSEFH + */ +HWTEST_F(MarqueeTddTest, marStyle010, TestSize.Level1) +{ + MarqueeTddTest::ComponentMarqueeStyleSetTest010(); +} +#endif // TDD_ASSERTIONS +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/marquee_tdd_test.h b/frameworks/src/core/components/test/unittest/common/marquee_tdd_test.h new file mode 100755 index 0000000..7b92e7d --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/marquee_tdd_test.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef ACELITE_MARQUEE_TDD_TEST_H +#define ACELITE_MARQUEE_TDD_TEST_H + +#include "base_test.h" + +namespace OHOS { +namespace ACELite { +class MarqueeTddTest : public BaseTest { +public: + MarqueeTddTest() + { + const char *componentName = "marquee"; + SetCompnentNameId(const_cast(componentName)); + } + ~MarqueeTddTest() override {}; + void ComponentMarqueeStyleSetTest006(); + void ComponentMarqueeStyleSetTest007(); + void ComponentMarqueeStyleSetTest008(); + void ComponentMarqueeStyleSetTest009(); + void ComponentMarqueeStyleSetTest010(); + void ComponentMarqueeStyleSetTest011(); + void ComponentMarqueeStyleSetTest012(); + void ComponentMarqueeStyleSetTest013(); + void RunTests(); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // ACELITE_MARQUEE_TDD_TEST_H diff --git a/frameworks/src/core/components/test/unittest/common/opacity_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/opacity_tdd_test.cpp new file mode 100755 index 0000000..500f567 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/opacity_tdd_test.cpp @@ -0,0 +1,363 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "opacity_tdd_test.h" +#include "acelite_config.h" +#include "component_factory.h" +#include "div_component.h" +#include "js_app_environment.h" +#include "root_view.h" +#include "text_component.h" +#include "ui_label.h" + +namespace OHOS { +namespace ACELite { +OpacityTddTest::OpacityTddTest():BaseTest() +{ + componentNameId_ = KeyParser::ParseKeyId("div"); +} + +/** + * @tc.name:SetOpacityTest001 + * @tc.desc: Verify div Opacity 0.6 set successful. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +void OpacityTddTest::SetOpacityTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set div opacity style value = 0.6, + * check ui view opacityvalue = 0.6 + */ + const double expectOpacityValue = 0.6; + SetOpaScale(styleObj_, expectOpacityValue); + Component* divComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UIView* uiView = reinterpret_cast(divComponent->GetComponentRootView()); + EXPECT_EQ(uiView->GetOpaScale(), OPA_OPAQUE * expectOpacityValue); + TDD_CASE_END(); +} + +/** + * @tc.name:SetOpacityTest002 + * @tc.desc: Set exception div Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +void OpacityTddTest::SetOpacityTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set div exception opacity style value = 128, + * check ui view opacityvalue = 1.0 + */ + const double exceptionOpacityValue1 = 128; + const double maxOpacityValue = 1.0; + const double minOpacityValue = 0.0; + SetOpaScale(styleObj_, exceptionOpacityValue1); + Component* divComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UIView* uiView = (divComponent->GetComponentRootView()); + EXPECT_NE(uiView->GetOpaScale(), OPA_OPAQUE * exceptionOpacityValue1); + EXPECT_EQ(uiView->GetOpaScale(), OPA_OPAQUE * maxOpacityValue); + + /** + * @tc.steps: step2. set div exception opacity style value = -123456, + * check ui view opacityvalue = 0.0 + */ + const double exceptionOpacityValue2 = -123456; + SetOpaScale(styleObj_, exceptionOpacityValue2); + const char * const opacity = "opacity"; + UpdateNumAttributeOrStyleValue(divComponent, opacity, exceptionOpacityValue2, false); + EXPECT_NE(uiView->GetOpaScale(), OPA_OPAQUE * exceptionOpacityValue2); + EXPECT_EQ(uiView->GetOpaScale(), OPA_OPAQUE * minOpacityValue); + + TDD_CASE_END(); +} + + +/** + * @tc.name:SetOpacityTest003 + * @tc.desc: Set div & children text Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +void OpacityTddTest::SetOpacityTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set div opacity style value = 0.6, + */ + const double divOpacityValue = 0.6; + SetOpaScale(styleObj_, divOpacityValue); + /** + * @tc.steps: step2. set text opacity style value = 0.8, + */ + jerry_value_t textObject = jerry_create_object(); + jerry_value_t textStyleObj = jerry_create_object(); + JerrySetNamedProperty(textObject, "staticStyle", textStyleObj); + const double textOpacityValue = 0.8; + SetOpaScale(textStyleObj, textOpacityValue); + /** + * @tc.steps: step3. get div view, render and check. + */ + UIView* uiView = GetContainerView(componentNameId_, globObj_, textObject); + if (uiView == nullptr) { + TDD_CASE_END(); + return; + } + EXPECT_NE(uiView->GetOpaScale() * divOpacityValue, (int)(OPA_OPAQUE * textOpacityValue * divOpacityValue)); + jerry_release_value(textObject); + jerry_release_value(textStyleObj); + TDD_CASE_END(); +} + +/** + * @tc.name:SetOpacityTest004 + * @tc.desc: Set div & children text Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +void OpacityTddTest::SetOpacityTest004() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step1. set text opacity style value = 0.8, + */ + jerry_value_t textObject = jerry_create_object(); + jerry_value_t textStyleObj = jerry_create_object(); + JerrySetNamedProperty(textObject, "staticStyle", textStyleObj); + const double textOpacityValue = 0.8; + SetOpaScale(textStyleObj, textOpacityValue); + + /** + * @tc.steps: step2. set div opacity style value = 0.6, + */ + jerry_value_t divObject = jerry_create_object(); + jerry_value_t divStyleObj = jerry_create_object(); + JerrySetNamedProperty(divObject, "staticStyle", divStyleObj); + const double divOpacityValue1 = 0.6; + SetOpaScale(divStyleObj, divOpacityValue1); + + ComponentFactory::CreateComponent(componentNameId_, divObject, textObject); + + const double divOpacityValue2 = 0.5; + SetOpaScale(styleObj_, divOpacityValue2); + /** + * @tc.steps: step3. get div view, render and check. + */ + UIView* uiView = GetContainerView(componentNameId_, globObj_, divObject); + if (uiView == nullptr) { + TDD_CASE_END(); + return; + } + EXPECT_NE(uiView->GetOpaScale() * textOpacityValue * divOpacityValue2, + (int)(OPA_OPAQUE * textOpacityValue * divOpacityValue1 * divOpacityValue2)); + jerry_release_value(textObject); + jerry_release_value(textStyleObj); + jerry_release_value(divObject); + jerry_release_value(divStyleObj); + + TDD_CASE_END(); +} + +/** + * @tc.name:SetOpacityTest005 + * @tc.desc: Set text & text color Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +void OpacityTddTest::SetOpacityTest005() +{ + uint16_t textComponentName = KeyParser::ParseKeyId("text"); + const double componentOpacityValue = 0.6; + SetOpaScale(styleObj_, componentOpacityValue); + const char * const colorKey = "color"; + const char * const colorValue = "#66666666"; + const uint8_t colorOpacity = 102; + JerrySetStringProperty(styleObj_, colorKey, colorValue); + Component* textComponent = reinterpret_cast(GetRenderedComponent(textComponentName)); + UILabel* uiLabel = reinterpret_cast(textComponent->GetComponentRootView()); + EXPECT_EQ((int)(uiLabel->GetOpaScale() * (uiLabel->GetStyle(STYLE_TEXT_OPA)) / OPA_OPAQUE), + (int)(componentOpacityValue * colorOpacity)); + TDD_CASE_END(); +} + +/** + * @tc.name:SetOpacityTest006 + * @tc.desc: Set div & border color Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +void OpacityTddTest::SetOpacityTest006() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set div opacity style value = 0.6, + * check ui view opacityvalue = 0.6 + */ + const double componentOpacityValue = 0.6; + SetOpaScale(styleObj_, componentOpacityValue); + const char * const borderColorKey = "borderColor"; + const char * const borderColorValue = "#66666666"; + const uint8_t colorOpacity = 102; + JerrySetStringProperty(styleObj_, borderColorKey, borderColorValue); + Component* divComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + FlexLayout* uiView = reinterpret_cast(divComponent->GetComponentRootView()); + EXPECT_EQ(uiView->GetOpaScale() * (uiView->GetStyle(STYLE_BORDER_OPA)) / OPA_OPAQUE, + (int)(componentOpacityValue * colorOpacity)); + TDD_CASE_END(); +} + +/** + * @tc.name:SetOpacityTest007 + * @tc.desc: Set div & background color Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +void OpacityTddTest::SetOpacityTest007() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set div opacity style value = 0.6, + * check ui view opacityvalue = 0.6 + */ + const double componentOpacityValue = 0.6; + SetOpaScale(styleObj_, componentOpacityValue); + + const char * const backgroundColorKey = "backgroundColor"; + const char * const backgroundColorValue = "#66666666"; + const uint8_t colorOpacity = 102; + JerrySetStringProperty(styleObj_, backgroundColorKey, backgroundColorValue); + + Component* divComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + FlexLayout* uiView = reinterpret_cast(divComponent->GetComponentRootView()); + + EXPECT_EQ((int)(uiView->GetOpaScale() * (uiView->GetStyle(STYLE_BACKGROUND_OPA)) / OPA_OPAQUE), + (int)(componentOpacityValue * colorOpacity)); + TDD_CASE_END(); +} + +UIView* OpacityTddTest::GetContainerView(uint16_t componentKeyId, jerry_value_t options, jerry_value_t children) const +{ + Component* component = ComponentFactory::CreateComponent(componentKeyId, options, children); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create component error."); + return nullptr; + } + component->Render(); + Component* divComponent = (reinterpret_cast(component)); + FlexLayout* uiView = reinterpret_cast(divComponent->GetComponentRootView()); + return uiView; +} + +void OpacityTddTest::SetOpaScale(jerry_value_t styleObj, double inputOpacityValue) +{ + const double expectOpacityValue = inputOpacityValue; + const char * const opacity = "opacity"; + jerry_value_t opacityKey = jerry_create_string((const jerry_char_t*)opacity); + jerry_value_t opacityValue = jerry_create_number(expectOpacityValue); + jerry_set_property(styleObj, opacityKey, opacityValue); + jerry_release_value(opacityKey); + jerry_release_value(opacityValue); +} + + +void OpacityTddTest::RunTests() +{ + SetOpacityTest001(); + SetOpacityTest002(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name:SetOpacityTest001 + * @tc.desc: Verify div Opacity 0.6 set successful. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +HWTEST_F(OpacityTddTest, textOpacity001, TestSize.Level1) +{ + OpacityTddTest::SetOpacityTest001(); +} + +/** + * @tc.name:SetOpacityTest002 + * @tc.desc: Set exception div Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +HWTEST_F(OpacityTddTest, textOpacity002, TestSize.Level1) +{ + OpacityTddTest::SetOpacityTest002(); +} + +/** + * @tc.name:SetOpacityTest003 + * @tc.desc: Set div & children text Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +HWTEST_F(OpacityTddTest, textOpacity003, TestSize.Level1) +{ + OpacityTddTest::SetOpacityTest003(); +} + +/** + * @tc.name:SetOpacityTest004 + * @tc.desc: Set div & children text Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +HWTEST_F(OpacityTddTest, textOpacity004, TestSize.Level1) +{ + OpacityTddTest::SetOpacityTest004(); +} + +/** + * @tc.name:SetOpacityTest005 + * @tc.desc: Set text & text color Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +HWTEST_F(OpacityTddTest, textOpacity005, TestSize.Level1) +{ + OpacityTddTest::SetOpacityTest005(); +} + +/** + * @tc.name:SetOpacityTest006 + * @tc.desc: Set div & border color Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +HWTEST_F(OpacityTddTest, textOpacity006, TestSize.Level1) +{ + OpacityTddTest::SetOpacityTest006(); +} + +/** + * @tc.name:SetOpacityTest007 + * @tc.desc: Set div & background color Opacity. + * @tc.type FUNC + * @tc.require: AR000F3PDF + */ +HWTEST_F(OpacityTddTest, textOpacity007, TestSize.Level1) +{ + OpacityTddTest::SetOpacityTest007(); +} +#endif // TDD_ASSERTIONS +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/opacity_tdd_test.h b/frameworks/src/core/components/test/unittest/common/opacity_tdd_test.h new file mode 100755 index 0000000..ef06193 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/opacity_tdd_test.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef OHOS_ACELITE_TEST_OPACITY_H +#define OHOS_ACELITE_TEST_OPACITY_H + +#include "base_test.h" + +namespace OHOS { +namespace ACELite { +class OpacityTddTest : public BaseTest { +public: + OpacityTddTest(); + ~OpacityTddTest() override {}; + void SetOpacityTest001(); + void SetOpacityTest002(); + void SetOpacityTest003(); + void SetOpacityTest004(); + void SetOpacityTest005(); + void SetOpacityTest006(); + void SetOpacityTest007(); + void RunTests(); + +private: + void SetOpaScale(jerry_value_t styleObj, double inputOpacityValue); + UIView* GetContainerView(uint16_t componentKeyId, jerry_value_t options, jerry_value_t children) const; +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_TEXT_H \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/percent_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/percent_tdd_test.cpp new file mode 100755 index 0000000..b3924b2 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/percent_tdd_test.cpp @@ -0,0 +1,548 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "percent_tdd_test.h" + +#include "ace_log.h" +#include "component.h" +#include "component_utils.h" +#include "js_app_context.h" +#include "js_app_environment.h" +#include "js_fwk_common.h" +#include "number_parser.h" + +namespace OHOS { +namespace ACELite { +const char * const PercentTddTest::ATTR_STATIC_STYLE_NAME = "staticStyle"; +const char * const PercentTddTest::STYLE_WIDTH_NAME = "width"; +const char * const PercentTddTest::STYLE_HEIGHT_NAME = "height"; +const char * const PercentTddTest::STYLE_TOP_NAME = "top"; +const char * const PercentTddTest::STYLE_LEFT_NAME = "left"; +const char * const PercentTddTest::STYLE_MARGINTOP_NAME = "marginTop"; +const char * const PercentTddTest::STYLE_MARGINLEFT_NAME = "marginLeft"; +const char * const PercentTddTest::STYLE_MARGINRIGHT_NAME = "marginRight"; +const char * const PercentTddTest::STYLE_MARGINBOTTOM_NAME = "marginBottom"; +const char * const PercentTddTest::FUNC_CREATE_ELEMENT = "_c"; +void PercentTddTest::SetUp() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + if (env == nullptr) { + // should never happen + return; + } + env->InitJsFramework(); +} + +void PercentTddTest::TearDown() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + JsAppContext *context = JsAppContext::GetInstance(); + if (env == nullptr || context == nullptr) { + // should never happen + return; + } + context->ReleaseStyles(); + env->Cleanup(); +} + +void PercentTddTest::PrepareOptions(JSValue &options, JSValue &staticStyle) const +{ + // prepare component options + options = JSObject::Create(); + staticStyle = JSObject::Create(); + JSObject::Set(options, ATTR_STATIC_STYLE_NAME, staticStyle); +} + +void PercentTddTest::SetStyleWithValue(JSValue target, const char *key, const char *value) const +{ + if ((JSUndefined::Is(target)) || (key == nullptr) || (value == nullptr)) { + return; + } + JSValue propValue = JSString::Create(value); + JSObject::Set(target, key, propValue); + ReleaseJerryValue(propValue, VA_ARG_END_FLAG); +} + +void PercentTddTest::ConfigStylesWithRect(JSValue staticStyle, const char *widthValue, const char *heightValue) const +{ + SetStyleWithValue(staticStyle, STYLE_WIDTH_NAME, widthValue); + SetStyleWithValue(staticStyle, STYLE_HEIGHT_NAME, heightValue); +} + +void PercentTddTest::ConfigStylesWithPosition(JSValue staticStyle, const char *topValue, const char *leftValue) const +{ + SetStyleWithValue(staticStyle, STYLE_TOP_NAME, topValue); + SetStyleWithValue(staticStyle, STYLE_LEFT_NAME, leftValue); +} + +void PercentTddTest::ConfigStylesWithMargin(JSValue staticStyle, const char *marginValue) const +{ + ConfigStylesWithMargins(staticStyle, marginValue, marginValue, marginValue, marginValue); +} + +void PercentTddTest::ConfigStylesWithMargins(JSValue staticStyle, + const char *marginTopValue, + const char *marginLeftValue, + const char *marginRightValue, + const char *marginBottomValue) const +{ + SetStyleWithValue(staticStyle, STYLE_MARGINTOP_NAME, marginTopValue); + SetStyleWithValue(staticStyle, STYLE_MARGINLEFT_NAME, marginLeftValue); + SetStyleWithValue(staticStyle, STYLE_MARGINRIGHT_NAME, marginRightValue); + SetStyleWithValue(staticStyle, STYLE_MARGINBOTTOM_NAME, marginBottomValue); +} + +void PercentTddTest::DumpJSObjectJson(JSValue value) const +{ + if (JSUndefined::Is(value)) { + return; + } + char *jsonStr = MallocStringOf(jerry_json_stringify(value)); + HILOG_DEBUG(HILOG_MODULE_ACE, "JSObject: %s", jsonStr); + ACE_FREE(jsonStr); +} + +Component *PercentTddTest::BuildViewTree(JSValue element, int16_t parentWidth, int16_t parentHeight) const +{ + if (JSUndefined::Is(element)) { + return nullptr; + } + + Component *component = ComponentUtils::GetComponentFromBindingObject(element); + if (component != nullptr) { + ConstrainedParameter parentParameter = {parentWidth, parentHeight}; + Component::BuildViewTree(component, nullptr, parentParameter); + } + return component; +} + +void PercentTddTest::VerifyDimension(JSValue element, uint16_t keyID, int16_t targetPX) const +{ + EXPECT_FALSE(JSUndefined::Is(element)); + Component *component = ComponentUtils::GetComponentFromBindingObject(element); + EXPECT_FALSE(component == nullptr); + if (component == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "can not fetch component from element"); + } + Dimension dimension = component->GetDimension(keyID); + EXPECT_EQ(dimension.type, DimensionType::TYPE_PIXEL); + EXPECT_EQ(dimension.value.pixel, targetPX); +} + +/** + * @tc.name: AceliteFrameworkPercentParse001 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse001, TestSize.Level1) +{ + uint16_t strLength = 5; + float percentValue = 0; + /** + * @tc.steps: step1. pass nullptr for parsing + */ + bool result = NumberParser::ParsePercentValue(nullptr, strLength, percentValue); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_FALSE(result); +} + +/** + * @tc.name: AceliteFrameworkPercentParse002 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse002, TestSize.Level1) +{ + uint16_t strLength = 1; + const char *strBuffer = "100%"; + float percentValue = 0; + /** + * @tc.steps: step1. give the length small than the min length + */ + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_FALSE(result); +} + +/** + * @tc.name: AceliteFrameworkPercentParse003 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse003, TestSize.Level1) +{ + uint16_t strLength = 4; + const char *strBuffer = "100%"; + float percentValue = 0; + /** + * @tc.steps: step1. give the corrent string and length + */ + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + EXPECT_TRUE(result); + float correctValue = 100; + /** + * @tc.steps: step2. check if parse successfully + */ + EXPECT_EQ(percentValue, correctValue); +} + +/** + * @tc.name: AceliteFrameworkPercentParse004 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse004, TestSize.Level1) +{ + uint16_t strLength = 7; + /** + * @tc.steps: step1. give one string not in digit format + */ + const char *strBuffer = "abcdef%"; + float percentValue = 0; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_FALSE(result); +} + +/** + * @tc.name: AceliteFrameworkPercentParse005 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse005, TestSize.Level1) +{ + uint16_t strLength = 20; + /** + * @tc.steps: step1. give one string which is too long + */ + const char *strBuffer = "1567890123343433434%"; + float percentValue = 0; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_FALSE(result); +} + +/** + * @tc.name: AceliteFrameworkPercentParse006 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse006, TestSize.Level1) +{ + uint16_t strLength = 4; + /** + * @tc.steps: step1. give one string which includes no-digit charater + */ + const char *strBuffer = "50a%"; + float percentValue = 0; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_FALSE(result); +} + +/** + * @tc.name: AceliteFrameworkPercentParse007 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse007, TestSize.Level1) +{ + uint16_t strLength = 4; + /** + * @tc.steps: step1. give one negative number + */ + const char *strBuffer = "-40%"; + float percentValue = 0; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + /** + * @tc.steps: step2. check if parse successfully and the result is negative number + */ + EXPECT_TRUE(result); + float correctValue = -40; + EXPECT_EQ(percentValue, correctValue); +} + +/** + * @tc.name: AceliteFrameworkPercentParse008 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse008, TestSize.Level1) +{ + uint16_t strLength = 6; + /** + * @tc.steps: step1. give one string which is not number and not including % + */ + const char *strBuffer = "abcdef"; + float percentValue = 0; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_FALSE(result); +} + +/** + * @tc.name: AceliteFrameworkPercentParse009 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse009, TestSize.Level1) +{ + uint16_t strLength = 100; + /** + * @tc.steps: step1. give one string which is not number and including % + */ + const char *strBuffer = "abcdef%"; + float percentValue = 0; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + /** + * @tc.steps: step2. check if parse failed + */ + EXPECT_FALSE(result); +} + +/** + * @tc.name: AceliteFrameworkPercentParse010 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse010, TestSize.Level1) +{ + /** + * @tc.steps: step1. give one string which is bigger than float range + */ + const char *strBuffer = "123456789012345%"; + uint16_t strLength = 16; + float percentValue = 0; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + EXPECT_TRUE(result); + /** + * @tc.steps: step2. check the value is correct + */ + float correctValue = 123456789012345; + EXPECT_EQ(percentValue, correctValue); +} + +/** + * @tc.name: AceliteFrameworkPercentParse011 + * @tc.desc: Verify the percent converting process + * @tc.require: AR000F3PDD + */ +HWTEST_F(PercentTddTest, PercentParse011, TestSize.Level1) +{ + float percentValue = 0; + uint16_t strLength = 16; + /** + * @tc.steps: step1. give one very small value + */ + const char *strBuffer = "-12345678901234%"; + bool result = NumberParser::ParsePercentValue(strBuffer, strLength, percentValue); + EXPECT_TRUE(result); + /** + * @tc.steps: step2. check the value is correct + */ + float correctValue = -12345678901234; + EXPECT_EQ(percentValue, correctValue); +} + +/** + * @tc.name: AceliteFrameworkPercentSupport001 + * @tc.desc: Verify the percent processing on div. + * @tc.require: AR000F5LM1 + */ +HWTEST_F(PercentTddTest, PercentSupport001, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. prepare child component + */ + JSValue textTag = JSString::Create("text"); + JSValue textOption; + JSValue textStaticStyle; + PrepareOptions(textOption, textStaticStyle); + ConfigStylesWithRect(textStaticStyle, "50%", "50%"); + JSValue textArgs[ARG_LENGTH_2] = {textTag, textOption}; + JSValue textEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, textArgs, ARG_LENGTH_2); + /** + * @tc.steps: step2. prepare parent component + */ + JSValue divTag = JSString::Create("div"); + JSValue divOption; + JSValue divStaticStyle; + PrepareOptions(divOption, divStaticStyle); + ConfigStylesWithRect(divStaticStyle, "100%", "100%"); + JSValue divChildren = JSArray::Create(0); + JSArray::Push(divChildren, textEl); + JSValue divArgs[ARG_LENGTH_3] = {divTag, divOption, divChildren}; + JSValue divEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, divArgs, ARG_LENGTH_3); + /** + * @tc.steps: step3. trigger render and build + */ + const int16_t screenWidth = 454; + const int16_t screenHeight = 454; + Component *divComponent = BuildViewTree(divEl, screenWidth, screenHeight); + /** + * @tc.steps: step4. verify + */ + VerifyDimension(divEl, K_WIDTH, screenWidth); + const int16_t halfNum = 2; + VerifyDimension(textEl, K_HEIGHT, (screenHeight / halfNum)); + /** + * @tc.steps: step5. release resource + */ + ComponentUtils::ReleaseComponents(divComponent); + ReleaseJerryValue(textTag, textStaticStyle, textOption, textEl, VA_ARG_END_FLAG); + ReleaseJerryValue(divTag, divStaticStyle, divOption, divEl, divChildren, VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +/** + * @tc.name: AceliteFrameworkPercentSupport002 + * @tc.desc: Verify the percent processing on component. + * @tc.require: AR000F5LM1 + */ +HWTEST_F(PercentTddTest, PercentSupport002, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. prepare child component + */ + JSValue textTag = JSString::Create("text"); + JSValue textOption; + JSValue textStaticStyle; + PrepareOptions(textOption, textStaticStyle); + ConfigStylesWithPosition(textStaticStyle, "10%", "10%"); + JSValue textArgs[ARG_LENGTH_2] = {textTag, textOption}; + JSValue textEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, textArgs, ARG_LENGTH_2); + /** + * @tc.steps: step2. prepare parent component + */ + JSValue stackTag = JSString::Create("stack"); + JSValue stackOption; + JSValue stackStaticStyle; + PrepareOptions(stackOption, stackStaticStyle); + ConfigStylesWithRect(stackStaticStyle, "50%", "50%"); + JSValue stackChildren = JSArray::Create(0); + JSArray::Push(stackChildren, textEl); + JSValue stackArgs[ARG_LENGTH_3] = {stackTag, stackOption, stackChildren}; + JSValue stackEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, stackArgs, ARG_LENGTH_3); + /** + * @tc.steps: step3. trigger render and build + */ + const int16_t screenWidth = 1024; + const int16_t screenHeight = 768; + Component *stackComponent = BuildViewTree(stackEl, screenWidth, screenHeight); + /** + * @tc.steps: step4. verify + */ + const int16_t halfNum = 2; + const int16_t marginPercentNum = 10; + VerifyDimension(stackEl, K_WIDTH, (screenWidth / halfNum)); + VerifyDimension(textEl, K_TOP, ((screenHeight / halfNum) / marginPercentNum)); + /** + * @tc.steps: step5. release resource + */ + ComponentUtils::ReleaseComponents(stackComponent); + ReleaseJerryValue(textTag, textStaticStyle, textOption, textEl, VA_ARG_END_FLAG); + ReleaseJerryValue(stackTag, stackStaticStyle, stackOption, stackEl, stackChildren, VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +/** + * @tc.name: AceliteFrameworkPercentSupport003 + * @tc.desc: Verify the percent processing on component. + * @tc.require: SR000F3PDC + */ +HWTEST_F(PercentTddTest, PercentSupport003, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. prepare child component + */ + JSValue labelTag = JSString::Create("text"); + JSValue labelOption; + JSValue labelStaticStyle; + PrepareOptions(labelOption, labelStaticStyle); + ConfigStylesWithMargins(labelStaticStyle, "10%", "10%", "10%", "10%"); + JSValue labelArgs[ARG_LENGTH_2] = {labelTag, labelOption}; + JSValue textEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, labelArgs, ARG_LENGTH_2); + /** + * @tc.steps: step2. prepare parent component + */ + JSValue containerTag = JSString::Create("div"); + JSValue containerOption; + JSValue containerStaticStyle; + PrepareOptions(containerOption, containerStaticStyle); + ConfigStylesWithRect(containerStaticStyle, "100%", "100%"); + JSValue containerChildren = JSArray::Create(0); + JSArray::Push(containerChildren, textEl); + JSValue containerArgs[ARG_LENGTH_3] = {containerTag, containerOption, containerChildren}; + JSValue containerEl = JSGlobal::Call(FUNC_CREATE_ELEMENT, containerArgs, ARG_LENGTH_3); + /** + * @tc.steps: step3. trigger render and build + */ + const int16_t screenWidth = 600; + const int16_t screenHeight = 800; + Component *containerComponent = BuildViewTree(containerEl, screenWidth, screenHeight); + /** + * @tc.steps: step4. verify + */ + const int16_t marginPercent = 10; + VerifyDimension(textEl, K_MARGIN_TOP, (screenHeight / marginPercent)); + /** + * @tc.steps: step5. release resource + */ + ComponentUtils::ReleaseComponents(containerComponent); + ReleaseJerryValue(labelTag, labelStaticStyle, labelOption, textEl, VA_ARG_END_FLAG); + ReleaseJerryValue(containerTag, containerStaticStyle, containerOption, containerEl, containerChildren, + VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +/** + * used for debugging TDD implementation on simulator + */ +void PercentTddTest::RunTests() +{ +#ifndef TDD_ASSERTIONS + PercentParse001(); + PercentParse002(); + PercentParse003(); + PercentParse004(); + PercentParse005(); + PercentParse006(); + PercentParse007(); + PercentParse008(); + PercentParse009(); + PercentParse010(); + PercentParse011(); + PercentSupport001(); + PercentSupport002(); + PercentSupport003(); +#endif // TDD_ASSERTIONS +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/percent_tdd_test.h b/frameworks/src/core/components/test/unittest/common/percent_tdd_test.h new file mode 100755 index 0000000..2f406b6 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/percent_tdd_test.h @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_PERCENT_TDD_TEST_H +#define OHOS_ACELITE_PERCENT_TDD_TEST_H + +#include "acelite_config.h" +#include "component.h" +#ifdef TDD_ASSERTIONS +#include +#include +#endif +#include "test_common.h" +#include "wrapper/js.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class PercentTddTest : public testing::Test { +#else +class PercentTddTest { +#endif +public: + PercentTddTest() = default; + ~PercentTddTest() = default; + void SetUp(); + void TearDown(); + void PercentParse001(); + void PercentParse002(); + void PercentParse003(); + void PercentParse004(); + void PercentParse005(); + void PercentParse006(); + void PercentParse007(); + void PercentParse008(); + void PercentParse009(); + void PercentParse010(); + void PercentParse011(); + void PercentSupport001(); + void PercentSupport002(); + void PercentSupport003(); + void PercentSupport004(); + void RunTests(); + void PrepareOptions(JSValue &option, JSValue &staticStyle) const; + // following functions are used to setup the specific style items in percent format + void SetStyleWithValue(JSValue target, const char *key, const char *value) const; + void ConfigStylesWithRect(JSValue staticStyle, const char *widthValue, const char *heightValue) const; + void ConfigStylesWithPosition(JSValue staticStyle, const char *topValue, const char *leftValue) const; + void ConfigStylesWithMargin(JSValue staticStyle, const char *marginValue) const; + void ConfigStylesWithMargins(JSValue staticStyle, + const char *marginTopValue, + const char *marginLeftValue, + const char *marginRightValue, + const char *marginBottomValue) const; + void VerifyDimension(JSValue element, uint16_t keyID, int16_t targetPX) const; + void DumpJSObjectJson(JSValue value) const; + Component *BuildViewTree(JSValue component, int16_t parentWidth, int16_t parentHeight) const; + + static const char * const ATTR_STATIC_STYLE_NAME; + static const char * const STYLE_WIDTH_NAME; + static const char * const STYLE_HEIGHT_NAME; + static const char * const STYLE_TOP_NAME; + static const char * const STYLE_LEFT_NAME; + static const char * const STYLE_MARGINTOP_NAME; + static const char * const STYLE_MARGINLEFT_NAME; + static const char * const STYLE_MARGINRIGHT_NAME; + static const char * const STYLE_MARGINBOTTOM_NAME; + static const char * const FUNC_CREATE_ELEMENT; + static const uint8_t ARG_LENGTH_1 = 1; + static const uint8_t ARG_LENGTH_2 = 2; + static const uint8_t ARG_LENGTH_3 = 3; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_PERCENT_TDD_TEST_H \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.cpp new file mode 100755 index 0000000..89e1445 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.cpp @@ -0,0 +1,470 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "picker_view_tdd_test.h" +#include "js_app_environment.h" +#include "js_debugger_config.h" +#include "picker_view_component.h" +#include "root_view.h" +#include "stylemgr/app_style_item.h" +#include "stylemgr/app_style_manager.h" +#ifdef FEATURE_COMPONENT_DATE_PICKER +#include "ui_date_picker.h" +#endif +#include "ui_picker.h" +#include "ui_time_picker.h" + +namespace OHOS { +namespace ACELite { +PickerViewTddTest::PickerViewTddTest() +{} + +void PickerViewTddTest::SetUp() +{ + Debugger::GetInstance().SetupJSContext(); + jerry_init(JERRY_INIT_EMPTY); + + g_globObj = jerry_get_global_object(); + jerry_value_t keyAttrs = jerry_create_string(reinterpret_cast("attrs")); + g_attrsObj = jerry_create_object(); + jerry_release_value(jerry_set_property(g_globObj, keyAttrs, g_attrsObj)); + jerry_release_value(keyAttrs); + + jerry_value_t keyStaticStyle = jerry_create_string(reinterpret_cast("staticStyle")); + g_styleObj = jerry_create_object(); + jerry_release_value(jerry_set_property(g_globObj, keyStaticStyle, g_styleObj)); + jerry_release_value(keyStaticStyle); + rootComponentMock_.PrepareRootContainer(); +} + +void PickerViewTddTest::TearDown() +{ + JsAppContext::GetInstance()->ReleaseStyles(); + jerry_release_value(g_globObj); + jerry_release_value(g_attrsObj); + jerry_release_value(g_styleObj); + jerry_cleanup(); +} + +Component* PickerViewTddTest::GetRenderedComponent(uint16_t componentKeyId) const +{ + jerry_value_t children = jerry_create_null(); + Component* component = ComponentFactory::CreateComponent(componentKeyId, g_globObj, children); + rootComponentMock_.RenderComponent(*component); + jerry_release_value(children); + return component; +} + +uint16_t PickerViewTddTest::SetCompnentNameId(const char* componentName) +{ + if (!strcmp(componentName, "picker-view")) { + uint8_t len = 11; + return g_componentNameId = KeyParser::ParseKeyId("picker-view", len); + } + return -1; +} + +void PickerViewTddTest::SetTextPickerRange() +{ + uint32_t length = 2; + jerry_value_t rangeValue = jerry_create_array(length); + jerry_value_t firstValue = jerry_create_string(reinterpret_cast("AA")); + jerry_value_t secValue = jerry_create_string(reinterpret_cast("BB")); + jerry_set_property_by_index(rangeValue, 0, firstValue); + jerry_set_property_by_index(rangeValue, 1, secValue); + jerry_value_t rangeKey = jerry_create_string(reinterpret_cast("range")); + jerry_release_value(jerry_set_property(g_attrsObj, rangeKey, rangeValue)); + jerry_release_value(rangeKey); + jerry_release_value(firstValue); + jerry_release_value(secValue); + jerry_release_value(rangeValue); +} + +void PickerViewTddTest::SetCharAttribute(const char* keyName, const char* attribute) +{ + jerry_value_t attrName = jerry_create_string(reinterpret_cast(keyName)); + jerry_value_t attrValue = jerry_create_string(reinterpret_cast(attribute)); + jerry_release_value(jerry_set_property(g_attrsObj, attrName, attrValue)); + jerry_release_value(attrName); + jerry_release_value(attrValue); +} + +void PickerViewTddTest::SetNumAttribute(const char* keyName, const int32_t attribute) +{ + jerry_value_t attrName = jerry_create_string(reinterpret_cast(keyName)); + jerry_value_t attrValue = jerry_create_number(attribute); + jerry_release_value(jerry_set_property(g_attrsObj, attrName, attrValue)); + jerry_release_value(attrName); + jerry_release_value(attrValue); +} + +void PickerViewTddTest::SetNumStyle(const char* keyName, const int32_t style) +{ + jerry_value_t styleName = jerry_create_string(reinterpret_cast(keyName)); + jerry_value_t styleValue = jerry_create_number(style); + jerry_release_value(jerry_set_property(g_styleObj, styleName, styleValue)); + jerry_release_value(styleName); + jerry_release_value(styleValue); +} + +void PickerViewTddTest::ComponentPickerviewAttributeSetTest001() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("picker-view"); + + /** + * @tc.steps: step1. set invalid type attribute + */ + SetCharAttribute("type", "unknown"); + + Component* pickerComponent = reinterpret_cast(GetRenderedComponent(g_componentNameId)); + if (!pickerComponent) { + printf("ComponentPickerviewAttributeSetTest001 fail\n"); + return; + } + EXPECT_TRUE(pickerComponent != nullptr); + UIPicker* textPicker = reinterpret_cast(pickerComponent->GetComponentRootView()); + UITimePicker* timePicker = reinterpret_cast(pickerComponent->GetComponentRootView()); +#ifdef FEATURE_COMPONENT_DATE_PICKER + UIDatePicker* datePicker = reinterpret_cast(pickerComponent->GetComponentRootView()); +#endif + + /** + * @tc.expected: step1. native picker object is nullptr + */ + if (!textPicker && !timePicker +#ifdef FEATURE_COMPONENT_DATE_PICKER + && !datePicker +#endif + ) { + printf("ComponentPickerviewAttributeSetTest001 pass\n"); + } else { + printf("ComponentPickerviewAttributeSetTest001 fail\n"); + } + EXPECT_TRUE((textPicker == nullptr) && (timePicker == nullptr) +#ifdef FEATURE_COMPONENT_DATE_PICKER + && (datePicker != nullptr) +#endif + ); + + pickerComponent->Release(); + delete pickerComponent; + pickerComponent = nullptr; + + TDD_CASE_END(); +} + +void PickerViewTddTest::ComponentPickerviewAttributeSetTest002() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("picker-view"); + + /** + * @tc.steps: step1. set type attribute to text + */ + SetCharAttribute("type", "text"); + SetNumStyle("width", g_width); + SetNumStyle("height", g_height); + + /** + * @tc.steps: step2. set range attribute + */ + SetTextPickerRange(); + + /** + * @tc.steps: step3. set selected attribute + */ + SetNumAttribute("selected", 1); + + /** + * @tc.expected: step4. render native textPicker object + */ + Component* pickerComponent = reinterpret_cast(GetRenderedComponent(g_componentNameId)); + if (!pickerComponent) { + printf("ComponentPickerviewAttributeSetTest002 fail\n"); + return; + } + EXPECT_TRUE(pickerComponent != nullptr); + UIPicker* textPicker = reinterpret_cast(pickerComponent->GetComponentRootView()); + + /** + * @tc.expected: step4. native textPicker object is not nullptr + */ + if (!textPicker) { + printf("ComponentPickerviewAttributeSetTest002 fail\n"); + delete pickerComponent; + pickerComponent = nullptr; + return; + } + EXPECT_TRUE(textPicker != nullptr); + + /** + * @tc.expected: step4. GetSelected return 1 + */ + if (textPicker->GetSelected() == 1) { + printf("ComponentPickerviewAttributeSetTest002 pass\n"); + } else { + printf("ComponentPickerviewAttributeSetTest002 fail\n"); + } + EXPECT_EQ(textPicker->GetSelected(), 1); + pickerComponent->Release(); + delete pickerComponent; + pickerComponent = nullptr; + + TDD_CASE_END(); +} + +void PickerViewTddTest::ComponentPickerviewAttributeSetTest003() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("picker-view"); + + /** + * @tc.steps: step1. set type attribute to text + */ + SetCharAttribute("type", "text"); + SetNumStyle("width", g_width); + SetNumStyle("height", g_height); + + /** + * @tc.steps: step2. set invalid range attribute + */ + uint32_t length = 2; + jerry_value_t rangeValue = jerry_create_array(length); + jerry_value_t firstValue = jerry_create_null(); + jerry_value_t secValue = jerry_create_undefined(); + jerry_set_property_by_index(rangeValue, 0, firstValue); + jerry_set_property_by_index(rangeValue, 1, secValue); + jerry_value_t rangeKey = jerry_create_string(reinterpret_cast("range")); + jerry_release_value(jerry_set_property(g_attrsObj, rangeKey, rangeValue)); + jerry_release_value(rangeKey); + jerry_release_value(firstValue); + jerry_release_value(secValue); + jerry_release_value(rangeValue); + + /** + * @tc.steps: step3. set selected attribute + */ + SetNumAttribute("selected", 1); + + /** + * @tc.expected: step4. render native textPicker object + */ + Component* pickerComponent = reinterpret_cast(GetRenderedComponent(g_componentNameId)); + if (!pickerComponent) { + printf("ComponentPickerviewAttributeSetTest003 fail\n"); + return; + } + EXPECT_TRUE(pickerComponent != nullptr); + UIPicker* textPicker = reinterpret_cast(pickerComponent->GetComponentRootView()); + + /** + * @tc.expected: step4. native textPicker object is not nullptr + */ + if (!textPicker) { + printf("ComponentPickerviewAttributeSetTest003 fail\n"); + delete pickerComponent; + pickerComponent = nullptr; + return; + } + EXPECT_TRUE(textPicker != nullptr); + + /** + * @tc.expected: step4. GetSelected return 0 + */ + if (textPicker->GetSelected() == 0) { + printf("ComponentPickerviewAttributeSetTest003 pass\n"); + } else { + printf("ComponentPickerviewAttributeSetTest003 fail\n"); + } + EXPECT_EQ(textPicker->GetSelected(), 0); + pickerComponent->Release(); + delete pickerComponent; + pickerComponent = nullptr; + + TDD_CASE_END(); +} + +void PickerViewTddTest::ComponentPickerviewAttributeSetTest004() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("picker-view"); + /** + * @tc.steps: step1. set range attribute + */ + SetTextPickerRange(); + + /** + * @tc.steps: step2. set invalid selected attribute + */ + SetNumStyle("width", g_width); + SetNumStyle("height", g_height); + SetCharAttribute("selected", "invalid"); + + /** + * @tc.steps: step3. render native textPicker object + */ + Component* pickerComponent = reinterpret_cast(GetRenderedComponent(g_componentNameId)); + if (!pickerComponent) { + printf("ComponentPickerviewAttributeSetTest004 fail\n"); + return; + } + EXPECT_TRUE(pickerComponent != nullptr); + + UIPicker* textPicker = reinterpret_cast(pickerComponent->GetComponentRootView()); + + /** + * @tc.expected: step3. native textPicker object is not nullptr + */ + if (!textPicker) { + printf("ComponentPickerviewAttributeSetTest004 fail\n"); + delete pickerComponent; + pickerComponent = nullptr; + return; + } + EXPECT_TRUE(textPicker != nullptr); + + /** + * @tc.expected: step3. GetSelected return 0 + */ + if (textPicker->GetSelected() == 0) { + printf("ComponentPickerviewAttributeSetTest004 pass\n"); + } else { + printf("ComponentPickerviewAttributeSetTest004 fail\n"); + } + EXPECT_EQ(textPicker->GetSelected(), 0); + pickerComponent->Release(); + delete pickerComponent; + pickerComponent = nullptr; + + TDD_CASE_END(); +} + +void PickerViewTddTest::ComponentPickerviewAttributeSetTest005() +{ + TDD_CASE_BEGIN(); + SetCompnentNameId("picker-view"); + /** + * @tc.steps: step1. set range attribute + */ + SetTextPickerRange(); + + /** + * @tc.steps: step2. set out of bound selected attribute + */ + SetNumStyle("width", g_width); + SetNumStyle("height", g_height); + SetNumAttribute("selected", -1); + + /** + * @tc.steps: step3. render native textPicker object + */ + Component* pickerComponent = reinterpret_cast(GetRenderedComponent(g_componentNameId)); + if (!pickerComponent) { + printf("ComponentPickerviewAttributeSetTest005 fail\n"); + return; + } + EXPECT_TRUE(pickerComponent != nullptr); + UIPicker* textPicker = reinterpret_cast(pickerComponent->GetComponentRootView()); + + /** + * @tc.expected: step3. native textPicker object is not nullptr + */ + if (!textPicker) { + printf("ComponentPickerviewAttributeSetTest005 fail\n"); + delete pickerComponent; + pickerComponent = nullptr; + return; + } + EXPECT_TRUE(textPicker != nullptr); + + /** + * @tc.expected: step3. GetSelected return 0 + */ + if (textPicker->GetSelected() == 0) { + printf("ComponentPickerviewAttributeSetTest005 pass\n"); + } else { + printf("ComponentPickerviewAttributeSetTest005 fail\n"); + } + EXPECT_EQ(textPicker->GetSelected(), 0); + pickerComponent->Release(); + delete pickerComponent; + pickerComponent = nullptr; + + TDD_CASE_END(); +} + +void PickerViewTddTest::RunTests() +{ + ComponentPickerviewAttributeSetTest001(); + ComponentPickerviewAttributeSetTest002(); + ComponentPickerviewAttributeSetTest003(); + ComponentPickerviewAttributeSetTest004(); + ComponentPickerviewAttributeSetTest005(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: ComponentPickerviewAttributeSetTest001 + * @tc.desc: Verify picker-view invalid type attribute. + * @tc.require: AR000DSEFD + */ +HWTEST_F(PickerViewTddTest, PickerviewAttr001, TestSize.Level1) +{ + PickerViewTddTest::ComponentPickerviewAttributeSetTest001(); +} + +/** + * @tc.name: ComponentPickerviewAttributeSetTest002 + * @tc.desc: Verify text picker-view valid attributes. + * @tc.require: AR000DSEFD + */ +HWTEST_F(PickerViewTddTest, PickerviewAttr002, TestSize.Level1) +{ + PickerViewTddTest::ComponentPickerviewAttributeSetTest002(); +} + +/** + * @tc.name: ComponentPickerviewAttributeSetTest003 + * @tc.desc: Verify text picker-view invalid range attribute. + * @tc.require: AR000DSEFD + */ +HWTEST_F(PickerViewTddTest, PickerviewAttr003, TestSize.Level1) +{ + PickerViewTddTest::ComponentPickerviewAttributeSetTest003(); +} + +/** + * @tc.name: ComponentPickerviewAttributeSetTest004 + * @tc.desc: Verify text picker-view invalid selected attribute. + * @tc.require: AR000DSEFD + */ +HWTEST_F(PickerViewTddTest, PickerviewAttr004, TestSize.Level1) +{ + PickerViewTddTest::ComponentPickerviewAttributeSetTest004(); +} + +/** + * @tc.name: ComponentPickerviewAttributeSetTest005 + * @tc.desc: Verify text picker-view with out of bound selected attribute. + * @tc.require: AR000DSEFD + */ +HWTEST_F(PickerViewTddTest, PickerviewAttr005, TestSize.Level1) +{ + PickerViewTddTest::ComponentPickerviewAttributeSetTest005(); +} +#endif +} // ACELite +} // OHOS diff --git a/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h b/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h new file mode 100755 index 0000000..a734fda --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef ACELITE_PICKER_VIEW_TDD_TEST_H +#define ACELITE_PICKER_VIEW_TDD_TEST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#endif + +#include "acelite_config.h" +#include "component_factory.h" +#include "root_component_mock.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +static jerry_value_t g_globObj; +static jerry_value_t g_attrsObj; +static jerry_value_t g_styleObj; +static uint16_t g_componentNameId; +static int32_t g_width = 400; +static int32_t g_height = 400; +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class PickerViewTddTest : public testing::Test { +#else +class PickerViewTddTest { +#endif +public: + + PickerViewTddTest(); + ~PickerViewTddTest(){}; + void SetUp(); + void TearDown(); + Component* GetRenderedComponent(uint16_t componentKeyId) const; + static uint16_t SetCompnentNameId(const char* componentName); + static void SetTextPickerRange(); + static void SetCharAttribute(const char* keyName, const char* attribute); + void SetNumAttribute(const char* keyName, const int32_t attribute); + + void SetNumStyle(const char* keyName, const int32_t style); + void ComponentPickerviewAttributeSetTest001(); + void ComponentPickerviewAttributeSetTest002(); + void ComponentPickerviewAttributeSetTest003(); + void ComponentPickerviewAttributeSetTest004(); + void ComponentPickerviewAttributeSetTest005(); + void RunTests(); + +private: + RootComponentMock rootComponentMock_; +}; +} // namespace ACELite +} // namesapce OHOS +#endif // ACELITE_PICKER_VIEW_TDD_TEST_H diff --git a/frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.cpp new file mode 100755 index 0000000..c4a794d --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.cpp @@ -0,0 +1,530 @@ +/* + * Copyright (c) 2021 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. + */ +#include "radio_switch_tdd_test.h" +#include "ui_radio_button.h" +#include "ui_toggle_button.h" +namespace OHOS { +namespace ACELite { +RadioSwitchTddTest::RadioSwitchTddTest() : radioComponentId_(0), switchComponentId_(0) +{ + const int switchNameLen = 3; + switchComponentId_ = KeyParser::ParseKeyId("switch", switchNameLen); + const int inputNameLen = 5; + radioComponentId_ = KeyParser::ParseKeyId("input", inputNameLen); +} + +void RadioSwitchTddTest::WidthRadioValueTest001() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.set the input type radio + */ + JerrySetStringProperty(attrsObj_, "type", "radio"); + + /** + * @tc.steps:step2.set the input width 25 + * @tc.expected:step2.the radio width is 25 + */ + int32_t width = 25; + JerrySetNumberProperty(styleObj_, "width", width); + Component *component = GetRenderedComponent(radioComponentId_); + UIRadioButton *radio = reinterpret_cast(component->GetComponentRootView()); + if (radio->GetWidth() != width) { + printf("[WidthRadioValueTest001] set the radio width 25 failed\n"); + delete component; + return; + } + EXPECT_FALSE(radio->GetWidth() != width); + delete component; + component = nullptr; + + /** + * @tc.steps:step3.set the input width -1 + * @tc.steps:step3.the radio width is the default length 46 + */ + width = -1; + const uint8_t defaultLen = 46; + JerrySetNumberProperty(styleObj_, "width", width); + component = GetRenderedComponent(radioComponentId_); + radio = reinterpret_cast(component->GetComponentRootView()); + if (radio->GetWidth() != defaultLen) { + printf("[WidthRadioValueTest001] set the radio width 0 failed\n"); + delete component; + return; + } + EXPECT_FALSE(radio->GetWidth() != defaultLen); + delete component; + component = nullptr; + + /** + * @tc.steps:step4.set the input width INT16_MAX + 20 + * @tc.steps:step4.the width of radio is 19 + */ + width = MAX_VALUE; + JerrySetNumberProperty(styleObj_, "width", width); + component = GetRenderedComponent(radioComponentId_); + radio = reinterpret_cast(component->GetComponentRootView()); + if (radio->GetWidth() != CHECK_LEN) { + printf("[WidthRadioValueTest001] set the radio width INT16_MAX + 20 failed\n"); + } else { + printf("[WidthRadioValueTest001] passed\n"); + } + EXPECT_FALSE(radio->GetWidth() != CHECK_LEN); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::WidthRadioValueTest002() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.set the input type radio + */ + JerrySetStringProperty(attrsObj_, "type", "radio"); + + /** + * @tc.steps:step2.set the radio width false + * @tc.expected:step2.the width of radio is defaultLength 46 + */ + jerry_value_t widthValue = jerry_create_boolean(false); + JerrySetNamedProperty(styleObj_, "width", widthValue); + jerry_release_value(widthValue); + Component *component = GetRenderedComponent(radioComponentId_); + UIRadioButton *radio = reinterpret_cast(component->GetComponentRootView()); + if (radio->GetWidth() != 0) { + printf("[WidthRadioValueTest002] set the width false failed\n"); + delete component; + return; + } + EXPECT_FALSE(radio->GetWidth() != 0); + delete component; + component = nullptr; + + /** + * @tc.steps:step3.set the radio width testaaa + * @tc.expected:step3.the width of radio is defaultLen 46 + */ + JerrySetStringProperty(styleObj_, "width", "testaaa"); + component = GetRenderedComponent(radioComponentId_); + radio = reinterpret_cast(component->GetComponentRootView()); + if (radio->GetWidth() != 0) { + printf("[WidthRadioValueTest002] set the radio width testaaa failed\n"); + } else { + printf("[WidthRadioValueTest002] passed\n"); + } + EXPECT_FALSE(radio->GetWidth() != 0); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::WidthSwitchValueTest003() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.set the radio width 25 + * @tc.expected:step1.the width of toggleButton is 25 + */ + int32_t width = 25; + JerrySetNumberProperty(styleObj_, "width", width); + Component *component = GetRenderedComponent(switchComponentId_); + UIToggleButton *toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetWidth() != width) { + printf("[WidthSwitchValueTest003] set the switch width 25 failed\n"); + delete component; + return; + } + EXPECT_TRUE(toggleButton->GetWidth() == width); + delete component; + component = nullptr; + + /** + * @tc.steps:step2.set the radio width 0 + * @tc.expected:step2.the radio width is the defaultLen 46 + */ + const uint8_t defaultLen = 46; + width = -1; + JerrySetNumberProperty(styleObj_, "width", width); + component = GetRenderedComponent(switchComponentId_); + toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetWidth() != defaultLen) { + printf("[WidthSwitchValueTest003] set the switch width -1 failed\n"); + delete component; + return; + } + EXPECT_TRUE(toggleButton->GetWidth() == defaultLen); + delete component; + component = nullptr; + + /** + * @tc.steps:step3.set the switch width 256 + * @tc.expected:step3.the width of switch is 256 + */ + width = MAX_VALUE; + JerrySetNumberProperty(styleObj_, "width", width); + component = GetRenderedComponent(switchComponentId_); + toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetWidth() != CHECK_LEN) { + printf("[WidthSwitchValueTest003] set the switch width int16_max + 20 failed\n"); + } else { + printf("[WidthSwitchValueTest003] passed\n"); + } + EXPECT_TRUE(toggleButton->GetWidth() == CHECK_LEN); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::WidthSwitchValueTest004() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.set the width of switch false + * @tc.expected:step1.the width of switch is defaultLen 46 + */ + jerry_value_t widthVal = jerry_create_boolean(false); + JerrySetNamedProperty(styleObj_, "width", widthVal); + jerry_release_value(widthVal); + Component *component = GetRenderedComponent(switchComponentId_); + UIToggleButton *toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetWidth() != 0) { + printf("[WidthSwitchValueTest004]set the width of switch false failed\n"); + delete component; + return; + } + EXPECT_TRUE(toggleButton->GetWidth() == 0); + delete component; + component = nullptr; + + JerrySetStringProperty(styleObj_, "width", "testaaa"); + component = GetRenderedComponent(switchComponentId_); + toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetWidth() == 0) { + printf("[WidthSwitchValueTest004] passed\n"); + } else { + printf("[WidthSwitchValueTest004] set the width of switch testaaa failed\n"); + } + EXPECT_TRUE(toggleButton->GetWidth() == 0); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::HeightRadioValueTest005() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.set the input type radio + */ + JerrySetStringProperty(attrsObj_, "type", "radio"); + + /** + * @tc.steps:step2.set the width of radio 25 + * @tc.expected:step2.the width of radio is 25 + */ + int32_t height = 25; + JerrySetNumberProperty(styleObj_, "height", height); + Component *component = GetRenderedComponent(radioComponentId_); + UIToggleButton *toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetHeight() != height) { + printf("[HeightRadioValueTest005] set the height of radio 25 failed\n"); + delete component; + return; + } + EXPECT_TRUE(toggleButton->GetHeight() == height); + delete component; + component = nullptr; + + /** + * @tc.steps:step3.set the height of radio 0 + * @tc.expected:step3.the height of radio is defaultLen 46 + */ + height = -1; + const uint8_t defaultLen = 46; + JerrySetNumberProperty(styleObj_, "height", height); + component = GetRenderedComponent(radioComponentId_); + toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetHeight() != defaultLen) { + printf("[HeightRadioValueTest005] set the height of radio 0 failed\n"); + delete component; + return; + } + EXPECT_TRUE(toggleButton->GetHeight() == defaultLen); + delete component; + component = nullptr; + + /** + * @tc.steps:step4.set the height of radio UINT16_MAX + 20 + * @tc.steps:step4.the height of radio is 19 + */ + height = MAX_VALUE; + JerrySetNumberProperty(styleObj_, "height", height); + component = GetRenderedComponent(radioComponentId_); + toggleButton = reinterpret_cast(component->GetComponentRootView()); + if (toggleButton->GetHeight() != CHECK_LEN) { + printf("[HeightRadioValueTest005] set the height of radio UINT16_MAX + 20 failed\n"); + } else { + printf("[HeightRadioValueTest005] passed\n"); + } + EXPECT_TRUE(toggleButton->GetHeight() == CHECK_LEN); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::HeightRadioValueTest006() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.set the input type radio + */ + JerrySetStringProperty(attrsObj_, "type", "radio"); + + /** + * @tc.steps:step2.set the height of radio false + * @tc.expected:step2.the height of radio is the defaultLen 46 + */ + jerry_value_t widthVal = jerry_create_boolean(false); + JerrySetNamedProperty(styleObj_, "width", widthVal); + jerry_release_value(widthVal); + Component *component = GetRenderedComponent(switchComponentId_); + UIRadioButton *radioButton = reinterpret_cast(component->GetComponentRootView()); + if (radioButton->GetWidth() != 0) { + printf("[HeightRadioValueTest006] set the height of switch false"); + delete component; + return; + } + EXPECT_TRUE(radioButton->GetWidth() == 0); + delete component; + component = nullptr; + + /** + * @tc.steps:step3.set the height of radio testaaa + * @tc.expected:step3.the height of radio is defaultLen 46 + */ + JerrySetStringProperty(styleObj_, "width", "testaaa"); + component = GetRenderedComponent(switchComponentId_); + radioButton = reinterpret_cast(component->GetComponentRootView()); + if (radioButton->GetWidth() != 0) { + printf("[HeightRadioValueTest006] set the height of switch testaaa failed\n"); + } else { + printf("[HeightRadioValueTest006] passed\n"); + } + EXPECT_TRUE(radioButton->GetWidth() == 0); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::HeightSwitchValueTest007() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.set the height of switch 25 + * @tc.steps:step1.the height of radio is 25 + */ + int32_t height = 25; + JerrySetNumberProperty(styleObj_, "height", height); + Component *component = GetRenderedComponent(switchComponentId_); + UIRadioButton *button = reinterpret_cast(component->GetComponentRootView()); + if (button->GetHeight() != height) { + printf("[HeightSwitchValueTest007]set the switch height 25 failed\n"); + delete component; + return; + } + EXPECT_TRUE(button->GetHeight() == height); + delete component; + component = nullptr; + + /** + * @tc.steps:step2.set the height of switch 0 + * @tc.expected:step2.the height of switch is the default length 46 + */ + height = -1; + const uint8_t defaultLen = 46; + JerrySetNumberProperty(styleObj_, "height", height); + component = GetRenderedComponent(switchComponentId_); + button = reinterpret_cast(component->GetComponentRootView()); + if (button->GetHeight() != defaultLen) { + printf("[HeightSwitchValueTest007] set the height of switch -1 failed\n"); + delete component; + return; + } + EXPECT_TRUE(button->GetHeight() == defaultLen); + delete component; + component = nullptr; + + /** + * @tc.steps:step3.set the height of switch INT16_MAX + 20 + * @tc.expected:step3.the height of switch is the default length 19 + */ + height = MAX_VALUE; + JerrySetNumberProperty(styleObj_, "height", height); + component = GetRenderedComponent(switchComponentId_); + button = reinterpret_cast(component->GetComponentRootView()); + if (button->GetHeight() != CHECK_LEN) { + printf("[HeightSwitchValueTest007] set the height of switch 256 failed\n"); + } else { + printf("[HeightSwitchValueTest007] passed\n"); + } + EXPECT_TRUE(button->GetHeight() == CHECK_LEN); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::HeightSwitchValueTest008() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step1.set the switch heifhr false + * @tc.expected: step1.the height is the default height 46 + */ + jerry_value_t number = jerry_create_boolean(false); + JerrySetNamedProperty(styleObj_, "height", number); + jerry_release_value(number); + Component *component = GetRenderedComponent(switchComponentId_); + UIRadioButton *button = reinterpret_cast(component->GetComponentRootView()); + if (button->GetHeight() != 0) { + printf("[HeightSwitchValueTest008] set the height of switch false failed\n"); + delete component; + return; + } + EXPECT_TRUE(button->GetHeight() == 0); + delete component; + component = nullptr; + + /** + * @tc.steps: step2.set the switch height testaaa + * @tc.expected: step2.the height of toggleButton is default height 46 + */ + JerrySetStringProperty(styleObj_, "height", "testaaa"); + component = GetRenderedComponent(switchComponentId_); + button = reinterpret_cast(component->GetComponentRootView()); + if (button->GetHeight() != 0) { + printf("[HeightSwitchValueTest008]set the height of switch testaaa failed\n"); + } else { + printf("[HeightSwitchValueTest008] passed\n"); + } + EXPECT_TRUE(button->GetHeight() == 0); + delete component; + component = nullptr; + TDD_CASE_END(); +} + +void RadioSwitchTddTest::RunTests() +{ + WidthRadioValueTest001(); + WidthRadioValueTest002(); + WidthSwitchValueTest003(); + WidthSwitchValueTest004(); + HeightRadioValueTest005(); + HeightRadioValueTest006(); + HeightSwitchValueTest007(); + HeightSwitchValueTest008(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: Width_Radio_Value_Test001 + * @tc.desc: test the radio width in different range + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, radioWidthTest001, TestSize.Level1) +{ + WidthRadioValueTest001(); +} + +/** + * @tc.name: Width_Radio_Value_Test002 + * @tc.desc: test the radio width in invalid value + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, radioWidthTest002, TestSize.Level1) +{ + WidthRadioValueTest002(); +} + +/** + * @tc.name: Width_Switch_Value_Test003 + * @tc.desc: test the switch width in different range + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, widthSwitchTest003, TestSize.Level1) +{ + WidthSwitchValueTest003(); +} + +/** + * @tc.name: Width_Switch_Value_Test004 + * @tc.desc: set the width of switch invalid value + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, widthSwitchTest004, TestSize.Level1) +{ + WidthSwitchValueTest004(); +} + +/** + * @tc.name: Height_Radio_Value_Test005 + * @tc.desc: set the height of radio in different range + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, heightRadioTest005, TestSize.Level1) +{ + HeightRadioValueTest005(); +} + +/** + * @tc.name: Height_Radio_Value_Test006 + * @tc.desc: set the height of radio invalid value + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, heightRadioTest006, TestSize.Level1) +{ + HeightRadioValueTest006(); +} + +/** + * @tc.name: Height_Switch_Value_Test007 + * @tc.desc: set the height of radio invalid value + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, heightSwitchTest007, TestSize.Level1) +{ + HeightSwitchValueTest007(); +} + +/** + * @tc.name: Height_Switch_Value_Test008 + * @tc.desc: set the height of radio invalid value + * @tc.require: AR000F3PDH + */ +HWTEST_F(RadioSwitchTddTest, heightSwitchTest008, TestSize.Level1) +{ + HeightSwitchValueTest008(); +} +#endif +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.h b/frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.h new file mode 100755 index 0000000..9f1ba4a --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/radio_switch_tdd_test.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef RADIO_SWITCH_TDD_TEST_H +#define RADIO_SWITCH_TDD_TEST_H +#include +#include "base_test.h" +namespace OHOS { +namespace ACELite { +class RadioSwitchTddTest : public BaseTest { +public: + RadioSwitchTddTest(); + ~RadioSwitchTddTest() override {} + void RunTests(); + void WidthRadioValueTest001(); + void WidthRadioValueTest002(); + void WidthSwitchValueTest003(); + void WidthSwitchValueTest004(); + void HeightRadioValueTest005(); + void HeightRadioValueTest006(); + void HeightSwitchValueTest007(); + void HeightSwitchValueTest008(); + +private: + constexpr static uint32_t MAX_VALUE = 65555; + constexpr static int16_t CHECK_LEN = MAX_VALUE - UINT16_MAX - 1; + uint16_t radioComponentId_; + uint16_t switchComponentId_; +}; +} +} + +#endif // RADIO_SWITCH_TDD_TEST_H diff --git a/frameworks/src/core/components/test/unittest/common/root_component_mock.cpp b/frameworks/src/core/components/test/unittest/common/root_component_mock.cpp new file mode 100755 index 0000000..720f296 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/root_component_mock.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "root_component_mock.h" + +#include "div_component.h" +#include "stack_component.h" + +namespace OHOS { +namespace ACELite { +RootComponentMock::RootComponentMock() + : rootContainer_(nullptr), + containerStyleMgr_(nullptr), + rootWidth_(DEFAULT_CONTAINER_WIDTH), + rootHeight_(DEFAULT_CONTAINER_HEIGHT) +{ +} + +RootComponentMock::~RootComponentMock() +{ + if (containerStyleMgr_ != nullptr) { + delete containerStyleMgr_; + containerStyleMgr_ = nullptr; + } + + if (rootContainer_ != nullptr) { + // we do not render this container, so no need to call release + delete rootContainer_; + rootContainer_ = nullptr; + } +} + +/** + * @brief PrepareRootContainer prepare the container, must call this after engine initialized + */ +void RootComponentMock::PrepareRootContainer(int16_t width, int16_t height, bool flex) +{ + rootWidth_ = width; + rootHeight_ = height; + + if (containerStyleMgr_ == nullptr) { + containerStyleMgr_ = new AppStyleManager(); + } + + if (rootContainer_ == nullptr) { + if (flex) { + rootContainer_ = new DivComponent(UNDEFINED, UNDEFINED, containerStyleMgr_); + } else { + rootContainer_ = new StackComponent(UNDEFINED, UNDEFINED, containerStyleMgr_); + } + } +} + +/** + * @brief RenderUnderTestComponent render the given component and build view tree to the container + * @param component the under test component + */ +void RootComponentMock::RenderComponent(Component &component) const +{ + component.Render(); + // trigger build tree flow to apply aligned dimension to low layer + ConstrainedParameter parentParameter = {rootWidth_, rootHeight_}; + Component::BuildViewTree(&component, rootContainer_, parentParameter); +} +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/root_component_mock.h b/frameworks/src/core/components/test/unittest/common/root_component_mock.h new file mode 100755 index 0000000..2145bda --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/root_component_mock.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef ACELITE_JSFWK_TEST_CONTAINER_HOLDER_H +#define ACELITE_JSFWK_TEST_CONTAINER_HOLDER_H + +#include "component.h" +#include "stylemgr/app_style_manager.h" + +namespace OHOS { +namespace ACELite { +class RootComponentMock final { +public: + RootComponentMock(); + ~RootComponentMock(); + + /** + * @brief PrepareRootContainer prepare the container + */ + void PrepareRootContainer(int16_t width = DEFAULT_CONTAINER_WIDTH, + int16_t height = DEFAULT_CONTAINER_HEIGHT, + bool flex = true); + /** + * @brief RenderUnderTestComponent render the given component and build view tree to the container + * @param component the under test component + */ + void RenderComponent(Component &component) const; + +private: + static const int16_t DEFAULT_CONTAINER_WIDTH = 454; + static const int16_t DEFAULT_CONTAINER_HEIGHT = 454; + // used for build view tree flow, no specific meaning + Component *rootContainer_; + AppStyleManager *containerStyleMgr_; + int16_t rootWidth_; + int16_t rootHeight_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // ACELITE_JSFWK_TEST_CONTAINER_HOLDER_H diff --git a/frameworks/src/core/components/test/unittest/common/slider_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/slider_tdd_test.cpp new file mode 100755 index 0000000..c503a73 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/slider_tdd_test.cpp @@ -0,0 +1,423 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "slider_tdd_test.h" +#include "acelite_config.h" +#include "component_factory.h" +#include "js_app_environment.h" +#include "root_view.h" +#include "slider_component.h" +#include "ui_slider.h" + +namespace OHOS { +namespace ACELite { +SliderTddTest::SliderTddTest():BaseTest() +{ + componentNameId_ = KeyParser::ParseKeyId("slider"); +} + +void SliderTddTest::ComponentSliderAttributeMinTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set Slider attribute min value = 0 + */ + const int expectMinValue = 0; + const char* minStr = "min"; + jerry_value_t minKey = jerry_create_string((const jerry_char_t*)minStr); + jerry_value_t minValue = jerry_create_number(expectMinValue); + jerry_set_property(attrsObj_, minKey, minValue); + Component* sliderComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UISlider* sliderView = reinterpret_cast(sliderComponent->GetComponentRootView()); + jerry_release_value(minKey); + jerry_release_value(minValue); + + /** + * @tc.expected: step2. uikit sliderView minvalue == 0 + */ + if (sliderView->GetRangeMin() == expectMinValue) { + printf("%s pass\n", __FUNCTION__); + } else { + printf("%s fail\n", __FUNCTION__); + } + EXPECT_EQ(sliderView->GetRangeMin(), expectMinValue); + + /* minValue is [-32767,32767], set min value = 32768 */ + /** + * @tc.expected: step4. update min value = 32768, check sliderView.minValue != 32768 + */ + const int expectMinValue3 = 32768; + UpdateNumAttributeOrStyleValue(sliderComponent, minStr, expectMinValue3, true); + if (sliderView->GetRangeMin() != expectMinValue3) { + printf("%s update min overflow value pass\n", __FUNCTION__); + } else { + printf("%s update min overflow value fail\n", __FUNCTION__); + } + EXPECT_NE(sliderView->GetRangeMin(), expectMinValue3); + + TDD_CASE_END(); +} + +void SliderTddTest::ComponentSliderAttributeMaxTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set Slider attribute max = 0 + */ + const int expectMaxValue = 1; + const char* maxStr = "max"; + jerry_value_t maxKey = jerry_create_string((const jerry_char_t*)maxStr); + jerry_value_t maxValue = jerry_create_number(expectMaxValue); + jerry_set_property(attrsObj_, maxKey, maxValue); + Component* sliderComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UISlider* sliderView = reinterpret_cast(sliderComponent->GetComponentRootView()); + jerry_release_value(maxKey); + jerry_release_value(maxValue); + /** + * @tc.expected: step2. uikit sliderView maxvalue == 0 + */ + if (sliderView->GetRangeMax() == expectMaxValue) { + printf("%s set value pass\n", __FUNCTION__); + } else { + printf("%s set value fail\n", __FUNCTION__); + } + EXPECT_EQ(sliderView->GetRangeMax(), expectMaxValue); + + /** + * @tc.expected: step4. update max value = 32768, check sliderView.maxValue != 32768 + */ + const int expectMaxValue3 = 32768; + UpdateNumAttributeOrStyleValue(sliderComponent, maxStr, expectMaxValue3, true); + if (sliderView->GetRangeMax() != expectMaxValue3) { + printf("%s update max overflow value pass\n", __FUNCTION__); + } else { + printf("%s update max overflow value fail\n", __FUNCTION__); + } + EXPECT_NE(sliderView->GetRangeMax(), expectMaxValue3); + + TDD_CASE_END(); +} + +void SliderTddTest::ComponentSliderAttributeValueTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set Slider attribute value = 0 + */ + const int expectValue = 100; + const char* valueStr = "value"; + jerry_value_t valueKey = jerry_create_string((const jerry_char_t*)valueStr); + jerry_value_t value = jerry_create_number(expectValue); + jerry_set_property(attrsObj_, valueKey, value); + Component* sliderComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UISlider* sliderView = reinterpret_cast(sliderComponent->GetComponentRootView()); + jerry_release_value(valueKey); + jerry_release_value(value); + /** + * @tc.expected: step2. check uikit sliderView value == 0 + */ + if (sliderView->GetValue() == expectValue) { + printf("%s pass\n", __FUNCTION__); + } else { + printf("%s fail\n", __FUNCTION__); + } + EXPECT_EQ(sliderView->GetValue(), expectValue); + + /** + * @tc.expected: step3. update value = 32767, check sliderView.value == 32767 + */ + const int expectValue2 = 32767; + UpdateNumAttributeOrStyleValue(sliderComponent, valueStr, expectValue2, true); + if (sliderView->GetValue() != expectValue2) { + printf("%s update value value pass\n", __FUNCTION__); + } else { + printf("%s update value value fail\n", __FUNCTION__); + } + EXPECT_NE(sliderView->GetValue(), expectValue2); + + /** + * @tc.expected: step4. update value = 32768, check sliderView.value != 32768 + */ + const int expectValue3 = 32768; + UpdateNumAttributeOrStyleValue(sliderComponent, valueStr, expectValue3, true); + if (sliderView->GetValue() != expectValue3) { + printf("%s update value overflow value pass\n", __FUNCTION__); + } else { + printf("%s update value overflow value fail\n", __FUNCTION__); + } + EXPECT_NE(sliderView->GetValue(), expectValue3); + + TDD_CASE_END(); +} + +void SliderTddTest::ComponentSliderStyleSetColorTest004() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set text color value = 16711680 + */ + const int expectColorValue = 16711680; + const char* colorStr = "color"; + jerry_value_t textKey = jerry_create_string((const jerry_char_t*)colorStr); + jerry_value_t textColorValue = jerry_create_number(expectColorValue); + jerry_set_property(styleObj_, textKey, textColorValue); + Component* sliderComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UISlider* uiSliderView = reinterpret_cast(sliderComponent->GetComponentRootView()); + jerry_release_value(textKey); + jerry_release_value(textColorValue); + /** + * @tc.expected: step2. check uikit sliderView color = 16711680 (red color) + */ + if (uiSliderView->GetBackgroundStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue).full) { + printf("%s pass\n", __FUNCTION__); + } else { + printf("%s fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetBackgroundStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue).full); + + /** + * @tc.expected: step3. update color = expectColorValue2, check uikit sliderView color == expectColorValue2 + */ + const int32_t expectColorValue2 = 16777215; + UpdateNumAttributeOrStyleValue(sliderComponent, colorStr, expectColorValue2, false); + if (uiSliderView->GetBackgroundStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue2).full) { + printf("%s update color pass\n", __FUNCTION__); + } else { + printf("%s update color fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetBackgroundStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue2).full); + + /** + * @tc.expected: step4. update color = expectColorValue3, + * check uikit sliderView color == expectColorValue3, + */ + const int32_t expectColorValue3 = 16777216; + UpdateNumAttributeOrStyleValue(sliderComponent, colorStr, expectColorValue3, false); + if (uiSliderView->GetBackgroundStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue3).full) { + printf("%s update overflow color pass\n", __FUNCTION__); + } else { + printf("%s update overflow color fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetBackgroundStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue3).full); + + /** + * @tc.expected: step5. set exceptionColorStrValue with exception value "helloWorld", + * program keep going + */ + const char* exceptionColorStrValue = "helloWorld"; + UpdateCharAttributeOrStyleValue(sliderComponent, colorStr, exceptionColorStrValue, false); + + TDD_CASE_END(); +} + +void SliderTddTest::ComponentSliderStyleSetSelectColorTest005() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set slider selected color value = 16711680 + */ + const int expectColorValue = 16711680; + const char* selectedColorStr = "selectedColor"; + jerry_value_t selectedColorKey = jerry_create_string((const jerry_char_t*)selectedColorStr); + jerry_value_t selectedColorValue = jerry_create_number(expectColorValue); + + jerry_set_property(styleObj_, selectedColorKey, selectedColorValue); + + Component* sliderComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UISlider* uiSliderView = reinterpret_cast(sliderComponent->GetComponentRootView()); + + jerry_release_value(selectedColorKey); + jerry_release_value(selectedColorValue); + + /** + * @tc.expected: step2. check uikit sliderView select color = 16711680 (red color) + */ + if (uiSliderView->GetForegroundStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue).full) { + printf("%s pass\n", __FUNCTION__); + } else { + printf("%s fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetForegroundStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue).full); + + /** + * @tc.expected: step3. update slectedcolor = expectColorValue2, check uikit sliderView selectcolor == + * expectColorValue2 + */ + const int32_t expectColorValue2 = 16777215; + UpdateNumAttributeOrStyleValue(sliderComponent, selectedColorStr, expectColorValue2, false); + if (uiSliderView->GetForegroundStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue2).full) { + printf("%s update selectedColor pass\n", __FUNCTION__); + } else { + printf("%s update selectedColor fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetForegroundStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue2).full); + + /** + * @tc.expected: step4. update selectedcolor with overflow expectColorValue3, + * check uikit sliderView color == expectColorValue3, + */ + const int32_t expectColorValue3 = 16777216; + UpdateNumAttributeOrStyleValue(sliderComponent, selectedColorStr, expectColorValue3, false); + if (uiSliderView->GetForegroundStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue3).full) { + printf("%s update overflow selectedColor pass\n", __FUNCTION__); + } else { + printf("%s update overflow selectedColor fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetForegroundStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue3).full); + + /** + * @tc.expected: step5. set exceptionColorStrValue with exception value "helloWorld", + * program keep going + */ + const char* expectColorStrValue = "helloWorld"; + UpdateCharAttributeOrStyleValue(sliderComponent, selectedColorStr, expectColorStrValue, false); + + TDD_CASE_END(); +} + +void SliderTddTest::ComponentSliderStyleSetBlockColorTest006() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set slider blockcolor value = 16711680 + */ + const int expectColorValue = 16711680; + const char* blockColorStr = "blockColor"; + jerry_value_t blockColorKey = jerry_create_string((const jerry_char_t*)blockColorStr); + jerry_value_t blockColorValue = jerry_create_number(expectColorValue); + jerry_set_property(styleObj_, blockColorKey, blockColorValue); + Component* sliderComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UISlider* uiSliderView = reinterpret_cast(sliderComponent->GetComponentRootView()); + jerry_release_value(blockColorKey); + jerry_release_value(blockColorValue); + + /** + * @tc.expected: step2. check uikit sliderView blockcolor = 16711680 (red color) + */ + if (uiSliderView->GetKnobStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue).full) { + printf("%s pass\n", __FUNCTION__); + } else { + printf("%s fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetKnobStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue).full); + + /** + * @tc.expected: step3. update blockColor = expectColorValue2, check uikit sliderView color == expectColorValue2 + */ + const int32_t expectColorValue2 = 16777215; + UpdateNumAttributeOrStyleValue(sliderComponent, blockColorStr, expectColorValue2, false); + if (uiSliderView->GetKnobStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue2).full) { + printf("%s update blockColor pass\n", __FUNCTION__); + } else { + printf("%s update blockColor fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetKnobStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue2).full); + + /** + * @tc.expected: step4. update blockcolor whit overflow expectColorValue3, + * check uikit sliderView color == expectColorValue3, + */ + const int32_t expectColorValue3 = 16777216; + UpdateNumAttributeOrStyleValue(sliderComponent, blockColorStr, expectColorValue3, false); + if (uiSliderView->GetKnobStyle(STYLE_BACKGROUND_COLOR) == GetRGBColor(expectColorValue3).full) { + printf("%s update overflow blockColor pass\n", __FUNCTION__); + } else { + printf("%s update overflow blockColor fail\n", __FUNCTION__); + } + EXPECT_EQ(uiSliderView->GetKnobStyle(STYLE_BACKGROUND_COLOR), GetRGBColor(expectColorValue3).full); + + /** + * @tc.expected: step5. set exceptionColorStrValue with exception value "helloWorld", + * program keep going + */ + const char* expectColorStrValue = "helloWorld"; + UpdateCharAttributeOrStyleValue(sliderComponent, blockColorStr, expectColorStrValue, false); + + TDD_CASE_END(); +} + +void SliderTddTest::RunTests() +{ + ComponentSliderAttributeMinTest001(); + ComponentSliderAttributeMaxTest002(); + ComponentSliderAttributeValueTest003(); + ComponentSliderStyleSetColorTest004(); + ComponentSliderStyleSetSelectColorTest005(); + ComponentSliderStyleSetBlockColorTest006(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name:ComponentSliderAttributeMinTest001 + * @tc.desc: Verify Slider min value can set normally. + * @tc.require: AR000DSEFF + */ +HWTEST_F(SliderTddTest, SliderAttr001, TestSize.Level1) +{ + SliderTddTest::ComponentSliderAttributeMinTest001(); +} + +/** + * @tc.name:ComponentSliderAttributeMaxTest002 + * @tc.desc: Verify Slider max value can set normally. + * @tc.require: AR000DSEFF + */ +HWTEST_F(SliderTddTest, SliderAttr002, TestSize.Level1) +{ + SliderTddTest::ComponentSliderAttributeMaxTest002(); +} + +/** + * @tc.name:ComponentSliderAttributeValueTest003 + * @tc.desc: Verify Slider value value can set normally. + * @tc.require: AR000DSEFF + */ +HWTEST_F(SliderTddTest, SliderAttr003, TestSize.Level1) +{ + SliderTddTest::ComponentSliderAttributeValueTest003(); +} + +/** + * @tc.name:ComponentSliderStyleSetColorTest004 + * @tc.desc: Verify slider color value. + * @tc.require: AR000DSEFF + */ +HWTEST_F(SliderTddTest, SliderStyle004, TestSize.Level1) +{ + SliderTddTest::ComponentSliderStyleSetColorTest004(); +} + +/** + * @tc.name:ComponentSliderStyleSetSelectColorTest005 + * @tc.desc: Verify slider color value. + * @tc.require: AR000DSEFF + */ +HWTEST_F(SliderTddTest, SliderStyle005, TestSize.Level1) +{ + SliderTddTest::ComponentSliderStyleSetSelectColorTest005(); +} + +/** + * @tc.name:ComponentSliderStyleSetBlockColorTest006 + * @tc.desc: Verify slider color value. + * @tc.require: AR000DSEFF + */ +HWTEST_F(SliderTddTest, SliderStyle006, TestSize.Level1) +{ + SliderTddTest::ComponentSliderStyleSetBlockColorTest006(); +} +#endif +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/slider_tdd_test.h b/frameworks/src/core/components/test/unittest/common/slider_tdd_test.h new file mode 100755 index 0000000..96e93ac --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/slider_tdd_test.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef OHOS_ACELITE_TEST_SLIDER_H +#define OHOS_ACELITE_TEST_SLIDER_H + +#include "base_test.h" + +namespace OHOS { +namespace ACELite { +class SliderTddTest : public BaseTest { +public: + SliderTddTest(); + ~SliderTddTest() override {}; + void ComponentSliderAttributeMinTest001(); + void ComponentSliderAttributeMaxTest002(); + void ComponentSliderAttributeValueTest003(); + void ComponentSliderStyleSetColorTest004(); + void ComponentSliderStyleSetSelectColorTest005(); + void ComponentSliderStyleSetBlockColorTest006(); + void RunTests(); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_SLIDER_H diff --git a/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.cpp new file mode 100755 index 0000000..8ba1163 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.cpp @@ -0,0 +1,577 @@ +/* + * Copyright (c) 2021 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. + */ +#include "swiper_tdd_test.h" +#include "js_app_environment.h" +#include "root_view.h" +#include "stylemgr/app_style_item.h" +#include "stylemgr/app_style_manager.h" +#include "swiper_component.h" + +namespace OHOS { +namespace ACELite { +SwiperTddTest::SwiperTddTest() + : optionsObj_(UNDEFINED), + attrsObj_(UNDEFINED), + styleObj_(UNDEFINED), + eventObj_(UNDEFINED), + childrenObj_(UNDEFINED), + stack1_(nullptr), + stack2_(nullptr), + stack3_(nullptr) {} + +void SwiperTddTest::SetUp() +{ + JsAppEnvironment* appJsEnv = JsAppEnvironment::GetInstance(); + appJsEnv->InitJsFramework(); + optionsObj_ = jerry_get_global_object(); + jerry_value_t attrsKey = jerry_create_string((const jerry_char_t*)"attrs"); + attrsObj_ = jerry_create_object(); + jerry_value_t ret1 = jerry_set_property(optionsObj_, attrsKey, attrsObj_); + jerry_value_t styleKey = jerry_create_string((const jerry_char_t*)"staticStyle"); + styleObj_ = jerry_create_object(); + jerry_value_t ret2 = jerry_set_property(optionsObj_, styleKey, styleObj_); + jerry_value_t eventKey = jerry_create_string((const jerry_char_t*)"on"); + eventObj_ = jerry_create_object(); + jerry_value_t ret3 = jerry_set_property(optionsObj_, eventKey, eventObj_); + ReleaseJerryValue(attrsKey, styleKey, eventKey, ret1, ret2, ret3, VA_ARG_END_FLAG); + + const int childrenNum = 3; + childrenObj_ = jerry_create_array(childrenNum); + + jerry_value_t childOption = jerry_create_object(); + jerry_value_t type = jerry_create_string((const jerry_char_t*)"stack"); + ret1 = jerry_set_property_by_index(childOption, 0, type); + stack1_ = ComponentFactory::CreateComponent(KeyParser::ParseKeyId("div"), childOption, jerry_create_null()); + stack1_->Render(); + ret2 = jerry_set_property_by_index(childrenObj_, 0, stack1_->GetNativeElement()); + ReleaseJerryValue(childOption, ret1, ret2, VA_ARG_END_FLAG); + + childOption = jerry_create_object(); + ret1 = jerry_set_property_by_index(childOption, 1, type); + stack2_ = ComponentFactory::CreateComponent(KeyParser::ParseKeyId("div"), childOption, jerry_create_null()); + stack2_->Render(); + ret2 = jerry_set_property_by_index(childrenObj_, 1, stack2_->GetNativeElement()); + ReleaseJerryValue(childOption, ret1, ret2, VA_ARG_END_FLAG); + + childOption = jerry_create_object(); + const int pIndex = 2; + ret1 = jerry_set_property_by_index(childOption, pIndex, type); + stack3_ = ComponentFactory::CreateComponent(KeyParser::ParseKeyId("div"), childOption, jerry_create_null()); + stack3_->Render(); + ret2 = jerry_set_property_by_index(childrenObj_, pIndex, stack3_->GetNativeElement()); + ReleaseJerryValue(childOption, ret1, ret2, type, VA_ARG_END_FLAG); + rootComponentMock_.PrepareRootContainer(); +} + + +void SwiperTddTest::TearDown() +{ + ReleaseJerryValue(attrsObj_, styleObj_, eventObj_, optionsObj_, VA_ARG_END_FLAG); + JsAppContext::GetInstance()->ReleaseStyles(); + stack1_->Release(); + stack2_->Release(); + stack3_->Release(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set index 2 + */ + jerry_value_t indexKey = jerry_create_string((const jerry_char_t *)"index"); + const int val = 2; + jerry_value_t indexVal = jerry_create_number(val); + jerry_value_t ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + const int pageIndex = 2; + if (swiperView->GetCurrentPage() == pageIndex) { + printf("ComponentSwiperAttributeSetTest001 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest001 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), pageIndex); + component->Release(); + ReleaseJerryValue(indexVal, ret1, VA_ARG_END_FLAG); + + /** + * @tc.steps: step3. set index = '2'; get index = 2 + */ + indexVal = jerry_create_string((const jerry_char_t *)"2"); + ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + view = component->GetComponentRootView(); + swiperView = reinterpret_cast(view); + if (swiperView->GetCurrentPage() == pageIndex) { + printf("ComponentSwiperAttributeSetTest001 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest001 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), pageIndex); + component->Release(); + ReleaseJerryValue(indexVal, ret1, VA_ARG_END_FLAG); + + /** + * @tc.steps: step4. set index = 0; get index = 0 + */ + indexVal = jerry_create_number(0); + ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + view = component->GetComponentRootView(); + swiperView = reinterpret_cast(view); + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest001 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest001 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + ReleaseJerryValue(indexKey, indexVal, ret1, VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. dont set index value + */ + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + + /** + * @tc.steps: step3. get index = 0 + */ + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest002 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest002 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + + /** + * @tc.steps: step4. set index -1 + */ + jerry_value_t indexKey = jerry_create_string((const jerry_char_t*)"index"); + jerry_value_t indexVal = jerry_create_string((const jerry_char_t*)"abc123"); + jerry_value_t ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + view = component->GetComponentRootView(); + swiperView = reinterpret_cast(view); + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest002 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest002 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + + ReleaseJerryValue(indexKey, indexVal, ret1, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set index bool + */ + jerry_value_t indexKey = jerry_create_string((const jerry_char_t*)"index"); + jerry_value_t indexVal = jerry_create_boolean(true); + jerry_value_t ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + + /** + * @tc.steps: step3. get index = 0 + */ + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest003 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest003 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + + ReleaseJerryValue(indexVal, indexKey, ret1, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest004() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set index 3 + */ + jerry_value_t indexKey = jerry_create_string((const jerry_char_t*)"index"); + const int val = 3; + jerry_value_t indexVal = jerry_create_number(val); + jerry_value_t ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + + /** + * @tc.steps: step3. get index = 0 + */ + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest004 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest004 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + ReleaseJerryValue(indexVal, ret1, VA_ARG_END_FLAG); + + /** + * @tc.steps: step4. set index -1 + */ + indexVal = jerry_create_number(-1); + ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + view = component->GetComponentRootView(); + swiperView = reinterpret_cast(view); + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest004 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest004 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + + ReleaseJerryValue(indexKey, indexVal, ret1, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest005() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set index -32769 + */ + jerry_value_t indexKey = jerry_create_string((const jerry_char_t*)"index"); + const int val1 = -32769; + jerry_value_t indexVal = jerry_create_number(val1); + jerry_value_t ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + + /** + * @tc.steps: step3. get index = 0 + */ + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest005 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest005 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + ReleaseJerryValue(indexVal, ret1, VA_ARG_END_FLAG); + + /** + * @tc.steps: step4. set index 32768 get index 0 + */ + const int val2 = 32768; + indexVal = jerry_create_number(val2); + ret1 = jerry_set_property(attrsObj_, indexKey, indexVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + view = component->GetComponentRootView(); + swiperView = reinterpret_cast(view); + if (swiperView->GetCurrentPage() == 0) { + printf("ComponentSwiperAttributeSetTest005 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest005 fail\n"); + } + EXPECT_EQ(swiperView->GetCurrentPage(), 0); + component->Release(); + + ReleaseJerryValue(indexKey, indexVal, ret1, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest013() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. do not set vertical + */ + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + + /** + * @tc.steps: step3. get direction = 0 + */ + if (swiperView->GetDirection() == 0) { + printf("ComponentSwiperAttributeSetTest013 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest013 fail\n"); + } + EXPECT_EQ(swiperView->GetDirection(), 0); + component->Release(); + + /** + * @tc.steps: step4. set vert true get vert 1 + */ + jerry_value_t vertKey = jerry_create_string((const jerry_char_t*)"vertical"); + jerry_value_t vertVal = jerry_create_boolean(true); + jerry_value_t ret1 = jerry_set_property(attrsObj_, vertKey, vertVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + view = component->GetComponentRootView(); + swiperView = reinterpret_cast(view); + if (swiperView->GetDirection() == 1) { + printf("ComponentSwiperAttributeSetTest013 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest013 fail\n"); + } + EXPECT_EQ(swiperView->GetDirection(), 1); + component->Release(); + ReleaseJerryValue(vertVal, ret1, VA_ARG_END_FLAG); + + /** + * @tc.steps: step5. set vert true get vert 0 + */ + vertVal = jerry_create_boolean(false); + ret1 = jerry_set_property(attrsObj_, vertKey, vertVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + view = component->GetComponentRootView(); + swiperView = reinterpret_cast(view); + if (swiperView->GetDirection() == 0) { + printf("ComponentSwiperAttributeSetTest013 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest013 fail\n"); + } + EXPECT_EQ(swiperView->GetDirection(), 0); + component->Release(); + + ReleaseJerryValue(vertKey, vertVal, ret1, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest014() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. do not set vertical + */ + jerry_value_t vertKey = jerry_create_string((const jerry_char_t*)"vertical"); + const int val = 100; + jerry_value_t vertVal = jerry_create_number(val); + jerry_value_t ret1 = jerry_set_property(attrsObj_, vertKey, vertVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + + /** + * @tc.steps: step3. get direction = 0 + */ + if (swiperView->GetDirection() == 0) { + printf("ComponentSwiperAttributeSetTest014 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest014 fail\n"); + } + EXPECT_EQ(swiperView->GetDirection(), 0); + component->Release(); + + ReleaseJerryValue(vertKey, vertVal, ret1, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwiperTddTest::ComponentSwiperAttributeSetTest019() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set id,visibility. + */ + jerry_value_t idKey = jerry_create_string((const jerry_char_t*)"id"); + jerry_value_t idVal = jerry_create_string((const jerry_char_t*)"swiper"); + jerry_value_t ret1 = jerry_set_property(attrsObj_, idKey, idVal); + jerry_value_t visibilityKey = jerry_create_string((const jerry_char_t*)"show"); + jerry_value_t visibilityVal = jerry_create_boolean(false); + jerry_value_t ret2 = jerry_set_property(attrsObj_, visibilityKey, visibilityVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + rootComponentMock_.RenderComponent(*component); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UISwipeView* swiperView = reinterpret_cast(view); + + /** + * @tc.steps: step3. get attribute value + */ + if (!strcmp(swiperView->GetViewId(), "swiper") && swiperView->IsVisible() == false) { + printf("ComponentSwiperAttributeSetTest019 pass\n"); + } else { + printf("ComponentSwiperAttributeSetTest019 fail\n"); + } + EXPECT_TRUE((!strcmp(swiperView->GetViewId(), "swiper")) && (swiperView->IsVisible() == false)); + component->Release(); + + ReleaseJerryValue(idKey, idVal, ret1, visibilityKey, visibilityVal, ret2, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwiperTddTest::RunTests() +{ + ComponentSwiperAttributeSetTest001(); + ComponentSwiperAttributeSetTest002(); + ComponentSwiperAttributeSetTest003(); + ComponentSwiperAttributeSetTest004(); + ComponentSwiperAttributeSetTest005(); + ComponentSwiperAttributeSetTest013(); + ComponentSwiperAttributeSetTest014(); + ComponentSwiperAttributeSetTest019(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: ComponentSwiperAttributeSetTest001 + * @tc.desc: Verify attribute index set normal value. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr001, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest001(); +} + +/** + * @tc.name: ComponentSwiperAttributeSetTest002 + * @tc.desc: Verify attribute index set wrong string value. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr002, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest002(); +} + +/** + * @tc.name: ComponentSwiperAttributeSetTest003 + * @tc.desc: Verify attribute index set bool value. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr003, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest003(); +} + +/** + * @tc.name: ComponentSwiperAttributeSetTest004 + * @tc.desc: Verify attribute index out of size. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr004, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest004(); +} + +/** + * @tc.name: ComponentSwiperAttributeSetTest005 + * @tc.desc: Verify attribute index out of int16. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr005, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest005(); +} + +/** + * @tc.name: ComponentSwiperAttributeSetTest013 + * @tc.desc: Verify attribute vertical set correct. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr013, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest013(); +} + +/** + * @tc.name: ComponentSwiperAttributeSetTest014 + * @tc.desc: Verify attribute vertical input wrong type. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr014, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest014(); +} + +/** + * @tc.name: ComponentSwiperAttributeSetTest019 + * @tc.desc: Verify attribute id,visibility. + * @tc.require: AR000DSEFG + */ +HWTEST_F(SwiperTddTest, SwiperAttr019, TestSize.Level1) +{ + SwiperTddTest::ComponentSwiperAttributeSetTest019(); +} +#endif +} // ACELite +} // OHOS \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h b/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h new file mode 100755 index 0000000..d055d00 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef ACELITE_SWIPER_TDD_TEST_H +#define ACELITE_SWIPER_TDD_TEST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "acelite_config.h" +#include "component_factory.h" +#include "root_component_mock.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class SwiperTddTest : public testing::Test { +#else +class SwiperTddTest { +#endif +public: + SwiperTddTest(); + ~SwiperTddTest(){}; + void SetUp(); + void TearDown(); + void ComponentSwiperAttributeSetTest001(); + void ComponentSwiperAttributeSetTest002(); + void ComponentSwiperAttributeSetTest003(); + void ComponentSwiperAttributeSetTest004(); + void ComponentSwiperAttributeSetTest005(); + void ComponentSwiperAttributeSetTest013(); + void ComponentSwiperAttributeSetTest014(); + void ComponentSwiperAttributeSetTest019(); + void RunTests(); + jerry_value_t optionsObj_; + jerry_value_t attrsObj_; + jerry_value_t styleObj_; + jerry_value_t eventObj_; + jerry_value_t childrenObj_; + Component* stack1_; + Component* stack2_; + Component* stack3_; + uint16_t componentKeyId_ = KeyParser::ParseKeyId("swiper"); + +private: + RootComponentMock rootComponentMock_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // ACELITE_SWIPER_TDD_TEST_H \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/switch_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/switch_tdd_test.cpp new file mode 100755 index 0000000..620e0df --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/switch_tdd_test.cpp @@ -0,0 +1,235 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "switch_tdd_test.h" +#include "js_app_environment.h" +#include "root_view.h" +#include "switch_component.h" + +namespace OHOS { +namespace ACELite { +SwitchTddTest::SwitchTddTest() + : optionsObj_(0), + attrsObj_(0), + styleObj_(0), + eventObj_(0), + childrenObj_(0), + componentKeyId_(KeyParser::ParseKeyId("switch")) +{ +} + +void SwitchTddTest::SetUp() +{ + JsAppEnvironment* appJsEnv = JsAppEnvironment::GetInstance(); + appJsEnv->InitJsFramework(); + + optionsObj_ = jerry_get_global_object(); + + jerry_value_t attrsKey = jerry_create_string((const jerry_char_t*)"attrs"); + attrsObj_ = jerry_create_object(); + jerry_value_t ret1 = jerry_set_property(optionsObj_, attrsKey, attrsObj_); + + jerry_value_t styleKey = jerry_create_string((const jerry_char_t*)"staticStyle"); + styleObj_ = jerry_create_object(); + jerry_value_t ret2 = jerry_set_property(optionsObj_, styleKey, styleObj_); + + jerry_value_t eventKey = jerry_create_string((const jerry_char_t*)"on"); + eventObj_ = jerry_create_object(); + jerry_value_t ret3 = jerry_set_property(optionsObj_, eventKey, eventObj_); + + ReleaseJerryValue(attrsKey, ret1, styleKey, ret2, eventKey, ret3, VA_ARG_END_FLAG); +} + +void SwitchTddTest::TearDown() +{ + ReleaseJerryValue(attrsObj_, styleObj_, eventObj_, optionsObj_, VA_ARG_END_FLAG); + JsAppContext::GetInstance()->ReleaseStyles(); +} + +void SwitchTddTest::ComponentSwitchAttributeSetTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. do not set checked + */ + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + component->Render(); + + /** + * @tc.steps: step2. get native switch object;get checked false + */ + UIView* view = component->GetComponentRootView(); + UIToggleButton* toggleButton = reinterpret_cast(view); + if (toggleButton->GetState() == false) { + printf("ComponentSwitchAttributeSetTest001 pass\n"); + } else { + printf("ComponentSwitchAttributeSetTest001 fail\n"); + } + EXPECT_FALSE(toggleButton->GetState()); + component->Release(); + + /** + * @tc.steps: step3. set checked = true; get checked = true + */ + jerry_value_t checkedKey = jerry_create_string((const jerry_char_t*)("checked")); + jerry_value_t checkedVal = jerry_create_boolean(true); + jerry_value_t ret1 = jerry_set_property(attrsObj_, checkedKey, checkedVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + component->Render(); + view = component->GetComponentRootView(); + toggleButton = reinterpret_cast(view); + if (toggleButton->GetState() == true) { + printf("ComponentSwitchAttributeSetTest001 pass\n"); + } else { + printf("ComponentSwitchAttributeSetTest001 fail\n"); + } + EXPECT_TRUE(toggleButton->GetState()); + component->Release(); + jerry_release_value(checkedVal); + + /** + * @tc.steps: step4. set checkedVal false; get checkedVal false + */ + checkedVal = jerry_create_boolean(false); + jerry_value_t ret2 = jerry_set_property(attrsObj_, checkedKey, checkedVal); + component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + component->Render(); + view = component->GetComponentRootView(); + toggleButton = reinterpret_cast(view); + if (toggleButton->GetState() == false) { + printf("ComponentSwitchAttributeSetTest001 pass\n"); + } else { + printf("ComponentSwitchAttributeSetTest001 fail\n"); + } + EXPECT_FALSE(toggleButton->GetState()); + component->Release(); + + ReleaseJerryValue(checkedKey, checkedVal, ret1, ret2, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwitchTddTest::ComponentSwitchAttributeSetTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set checked true + */ + jerry_value_t checkedKey = jerry_create_string((const jerry_char_t*)("checked")); + jerry_value_t checkedVal = jerry_create_string((const jerry_char_t*)("abc123")); + jerry_value_t ret1 = jerry_set_property(attrsObj_, checkedKey, checkedVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + component->Render(); + + /** + * @tc.steps: step2. get native switch object + */ + UIView* view = component->GetComponentRootView(); + UIToggleButton* toggleButton = reinterpret_cast(view); + + /** + * @tc.steps: step3. get checked val + */ + if (toggleButton->GetState() == true) { + printf("ComponentSwitchAttributeSetTest002 pass\n"); + } else { + printf("ComponentSwitchAttributeSetTest002 fail\n"); + } + EXPECT_TRUE(toggleButton->GetState()); + component->Release(); + + ReleaseJerryValue(checkedKey, checkedVal, ret1, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwitchTddTest::ComponentSwitchAttributeSetTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set id "switch", show = true + */ + jerry_value_t idKey = jerry_create_string((const jerry_char_t*)("id")); + jerry_value_t idVal = jerry_create_string((const jerry_char_t*)("switch")); + jerry_value_t ret1 = jerry_set_property(attrsObj_, idKey, idVal); + jerry_value_t showKey = jerry_create_string((const jerry_char_t*)("show")); + jerry_value_t showVal = jerry_create_boolean(false); + jerry_value_t ret2 = jerry_set_property(attrsObj_, showKey, showVal); + Component* component = ComponentFactory::CreateComponent(componentKeyId_, optionsObj_, childrenObj_); + component->Render(); + + /** + * @tc.steps: step2. get native swiper object + */ + UIView* view = component->GetComponentRootView(); + UIToggleButton* toggleButton = reinterpret_cast(view); + + /** + * @tc.steps: step3. get id, show + */ + if (!strcmp(toggleButton->GetViewId(), "switch") && toggleButton->IsVisible() == false) { + printf("ComponentSwitchAttributeSetTest003 pass\n"); + } else { + printf("ComponentSwitchAttributeSetTest003 fail\n"); + } + EXPECT_TRUE((!strcmp(toggleButton->GetViewId(), "switch")) && (toggleButton->IsVisible() == false)); + + component->Release(); + + ReleaseJerryValue(idKey, idVal, showKey, showVal, ret1, ret2, VA_ARG_END_FLAG); + + TDD_CASE_END(); +} + +void SwitchTddTest::RunTests() +{ + ComponentSwitchAttributeSetTest001(); + ComponentSwitchAttributeSetTest002(); + ComponentSwitchAttributeSetTest003(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: ComponentSwitchAttributeSetTest001 + * @tc.desc: Verify attribute checked set normal value. + * @tc.require: AR000DSEFI + */ +HWTEST_F(SwitchTddTest, SwitchAttr001, TestSize.Level1) +{ + SwitchTddTest::ComponentSwitchAttributeSetTest001(); +} + +/** + * @tc.name: ComponentSwitchAttributeSetTest002 + * @tc.desc: Verify attribute checked set abc123. + * @tc.require: AR000DSEFI + */ +HWTEST_F(SwitchTddTest, SwitchAttr002, TestSize.Level1) +{ + SwitchTddTest::ComponentSwitchAttributeSetTest002(); +} + +/** + * @tc.name: ComponentSwitchAttributeSetTest003 + * @tc.desc: Verify attribute id, show. + * @tc.require: AR000DSEFI + */ +HWTEST_F(SwitchTddTest, SwitchAttr003, TestSize.Level1) +{ + SwitchTddTest::ComponentSwitchAttributeSetTest003(); +} +#endif // TDD_ASSERTIONS +} // ACELite +} // OHOS \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h b/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h new file mode 100755 index 0000000..5a65577 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef ACELITE_SWITCH_TDD_TEST_H +#define ACELITE_SWITCH_TDD_TEST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "acelite_config.h" +#include "component_factory.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class SwitchTddTest : public testing::Test { +#else +class SwitchTddTest { +#endif +public: + SwitchTddTest(); + ~SwitchTddTest(){}; + void SetUp(); + void TearDown(); + void ComponentSwitchAttributeSetTest001(); + void ComponentSwitchAttributeSetTest002(); + void ComponentSwitchAttributeSetTest003(); + void RunTests(); + + jerry_value_t optionsObj_; + jerry_value_t attrsObj_; + jerry_value_t styleObj_; + jerry_value_t eventObj_; + jerry_value_t childrenObj_; + uint16_t componentKeyId_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // ACELITE_SWITCH_TDD_TEST_H \ No newline at end of file diff --git a/frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.cpp b/frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.cpp new file mode 100755 index 0000000..6140641 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.cpp @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "text_tdd_exception_test.h" +#include "acelite_config.h" +#include "component_factory.h" +#include "js_app_environment.h" +#include "root_view.h" +#include "text_component.h" +#include "ui_label.h" + +namespace OHOS { +namespace ACELite { +TextTddExceptionTest::TextTddExceptionTest():BaseTest() +{ + componentNameId_ = KeyParser::ParseKeyId("text"); +} +void TextTddExceptionTest::ComponentTextStyleSetExceptionTest007() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set exception color value = "helloworld" + */ + const char* expectColorStrValue = "helloWorld"; + const char* colorStr = "color"; + jerry_value_t textKey = jerry_create_string((const jerry_char_t*)colorStr); + jerry_value_t textColorValue = jerry_create_string((const jerry_char_t*)expectColorStrValue); + jerry_set_property(styleObj_, textKey, textColorValue); + /** + * @tc.expected: step2. console print exception info + */ + Component* textComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + jerry_release_value(textKey); + jerry_release_value(textColorValue); + + /** + * @tc.expected: step3. update textOverflow with exception value "exception" + * console print exception info + */ + const char* textOverflow = "textOverflow"; + const char* expectOverflowException = "exception"; + UpdateCharAttributeOrStyleValue(textComponent, textOverflow, expectOverflowException, false); + + /** + * @tc.expected: step4. update letterSpacing with exception value "helloWorld" + * console print exception info + */ + const char* letterSpacingStr = "letterSpacing"; + const char* expectletterSpacingStrValue = "helloWorld"; + UpdateCharAttributeOrStyleValue(textComponent, letterSpacingStr, expectletterSpacingStrValue, false); + + /** + * @tc.expected: step5. update textAlign with exception value "exception" + * console print exception info + */ + const char* textAlign = "textAlign"; + const char* expectALignException = "exception"; + UpdateCharAttributeOrStyleValue(textComponent, textAlign, expectALignException, false); + + TDD_CASE_END(); +} + +void TextTddExceptionTest::RunTests() +{ + ComponentTextStyleSetExceptionTest007(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name:Component_Text_StyleSet_Color_Test_002 + * @tc.desc: Verify text color/textOverFlow/textAlign/letterSpace exception value. + * @tc.require: AR000DSEFN + */ +HWTEST_F(TextTddExceptionTest, textStyle007, TestSize.Level1) +{ + TextTddExceptionTest::ComponentTextStyleSetExceptionTest007(); +} +#endif +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.h b/frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.h new file mode 100755 index 0000000..cdecc04 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/text_tdd_exception_test.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef OHOS_ACELITE_TEST_TEXT_EXCEPTION_H +#define OHOS_ACELITE_TEST_TEXT_EXCEPTION_H + +#include "base_test.h" + +namespace OHOS { +namespace ACELite { +class TextTddExceptionTest : public BaseTest { +public: + TextTddExceptionTest(); + ~TextTddExceptionTest() override {}; + void ComponentTextStyleSetExceptionTest007(); + void RunTests(); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_TEXT_EXCEPTION_H diff --git a/frameworks/src/core/components/test/unittest/common/text_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/text_tdd_test.cpp new file mode 100755 index 0000000..8569f66 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/text_tdd_test.cpp @@ -0,0 +1,446 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "text_tdd_test.h" +#include "acelite_config.h" +#include "component_factory.h" +#include "js_app_environment.h" +#include "root_view.h" +#include "text_component.h" +#include "ui_label.h" + +namespace OHOS { +namespace ACELite { +TextTddTest::TextTddTest():BaseTest() +{ + componentNameId_ = KeyParser::ParseKeyId("text"); +} + +void TextTddTest::ComponentTextAttributeSetValueTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set text attribute value = "hello world" + */ + const char* expectTextValue = "hello world"; + const char* valueStr = "value"; + jerry_value_t textKey = jerry_create_string((const jerry_char_t*)valueStr); + jerry_value_t textValue = jerry_create_string((const jerry_char_t*)expectTextValue); + jerry_set_property(attrsObj_, textKey, textValue); + Component* textComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel* uilabelView = reinterpret_cast(textComponent->GetComponentRootView()); + jerry_release_value(textKey); + jerry_release_value(textValue); + + /** + * @tc.expected: step2. value == expectTextValue + */ + if (uilabelView->GetText() != nullptr && !strcmp(uilabelView->GetText(), expectTextValue)) { + printf("%s pass\n", __FUNCTION__); + } else { + printf("%s fail\n", __FUNCTION__); + } + EXPECT_STREQ(uilabelView->GetText(), expectTextValue); + + /** + * @tc.expected: step3. update value, check value == expectTextValue2 + */ + const char* expectTextValue2 = "1234567890"; + UpdateCharAttributeOrStyleValue(textComponent, "value", expectTextValue2, true); + if ((uilabelView->GetText() != nullptr) && !strcmp(uilabelView->GetText(), expectTextValue2)) { + printf("%s update test value pass\n", __FUNCTION__); + } else { + printf("%s update test value fail\n", __FUNCTION__); + } + EXPECT_STREQ(uilabelView->GetText(), expectTextValue2); + + /** + * @tc.expected: step4. update value witch excpetion expectTextIntValue , check value != expectTextIntValue + */ + int expectTextIntValue = 100; + UpdateNumAttributeOrStyleValue(textComponent, "value", expectTextIntValue, true); + if ((uilabelView->GetText() != nullptr) && !strcmp(uilabelView->GetText(), "100")) { + printf("%s update test value 100 pass\n", __FUNCTION__); + } else { + printf("%s update test value 100 fail\n", __FUNCTION__); + } + EXPECT_TRUE(uilabelView->GetText() != nullptr); + EXPECT_STREQ(uilabelView->GetText(), "100"); + + TDD_CASE_END(); +} + +void TextTddTest::ComponentTextStyleSetColorTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set text color value = 16777215 + */ + int expectColorValue = 16711680; + const char* colorStr = "color"; + jerry_value_t textKey = jerry_create_string((const jerry_char_t*)colorStr); + jerry_value_t textColorValue = jerry_create_number(expectColorValue); + + jerry_set_property(styleObj_, textKey, textColorValue); + + Component* textComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel* uilabelView = reinterpret_cast(textComponent->GetComponentRootView()); + + jerry_release_value(textKey); + jerry_release_value(textColorValue); + + /** + * @tc.expected: step2. check text color == 16711680 (red color) + */ + if (uilabelView->GetStyle(STYLE_TEXT_COLOR) == GetRGBColor(expectColorValue).full) { + printf("%s pass\n", __FUNCTION__); + } else { + printf("%s fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetStyle(STYLE_TEXT_COLOR), GetRGBColor(expectColorValue).full); + + /** + * @tc.expected: step3. update text color with normal expectColorValue2,check text color == expectColorValue2 + */ + int32_t expectColorValue2 = 16777215; + UpdateNumAttributeOrStyleValue(textComponent, colorStr, expectColorValue2, false); + if (uilabelView->GetStyle(STYLE_TEXT_COLOR) == GetRGBColor(expectColorValue2).full) { + printf("%s update color pass\n", __FUNCTION__); + } else { + printf("%s update color fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetStyle(STYLE_TEXT_COLOR), GetRGBColor(expectColorValue2).full); + + /** + * @tc.expected: step4. update text color with overflow expectColorValue3,check text color == expectColorValue3 + */ + int32_t expectColorValue3 = 16777216; + UpdateNumAttributeOrStyleValue(textComponent, colorStr, expectColorValue3, false); + if (uilabelView->GetStyle(STYLE_TEXT_COLOR) == GetRGBColor(expectColorValue3).full) { + printf("%s update overflow color pass\n", __FUNCTION__); + } else { + printf("%s update overflow color fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetStyle(STYLE_TEXT_COLOR), GetRGBColor(expectColorValue3).full); + + TDD_CASE_END(); +} + +void TextTddTest::ComponentTextStyleSetOverflowTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set text overflow = clip + */ + const char* expectOverflowClip = "clip"; + const char* textOverflow = "textOverflow"; + const char* height = "height"; + const char* width = "width"; + int textHeight = 0; + int textWidth = 0; + JerrySetNumberProperty(styleObj_, height, textHeight); + JerrySetNumberProperty(styleObj_, width, textWidth); + JerrySetStringProperty(styleObj_, textOverflow, expectOverflowClip); + Component* textComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel* uilabelView = reinterpret_cast(textComponent->GetComponentRootView()); + /** + * @tc.expected: step2. check uikit uilabelView == UILabel::LINE_BREAK_CLIP + */ + if (uilabelView->GetLineBreakMode() == UILabel::LINE_BREAK_CLIP) { + printf("%s set OverFlow clip pass\n", __FUNCTION__); + } else { + printf("%s set OverFlow clip fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetLineBreakMode(), UILabel::LINE_BREAK_CLIP); + + /** + * @tc.expected: step3. update text Overflow = "ellipsis" + * check uikit uilabelView == UILabel::LINE_BREAK_ELLIPSIS + */ + const char* expectOverflowEllipsis = "ellipsis"; + UpdateCharAttributeOrStyleValue(textComponent, textOverflow, expectOverflowEllipsis, false); + if (uilabelView->GetLineBreakMode() == UILabel::LINE_BREAK_ELLIPSIS) { + printf("%s update OverFlow ellipsis pass\n", __FUNCTION__); + } else { + printf("%s update OverFlow ellipsis fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetLineBreakMode(), UILabel::LINE_BREAK_ELLIPSIS); + + /** + * @tc.expected: step4. update text Overflow = "break" + * check uikit uilabelView == UILabel::LINE_BREAK_WRAP + */ + const char* expectOverflowBreak = "break"; + UpdateCharAttributeOrStyleValue(textComponent, textOverflow, expectOverflowBreak, false); + if (uilabelView->GetLineBreakMode() == UILabel::LINE_BREAK_WRAP) { + printf("%s update OverFlow break pass\n", __FUNCTION__); + } else { + printf("%s update OverFlow break fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetLineBreakMode(), UILabel::LINE_BREAK_WRAP); + + /** + * @tc.expected: step5. update text Overflow = "expand" + * check uikit uilabelView == UILabel::LINE_BREAK_ADAPT + */ + const char* expectOverflowExpand = "expand"; + UpdateCharAttributeOrStyleValue(textComponent, textOverflow, expectOverflowExpand, false); + if (uilabelView->GetLineBreakMode() == UILabel::LINE_BREAK_ADAPT) { + printf("%s update OverFlow expand pass\n", __FUNCTION__); + } else { + printf("%s update OverFlow expand fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetLineBreakMode(), UILabel::LINE_BREAK_ADAPT); + + TDD_CASE_END(); +} + +void TextTddTest::ComponentTextStyleSetLetterSpacingTest004() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set text letterSpacing value = 10 + */ + int expectLetterSpacingValue = 10; + const char* letterSpacingStr = "letterSpacing"; + jerry_value_t textKey = jerry_create_string((const jerry_char_t*)letterSpacingStr); + jerry_value_t textLetterSpacingValue = jerry_create_number(expectLetterSpacingValue); + jerry_set_property(styleObj_, textKey, textLetterSpacingValue); + Component* textComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel* uilabelView = reinterpret_cast(textComponent->GetComponentRootView()); + + /** + * @tc.expected: step2. check uikit uilabel letterSpace == expectLetterSpacingValue + */ + if (uilabelView->GetStyle(STYLE_LETTER_SPACE) == expectLetterSpacingValue) { + printf("%s update letterSpace pass\n", __FUNCTION__); + } else { + printf("%s update letterSpace fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetStyle(STYLE_LETTER_SPACE), expectLetterSpacingValue); + jerry_release_value(textKey); + jerry_release_value(textLetterSpacingValue); + + /** + * @tc.expected: step3. update letterSpace, check uikit uilabel letterSpace == expectLetterSpacingValue2 + */ + int32_t expectLetterSpacingValue2 = 255; + UpdateNumAttributeOrStyleValue(textComponent, letterSpacingStr, expectLetterSpacingValue2, false); + if (uilabelView->GetStyle(STYLE_LETTER_SPACE) == expectLetterSpacingValue2) { + printf("%s update normal letterSpace pass\n", __FUNCTION__); + } else { + printf("%s update normal letterSpace fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetStyle(STYLE_LETTER_SPACE), expectLetterSpacingValue2); + + /** + * @tc.expected: step4. update letterSpace with exception value, + * check uikit uilabel letterSpace != expectLetterSpacingValue3 + */ + int32_t expectLetterSpacingValue3 = 32768; + UpdateNumAttributeOrStyleValue(textComponent, letterSpacingStr, expectLetterSpacingValue3, false); + if (uilabelView->GetStyle(STYLE_LETTER_SPACE) != expectLetterSpacingValue3) { + printf("%s update overflow letterSpace pass\n", __FUNCTION__); + } else { + printf("%s update overflow letterSpace fail\n", __FUNCTION__); + } + EXPECT_NE(uilabelView->GetStyle(STYLE_LETTER_SPACE), expectLetterSpacingValue3); + + TDD_CASE_END(); +} + +void TextTddTest::ComponentTextStyleSetAlignTest005() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set text Align = "left" + */ + const char* expectLeftAlign = "left"; + const char* textAlign = "textAlign"; + jerry_value_t textKey = jerry_create_string((const jerry_char_t*)textAlign); + jerry_value_t textAlignValue = jerry_create_string((const jerry_char_t*)expectLeftAlign); + jerry_set_property(styleObj_, textKey, textAlignValue); + Component* textComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel* uilabelView = reinterpret_cast(textComponent->GetComponentRootView()); + jerry_release_value(textKey); + jerry_release_value(textAlignValue); + /** + * @tc.expected: step2. jsfwk render, check text align == UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT + */ + if (uilabelView->GetHorAlign() == UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT) { + printf("%s update text ALign left pass\n", __FUNCTION__); + } else { + printf("%s update text ALign left fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetHorAlign(), UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT); + + /** + * @tc.expected: step2. update align = right, check text align == UITextLanguageAlignment::TEXT_ALIGNMENT_RIGHT + */ + const char* expectRightAlign = "right"; + UpdateCharAttributeOrStyleValue(textComponent, textAlign, expectRightAlign, false); + if (uilabelView->GetHorAlign() == UITextLanguageAlignment::TEXT_ALIGNMENT_RIGHT) { + printf("%s update text ALign right pass\n", __FUNCTION__); + } else { + printf("%s update text ALign right fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetHorAlign(), UITextLanguageAlignment::TEXT_ALIGNMENT_RIGHT); + + /** + * @tc.expected: step3. update align = center, check text align == UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER + */ + const char* expectCenterAlign = "center"; + UpdateCharAttributeOrStyleValue(textComponent, textAlign, expectCenterAlign, false); + if (uilabelView->GetHorAlign() == UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER) { + printf("%s update text ALign center pass\n", __FUNCTION__); + } else { + printf("%s update text ALign center fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetHorAlign(), UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); + + TDD_CASE_END(); +} + +void TextTddTest::ComponentTextStyleSetSizeFamilyTest006() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. set text fontSize = 30, fontFamily = HYQiHei-65S + */ + const char *textSize = "fontSize"; + int expectSize = 30; + jerry_value_t textSizetKey = jerry_create_string((const jerry_char_t *)textSize); + jerry_value_t textSizeValue = jerry_create_number(expectSize); + jerry_set_property(styleObj_, textSizetKey, textSizeValue); + const char *textFamily = "fontFamily"; + const char *expectFamily = "HYQiHei-65S"; + jerry_value_t textFamilyKey = jerry_create_string((const jerry_char_t *)textFamily); + jerry_value_t textFamilyValue = jerry_create_string((const jerry_char_t *)expectFamily); + const char *expectTextValue = "hello world"; + const char *valueTag = "value"; + JerrySetStringProperty(attrsObj_, valueTag, expectTextValue); + Component *textComponent = reinterpret_cast(GetRenderedComponent(componentNameId_)); + UILabel *uilabelView = reinterpret_cast(textComponent->GetComponentRootView()); + jerry_release_value(textSizetKey); + jerry_release_value(textSizeValue); + jerry_release_value(textFamilyKey); + jerry_release_value(textFamilyValue); + + /** + * @tc.expected: step2. check text fontid == UITextLanguageFontId::F_HYQIHEI_65S_30_4 + */ + UIFont *font = UIFont::GetInstance(); + if (uilabelView->GetFontId() == font->GetFontId(expectFamily, expectSize)) { + printf("%s set text size&family pass\n", __FUNCTION__); + } else { + printf("%s set text size&family fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetFontId(), font->GetFontId(expectFamily, expectSize)); + + /** + * @tc.expected: step3. update fontSize =38, check text fontid == UITextLanguageFontId::F_HYQIHEI_65S_38_4 + */ + int expectVidaLargerSize = 38; + UpdateNumAttributeOrStyleValue(textComponent, textSize, expectVidaLargerSize, false); + const char *expectVidaLargerFamily = "HYQiHei-65S"; + UpdateCharAttributeOrStyleValue(textComponent, textFamily, expectVidaLargerFamily, false); + if (uilabelView->GetFontId() == font->GetFontId(expectVidaLargerFamily, expectVidaLargerSize)) { + printf("%s update text size&family pass\n", __FUNCTION__); + } else { + printf("%s update text size&family fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetFontId(), font->GetFontId(expectVidaLargerFamily, expectVidaLargerSize)); + + /** + * @tc.expected: step4. update fontFamily with exception value "helloWorld", + * check text fontid == UITextLanguageFontId::F_HYQIHEI_65S_38_4 + */ + /* set last available fontid instead of exceptionFamily */ + const char *expectExceptionFamily = "helloWorld"; + UpdateCharAttributeOrStyleValue(textComponent, textFamily, expectExceptionFamily, false); + + if (uilabelView->GetFontId() == font->GetFontId(expectVidaLargerFamily, expectVidaLargerSize)) { + printf("%s update text exception size&family pass\n", __FUNCTION__); + } else { + printf("%s update text exception size&family fail\n", __FUNCTION__); + } + EXPECT_EQ(uilabelView->GetFontId(), font->GetFontId(expectVidaLargerFamily, expectVidaLargerSize)); + + TDD_CASE_END(); +} + +void TextTddTest::RunTests() +{ + ComponentTextAttributeSetValueTest001(); + ComponentTextStyleSetColorTest002(); + ComponentTextStyleSetOverflowTest003(); + ComponentTextStyleSetLetterSpacingTest004(); + ComponentTextStyleSetAlignTest005(); + ComponentTextStyleSetSizeFamilyTest006(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name:ComponentTextAttributeSetValueTest001 + * @tc.desc: Verify text value can set normally. + * @tc.require: AR000DSEFN + */ +HWTEST_F(TextTddTest, textAttr001, TestSize.Level1) +{ + TextTddTest::ComponentTextAttributeSetValueTest001(); +} + +/** + * @tc.name:ComponentTextStyleSetColorTest002 + * @tc.desc: Verify text color value. + * @tc.require: AR000DSEFN + */ +HWTEST_F(TextTddTest, textStyle002, TestSize.Level1) +{ + TextTddTest::ComponentTextStyleSetColorTest002(); +} + +/** + * @tc.name:ComponentTextStyleSetOverflowTest003 + * @tc.desc: Verify text color value. + * @tc.require: AR000DSEFN + */ +HWTEST_F(TextTddTest, textStyle003, TestSize.Level1) +{ + TextTddTest::ComponentTextStyleSetOverflowTest003(); +} + +/** + * @tc.name:ComponentTextStyleSetLetterSpacingTest004 + * @tc.desc: Verify text letterSpacing value. + * @tc.require: AR000DSEFN + */ +HWTEST_F(TextTddTest, textStyle004, TestSize.Level1) +{ + TextTddTest::ComponentTextStyleSetLetterSpacingTest004(); +} + +/** + * @tc.name:ComponentTextStyleSetAlignTest005 + * @tc.desc: Verify text color value. + * @tc.require: AR000DSEFN + */ +HWTEST_F(TextTddTest, textStyle005, TestSize.Level1) +{ + TextTddTest::ComponentTextStyleSetAlignTest005(); +} +#endif +} // namespace ACELite +} // namespace OHOS diff --git a/frameworks/src/core/components/test/unittest/common/text_tdd_test.h b/frameworks/src/core/components/test/unittest/common/text_tdd_test.h new file mode 100755 index 0000000..a45e454 --- /dev/null +++ b/frameworks/src/core/components/test/unittest/common/text_tdd_test.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef OHOS_ACELITE_TEST_TEXT_H +#define OHOS_ACELITE_TEST_TEXT_H + +#include "base_test.h" + +namespace OHOS { +namespace ACELite { +class TextTddTest : public BaseTest { +public: + TextTddTest(); + ~TextTddTest() override {}; + void ComponentTextAttributeSetValueTest001(); + void ComponentTextStyleSetColorTest002(); + void ComponentTextStyleSetOverflowTest003(); + void ComponentTextStyleSetLetterSpacingTest004(); + void ComponentTextStyleSetAlignTest005(); + void ComponentTextStyleSetSizeFamilyTest006(); + void RunTests(); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_TEST_TEXT_H diff --git a/src/core/components/text_component.cpp b/frameworks/src/core/components/text_component.cpp old mode 100755 new mode 100644 similarity index 82% rename from src/core/components/text_component.cpp rename to frameworks/src/core/components/text_component.cpp index a9eba47..2ce5473 --- a/src/core/components/text_component.cpp +++ b/frameworks/src/core/components/text_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -20,6 +20,7 @@ #include "font/ui_font_header.h" #include "key_parser.h" #include "keys.h" +#include "product_adapter.h" using namespace OHOS; @@ -27,45 +28,36 @@ namespace OHOS { namespace ACELite { TextComponent::TextComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) : Component(options, children, styleManager), - uiLabel_(nullptr), fontSize_(DEFAULT_FONT_SIZE), fontFamily_(nullptr), textValue_(nullptr), overflowMode_(UILabel::LINE_BREAK_CLIP) { SetComponentName(K_TEXT); + fontSize_ = ProductAdapter::GetDefaultFontSize(); } bool TextComponent::CreateNativeViews() { - uiLabel_ = new UILabel(); - if (uiLabel_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create native label failed"); - return false; - } /* set default text OverFlow clip */ - uiLabel_->SetLineBreakMode(overflowMode_); - return CopyFontFamily(fontFamily_, DEFAULT_FONT_FAMILY); + uiLabel_.SetLineBreakMode(overflowMode_); + return CopyFontFamily(fontFamily_, ProductAdapter::GetDefaultFontFamilyName()); } void TextComponent::ReleaseNativeViews() { - if (uiLabel_) { - delete uiLabel_; - uiLabel_ = nullptr; - } ACE_FREE(textValue_); ACE_FREE(fontFamily_); } inline UIView *TextComponent::GetComponentRootView() const { - return uiLabel_; + return const_cast(&uiLabel_); } UILabel *TextComponent::GetUILabelView() const { - return uiLabel_; + return const_cast(&uiLabel_); } bool TextComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) @@ -78,7 +70,7 @@ bool TextComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrVa } case K_SCROLLAMOUNT: { int16_t speed = IntegerOf(attrValue); - uiLabel_->SetRollSpeed(speed); + uiLabel_.SetRollSpeed(speed); break; } default: { @@ -93,13 +85,13 @@ bool TextComponent::ApplyPrivateStyle(const AppStyleItem *styleItem) { switch (GetStylePropNameId(styleItem)) { case K_COLOR: - SetTextColor(*uiLabel_, styleItem); + SetTextColor(uiLabel_, styleItem); break; case K_LETTER_SPACING: - SetTextLetterSpace(*uiLabel_, styleItem); + SetTextLetterSpace(uiLabel_, styleItem); break; case K_TEXT_ALIGN: - SetTextAlign(*uiLabel_, styleItem); + SetTextAlign(uiLabel_, styleItem); break; case K_FONT_SIZE: SetTextSize(styleItem); @@ -112,10 +104,10 @@ bool TextComponent::ApplyPrivateStyle(const AppStyleItem *styleItem) CopyFontFamily(fontFamily_, GetStyleStrValue(styleItem)); break; case K_TEXT_OVERFLOW: - SetTextOverflow(*uiLabel_, styleItem); + SetTextOverflow(uiLabel_, styleItem); break; case K_LINE_HEIGHT: - SetTextLineHeight(*uiLabel_, styleItem); + SetTextLineHeight(uiLabel_, styleItem); break; default: return false; @@ -178,47 +170,47 @@ void TextComponent::SetTextSize(const AppStyleItem *styleItem) fontSize_ = GetStylePixelValue(styleItem); } -void TextComponent::PostRender() +void TextComponent::OnViewAttached() { if (GetHeight() < 0 && GetWidth() < 0) { /* component height & width adjust text context when not set text height & text width */ - uiLabel_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + uiLabel_.SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); } else if (GetHeight() < 0 && GetWidth() >= 0) { /* component height adjust text context when set width not set text height */ - uiLabel_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + uiLabel_.SetLineBreakMode(UILabel::LINE_BREAK_WRAP); } else if (GetHeight() >= 0 && GetWidth() < 0) { /* component width adjust text context when not set text width */ - uiLabel_->SetLineBreakMode(UILabel::LINE_BREAK_STRETCH); + uiLabel_.SetLineBreakMode(UILabel::LINE_BREAK_STRETCH); } if (textValue_ != nullptr && fontFamily_ != nullptr) { - uiLabel_->SetFont(fontFamily_, fontSize_); - uiLabel_->SetText(textValue_); + uiLabel_.SetFont(fontFamily_, fontSize_); + uiLabel_.SetText(textValue_); } } -/* watchcallback update text context*/ -void TextComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) +/* watchcallback update text context */ +void TextComponent::PostUpdate(uint16_t attrKeyId) { - if ((uiLabel_ == nullptr) || !updateResult || !KeyParser::IsKeyValid(attrKeyId)) { + if (!KeyParser::IsKeyValid(attrKeyId)) { HILOG_ERROR(HILOG_MODULE_ACE, "text component post update check args failed"); return; } switch (attrKeyId) { case K_VALUE: if (textValue_ != nullptr) { - uiLabel_->SetText(textValue_); + uiLabel_.SetText(textValue_); } break; case K_FONT_SIZE: case K_FONT_FAMILY: if (fontFamily_ != nullptr) { - uiLabel_->SetFont(fontFamily_, fontSize_); + uiLabel_.SetFont(fontFamily_, fontSize_); } break; default: break; } - UIView *parent = uiLabel_->GetParent(); + UIView *parent = uiLabel_.GetParent(); if (parent != nullptr) { parent->LayoutChildren(true); } diff --git a/src/core/components/text_component.h b/frameworks/src/core/components/text_component.h old mode 100755 new mode 100644 similarity index 93% rename from src/core/components/text_component.h rename to frameworks/src/core/components/text_component.h index 31d6d3c..fc9a39f --- a/src/core/components/text_component.h +++ b/frameworks/src/core/components/text_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -38,8 +38,8 @@ protected: bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; bool ApplyPrivateStyle(const AppStyleItem* styleItem) override; UILabel* GetUILabelView() const; - void PostRender() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; + void OnViewAttached() override; + void PostUpdate(uint16_t attrKeyId) override; private: // parse js text align style to ui_label @@ -54,7 +54,7 @@ private: void SetTextLetterSpace(UILabel& label, const AppStyleItem* styleItem) const; // parse js text line height style to ui_label void SetTextLineHeight(UILabel& label, const AppStyleItem* styleItem) const; - UILabel* uiLabel_; + UILabel uiLabel_; uint8_t fontSize_; char* fontFamily_; char* textValue_; diff --git a/src/core/components/video_component.cpp b/frameworks/src/core/components/video_component.cpp old mode 100755 new mode 100644 similarity index 94% rename from src/core/components/video_component.cpp rename to frameworks/src/core/components/video_component.cpp index 5661001..4c7d9ac --- a/src/core/components/video_component.cpp +++ b/frameworks/src/core/components/video_component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -82,6 +82,7 @@ void VideoComponent::UpdatePlayImageInfo(bool playFlag) } videoPlayImageClickListener_->setVideoPlayImageClickStatus(playFlag); } + JSValue VideoComponent::Start(const jerry_value_t func, const jerry_value_t context, const jerry_value_t args[], @@ -193,8 +194,7 @@ bool VideoComponent::CreateNativeViews() return false; } AddComponentNode(this); - PrepareProgressUpdatingThread(); - return true; + return PrepareProgressUpdatingThread(); } void VideoComponent::ReleaseNativeViews() @@ -203,9 +203,9 @@ void VideoComponent::ReleaseNativeViews() SetComponentReleasingFlag(true); // wait until the updating thread destroyed pthread_cond_signal(&updateCondition_); + const uint16_t waitThreadDestroyTime = 20000; while (!isUpdatingHandlerQuited_) { - const uint16_t waitThreadDestoryTime = 20000; - usleep(waitThreadDestoryTime); + usleep(waitThreadDestroyTime); } ACE_DELETE(videoView_); ACE_DELETE(videoSliderListener_); @@ -213,6 +213,7 @@ void VideoComponent::ReleaseNativeViews() ACE_FREE(videoSourceUrl_); SetComponentReleasingFlag(false); } + UIView *VideoComponent::GetComponentRootView() const { return videoView_; @@ -265,7 +266,7 @@ bool VideoComponent::RegisterVideoEventListener() return true; } -bool VideoComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) +bool VideoComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) { if (videoEventListener_ == nullptr || videoView_ == nullptr || videoSliderListener_ == nullptr) { return false; @@ -418,7 +419,7 @@ bool VideoComponent::SetPanelView() return true; } -void VideoComponent::PostRender() +void VideoComponent::OnViewAttached() { if (videoView_ == nullptr) { return; @@ -438,15 +439,15 @@ void VideoComponent::PostRender() } } -void VideoComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) +void VideoComponent::PostUpdate(uint16_t attrKeyId) { - if ((videoView_ == nullptr) || !updateResult) { + if (videoView_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "video component post update check args failed"); return; } videoView_->WaitRebuildPlayerFinish(); videoView_->SetVideoView(); - if (SetPanelView() == false) { + if (!SetPanelView()) { HILOG_ERROR(HILOG_MODULE_ACE, "PostUpdate set panel view failed"); return; } @@ -457,18 +458,18 @@ void VideoComponent::SetComponentReleasingFlag(bool releasing) } #ifdef FEATURE_UPDATE_VIDEO_PROGRESS_ASYNC -void VideoComponent::PrepareProgressUpdatingThread() +bool VideoComponent::PrepareProgressUpdatingThread() { int ret = pthread_mutex_init(&updateLock_, nullptr); if (ret != 0) { HILOG_ERROR(HILOG_MODULE_ACE, "mutex init failed, %{public}d", ret); - return; + return false; } ret = pthread_cond_init(&updateCondition_, nullptr); if (ret != 0) { HILOG_ERROR(HILOG_MODULE_ACE, "condition init failed, %{public}d", ret); (void)pthread_mutex_destroy(&updateLock_); - return; + return false; } pthread_t tid; pthread_attr_t attr; @@ -479,8 +480,9 @@ void VideoComponent::PrepareProgressUpdatingThread() HILOG_ERROR(HILOG_MODULE_ACE, "create video progress updating thread error, %{public}d", ret); (void)pthread_mutex_destroy(&updateLock_); (void)pthread_cond_destroy(&updateCondition_); - return; + return false; } + return true; } void VideoComponent::UpdateProgress() @@ -579,7 +581,7 @@ void VideoComponent::OnPlayStateChanged(VideoPlayState newState) } } -/* seperated thread to trigger all update progress request */ +/* separated thread to trigger all update progress request */ void *VideoComponent::UpdateProgressHandler(void *arg) { prctl(PR_SET_NAME, "UpdateProgressHandler"); diff --git a/src/core/components/video_component.h b/frameworks/src/core/components/video_component.h similarity index 94% rename from src/core/components/video_component.h rename to frameworks/src/core/components/video_component.h index 4ff3bc8..3c50a31 100755 --- a/src/core/components/video_component.h +++ b/frameworks/src/core/components/video_component.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -140,7 +140,7 @@ public: ReleaseJerryValue(playSeekingFunc_, VA_ARG_END_FLAG); } - void OnChange(int16_t progress) override + void OnChange(int32_t progress) override { if (video_ == nullptr) { return; @@ -160,7 +160,7 @@ public: video_->CallJSFunctionWithOnePara(playSeekingFunc_, progress); } - bool OnClick(UIView& view, const ClickEvent& event) override + bool OnClick(UIView &view, const ClickEvent& event) override { if (SetPlayPositionInfo(progressValue_)) { HILOG_DEBUG(HILOG_MODULE_ACE, "slider onClick video to %{public}d", progressValue_); @@ -168,14 +168,14 @@ public: } return false; } - void OnRelease(int16_t progress) override + void OnRelease(int32_t progress) override { if (SetPlayPositionInfo(progress)) { HILOG_DEBUG(HILOG_MODULE_ACE, "slider release video to %{public}d", progress); } } - bool SetPlayPositionInfo(int16_t progressValue) + bool SetPlayPositionInfo(int32_t progressValue) { if (video_ == nullptr) { return false; @@ -200,7 +200,7 @@ public: private: VideoView* video_; jerry_value_t playSeekingFunc_; - int16_t progressValue_; + int32_t progressValue_; }; class VideoEventListener final: public OHOS::Media::PlayerCallback { @@ -322,9 +322,9 @@ protected: UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; bool ApplyPrivateStyle(const AppStyleItem* style) override; - void PostRender() override; - void PostUpdate(uint16_t attrKeyId, bool updateResult) override; - bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) override; + void OnViewAttached() override; + void PostUpdate(uint16_t attrKeyId) override; + bool RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue, bool isStopPropagation) override; static List componentNodes_; @@ -337,7 +337,7 @@ private: void SetVideoControls(jerry_value_t attrValue); void RegisterNativeFunctions(); bool RegisterVideoEventListener(); - void PrepareProgressUpdatingThread(); + bool PrepareProgressUpdatingThread(); void UpdatePlayImageInfo(bool playFlag); void UpdateProgress(); void SetVideoPlayingFlag(bool playing); diff --git a/src/core/components/video_state_callback.h b/frameworks/src/core/components/video_state_callback.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/components/video_state_callback.h rename to frameworks/src/core/components/video_state_callback.h diff --git a/src/core/components/video_view.cpp b/frameworks/src/core/components/video_view.cpp similarity index 93% rename from src/core/components/video_view.cpp rename to frameworks/src/core/components/video_view.cpp index a10bcd3..c0e80ba 100755 --- a/src/core/components/video_view.cpp +++ b/frameworks/src/core/components/video_view.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -42,7 +42,8 @@ bool VideoView::CreateVideoView() videoPlayer_ = new Media::Player(); surfaceView_ = new UISurfaceView(); panelView_ = new PanelView(); - if (videoPlayer_ == nullptr || surfaceView_ == nullptr || panelView_ == nullptr || !(panelView_->InitView())) { + if ((videoPlayer_ == nullptr) || (surfaceView_ == nullptr) || + (panelView_ == nullptr) || !(panelView_->InitView())) { return false; } Add(surfaceView_); @@ -81,7 +82,7 @@ void VideoView::PanelRefreshLayout() VideoView::~VideoView() { - if (!DestoryPlayer()) { + if (!DestroyPlayer()) { HILOG_ERROR(HILOG_MODULE_ACE, "videoView destroy player failed"); } ACE_DELETE(panelView_); @@ -118,6 +119,7 @@ int32_t VideoView::Prepare() } return -1; } + int32_t VideoView::Play() { if ((videoPlayer_ != nullptr) && (videoPlayer_->Play() == 0)) { @@ -131,6 +133,7 @@ int32_t VideoView::Play() } return -1; } + int32_t VideoView::Pause() { if ((videoPlayer_ != nullptr) && (videoPlayer_->Pause() == 0)) { @@ -144,6 +147,7 @@ int32_t VideoView::Pause() } return -1; } + int32_t VideoView::Stop() { if ((videoPlayer_ != nullptr) && (videoPlayer_->Stop() == 0)) { @@ -170,6 +174,7 @@ bool VideoView::WaitRebuildPlayerFinish() } return true; } + void VideoView::PrepareRebuildPlayerThread() { pthread_t threadId; @@ -185,7 +190,7 @@ void VideoView::PrepareRebuildPlayerThread() void *VideoView::RebuildPlayerHandler(void *arg) { - VideoView *videoView = (VideoView *)arg; + VideoView *videoView = static_cast(arg); HILOG_DEBUG(HILOG_MODULE_ACE, "rebuild player handler"); prctl(PR_SET_NAME, "VideoPlayerRebuildHandler"); if (!videoView->ResetPlayer()) { @@ -197,7 +202,7 @@ void *VideoView::RebuildPlayerHandler(void *arg) bool VideoView::ResetPlayer() { (void)pthread_mutex_lock(&rebuildPlayerlock_); - if (!DestoryPlayer()) { + if (!DestroyPlayer()) { HILOG_ERROR(HILOG_MODULE_ACE, "videoView destroy player failed"); } if (!CreatePlayer()) { @@ -212,19 +217,19 @@ bool VideoView::ResetPlayer() return true; } -bool VideoView::DestoryPlayer() +bool VideoView::DestroyPlayer() { if (videoPlayer_ == nullptr) { return false; } if (videoPlayer_->IsPlaying() && videoPlayer_->Stop() != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "DestoryPlayer fail to stop videoplayer"); + HILOG_ERROR(HILOG_MODULE_ACE, "DestroyPlayer fail to stop videoplayer"); } if (videoPlayer_->Reset() != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "DestoryPlayer fail to reset videoplayer"); + HILOG_ERROR(HILOG_MODULE_ACE, "DestroyPlayer fail to reset videoplayer"); } if (videoPlayer_->Release() != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "DestoryPlayer fail to release videoplayer"); + HILOG_ERROR(HILOG_MODULE_ACE, "DestroyPlayer fail to release videoplayer"); } delete videoPlayer_; videoPlayer_ = nullptr; @@ -389,11 +394,11 @@ void VideoView::SetVideoPanel() void VideoView::UpdatePanelProgress() { - // update current play postion time + // update current play position time UpdatePanelTimeText(true); } -void VideoView::SetCurrentPlayTimeText(int16_t inSeconds) +void VideoView::SetCurrentPlayTimeText(int32_t inSeconds) { if (panelView_ == nullptr || inSeconds <= 0 || inSeconds >= (PanelView::MAX_HOURS * PanelView::SECONDS_PER_HOUR)) { HILOG_ERROR(HILOG_MODULE_ACE, "input duration inSeconds time exception"); @@ -520,8 +525,7 @@ void VideoView::CallJSFunctionWithOnePara(const jerry_value_t &callBackFunc, con jerry_value_t value = jerry_create_number(inputValue); jerry_value_t args[1]; args[0] = jerry_create_object(); - const char attrName[] = "currenttime"; - jerry_value_t result = jerryx_set_property_str(args[0], attrName, value); + jerry_value_t result = jerryx_set_property_str(args[0], "currenttime", value); if (!jerry_value_is_error(result)) { CallJSFunctionAutoRelease(callBackFunc, jerry_create_undefined(), args, 1); } diff --git a/src/core/components/video_view.h b/frameworks/src/core/components/video_view.h similarity index 93% rename from src/core/components/video_view.h rename to frameworks/src/core/components/video_view.h index 3b25b41..05acd78 100755 --- a/src/core/components/video_view.h +++ b/frameworks/src/core/components/video_view.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -31,7 +31,6 @@ #include "ui_label.h" #include "ui_slider.h" #include "ui_surface_view.h" -#include "ui_text_language.h" #include "ui_view.h" #include "ui_view_group.h" #include "video_state_callback.h" @@ -171,13 +170,13 @@ public: void FormatTime(uint32_t inSeconds, char* outBuffer, uint8_t bufferLength); void UpdatePanelTimeText(bool currentTime = true); - void SetCurrentPlayTimeText(int16_t progress); + void SetCurrentPlayTimeText(int32_t progress); void CallJSFunctionWithOnePara(const jerry_value_t &callBackFunc, const int64_t inputValue); private: void SetVideoPanel(); void SetSurfaceView(); bool ResetPlayer(); - bool DestoryPlayer(); + bool DestroyPlayer(); bool CreatePlayer(); static void *RebuildPlayerHandler(void *arg); static pthread_mutex_t rebuildPlayerlock_; diff --git a/src/core/context/ace_ability.cpp b/frameworks/src/core/context/ace_ability.cpp similarity index 90% rename from src/core/context/ace_ability.cpp rename to frameworks/src/core/context/ace_ability.cpp index 3e82981..ea15e67 100755 --- a/src/core/context/ace_ability.cpp +++ b/frameworks/src/core/context/ace_ability.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ #include "ace_ability.h" - +#include #include "ability_env.h" #include "ace_log.h" #include "ace_mem_base.h" @@ -37,7 +37,14 @@ void AceAbility::OnStart(const Want &want) HILOG_DEBUG(HILOG_MODULE_ACE, "ace ability src path = %s", abilitySrcPath); HILOG_DEBUG(HILOG_MODULE_ACE, "ace ability bundle name = %s", bundleName); - char* jsBundlePath = RelocateJSSourceFilePath(abilitySrcPath, "assets/js/default/"); + char fullRootPath[PATH_MAX + 1] = {0}; + if (realpath(abilitySrcPath, fullRootPath) == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "invalid ability path!"); + return; + } + const char *fullRootPathStr = fullRootPath; + + char* jsBundlePath = RelocateJSSourceFilePath(fullRootPathStr, "assets/js/default/"); HILOG_DEBUG(HILOG_MODULE_ACE, "ace ability js bundle path = %s", jsBundlePath); const uint16_t token = 0xff; // js ability's token is hidden by AMS jsAbility_.Launch(jsBundlePath, bundleName, (uint16_t)token); diff --git a/src/core/context/ace_ability.h b/frameworks/src/core/context/ace_ability.h similarity index 100% rename from src/core/context/ace_ability.h rename to frameworks/src/core/context/ace_ability.h diff --git a/src/core/context/ace_event_error_code.cpp b/frameworks/src/core/context/ace_event_error_code.cpp old mode 100755 new mode 100644 similarity index 66% rename from src/core/context/ace_event_error_code.cpp rename to frameworks/src/core/context/ace_event_error_code.cpp index 0e4c12a..851179a --- a/src/core/context/ace_event_error_code.cpp +++ b/frameworks/src/core/context/ace_event_error_code.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,6 +15,7 @@ #include "ace_event_error_code.h" +#include "product_adapter.h" #ifdef FEATURE_ACELITE_MC_EVENT_ERROR_CODE_PRINT namespace OHOS { namespace ACELite { @@ -24,19 +25,19 @@ EventErrorCodePrint *EventErrorCodePrint::GetInstance() return &printInstance; } -void EventErrorCodePrint::AceEventPrint(MC_U8 info2, MC_U8 info3) +void EventErrorCodePrint::AceEventPrint(uint8_t info2, uint8_t info3) { - EventPrintf(MT_ACE, MT_ACE_FWK, info2, info3); + ProductAdapter::PrintEventTrace(0, info2, info3); } -void EventErrorCodePrint::AceEventPrint(MC_U8 info1, MC_U8 info2, MC_U8 info3) +void EventErrorCodePrint::AceEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) { - EventPrintf(MT_ACE, info1, info2, info3); + ProductAdapter::PrintEventTrace(info1, info2, info3); } -void EventErrorCodePrint::AceErrorCodePrint(MC_U8 info2, MC_U16 rfu) +void EventErrorCodePrint::AceErrorCodePrint(uint8_t info2, uint16_t rfu) { - ErrorCodePrintf(EXCE_ACE, EXCE_ACE_FWK, info2, rfu); + ProductAdapter::PrintErrCode(info2, rfu); } } // namespace ACELite } // namespace OHOS diff --git a/src/core/context/ace_event_error_code.h b/frameworks/src/core/context/ace_event_error_code.h old mode 100755 new mode 100644 similarity index 86% rename from src/core/context/ace_event_error_code.h rename to frameworks/src/core/context/ace_event_error_code.h index 95e90a2..24c1093 --- a/src/core/context/ace_event_error_code.h +++ b/frameworks/src/core/context/ace_event_error_code.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -19,9 +19,10 @@ #include "acelite_config.h" #if defined(FEATURE_ACELITE_MC_EVENT_ERROR_CODE_PRINT) -#include "mc_hal_log.h" +#include "ace_event_id.h" #include "memory_heap.h" #include "non_copyable.h" +#include #define ACE_EVENT_PRINT(info2, info3) \ EventErrorCodePrint::GetInstance()->AceEventPrint(info2, info3) #define ACE_FEATURE_EVENT_PRINT(info1, info2, info3) \ @@ -47,11 +48,11 @@ public: static EventErrorCodePrint *GetInstance(); - void AceEventPrint(MC_U8 info2, MC_U8 info3); + void AceEventPrint(uint8_t info2, uint8_t info3); - void AceEventPrint(MC_U8 info1, MC_U8 info2, MC_U8 info3); + void AceEventPrint(uint8_t info1, uint8_t info2, uint8_t info3); - void AceErrorCodePrint(MC_U8 info2, MC_U16 rfu); + void AceErrorCodePrint(uint8_t info2, uint16_t rfu); }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/context/fatal_handler.cpp b/frameworks/src/core/context/fatal_handler.cpp old mode 100755 new mode 100644 similarity index 87% rename from src/core/context/fatal_handler.cpp rename to frameworks/src/core/context/fatal_handler.cpp index ec23c38..3091d06 --- a/src/core/context/fatal_handler.cpp +++ b/frameworks/src/core/context/fatal_handler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -23,6 +23,7 @@ #include "js_fwk_common.h" #include "presets/console_log_impl.h" #include "presets/feature_ability_module.h" +#include "product_adapter.h" #include "root_view.h" #include "task_manager.h" #include "ui_label.h" @@ -38,10 +39,6 @@ FatalHandler &FatalHandler::GetInstance() return instance; } -#ifdef OHOS_ACELITE_PRODUCT_WATCH -extern "C" int ForceStopAbility(); -extern "C" void RenderEnd(); -#endif // OHOS_ACELITE_PRODUCT_WATCH static void HandleFatal(int errorCode) { #ifdef FEATURE_FATAL_ERROR_HANDLING @@ -54,12 +51,14 @@ static void HandleFatal(int errorCode) FatalHandler::GetInstance().SetFatalError(errorCode); // send message to AMS to tear down us #ifdef OHOS_ACELITE_PRODUCT_WATCH + // try to recycling resource first + FatalHandler::GetInstance().HandleFatalInternal(); // inform AMS we are facing fatal error - (void)ForceStopAbility(); + ProductAdapter::SendTerminatingRequest(0, true); // sleep to stuck engien to make ANR for triggering force-stop const uint32_t sleepTime = 3000; - uint8_t maxRetryCount = 5; - while (!(FatalHandler::GetInstance().IsFatalErrorHandleDone()) && (maxRetryCount > 0)) { + uint8_t maxRetryCount = 20; + while (maxRetryCount > 0) { osDelay(sleepTime); maxRetryCount--; } @@ -73,10 +72,13 @@ static void HandleFatal(int errorCode) #endif // FEATURE_FATAL_ERROR_HANDLING } -void FatalHandler::RegisterFatalHandler() const +void FatalHandler::RegisterFatalHandler(JSAbility *ability) { + jsAbility_ = ability; +#ifndef JERRY_PORTING_DEPENDENCY // set callback into jerry jerry_port_default_set_fatal_handler(HandleFatal); +#endif // JERRY_PORTING_DEPENDENCY } bool FatalHandler::IsErrorSupported(int errorCode) const @@ -106,6 +108,23 @@ bool FatalHandler::IsErrorSupported(int errorCode) const return false; } +void FatalHandler::HandleFatalInternal() +{ + // detach the root component from root view + RootView *rootView = RootView::GetInstance(); + if ((rootView != nullptr) && (pageRootView_ != nullptr)) { + rootView->Remove(pageRootView_); + } + // do the recycling + HandleFatalError(FatalHandler::ERR_INVALID); + // transfer ability to destroy + if (jsAbility_ != nullptr) { + jsAbility_->TransferToDestroy(); + } + // reset locals + CleanUpFatalResource(); +} + void FatalHandler::HandleFatalError(int errorCode) { if (errorCode == ERR_INVALID && fatalErrorCode_ == ERR_INVALID) { @@ -139,13 +158,13 @@ void FatalHandler::ResetRendering() { if (IsTEHandling()) { // release the render flag as we are going into sleep and will be force killed -#ifdef OHOS_ACELITE_PRODUCT_WATCH +#ifdef RENDER_MUTEX_CONTROL_ENABLE TaskManager::GetInstance()->ResetTaskHandlerMutex(); #endif SetTEHandlingFlag(false); } #ifdef OHOS_ACELITE_PRODUCT_WATCH - RenderEnd(); + ProductAdapter::NotifyRenderEnd(); #endif } @@ -227,6 +246,7 @@ void FatalHandler::CleanUpFatalResource() // reset error code when exitting the whole application fatalErrorCode_ = ERR_INVALID; isExiting_ = false; + pageRootView_ = nullptr; } bool FatalHandler::IsJSRuntimeFatal() const @@ -234,14 +254,11 @@ bool FatalHandler::IsJSRuntimeFatal() const bool result = false; switch (fatalErrorCode_) { case ERR_OUT_OF_MEMORY: // JS heap overflow - result = true; - break; + // fall through case ERR_REF_COUNT_LIMIT: - result = true; - break; + // fall through case ERR_DISABLED_BYTE_CODE: - result = true; - break; + // fall through case ERR_FAILED_INTERNAL_ASSERTION: result = true; break; @@ -321,5 +338,10 @@ bool FatalHandler::IsAppExiting() const { return isExiting_; } + +void FatalHandler::SetCurrentPageRootView(UIView *pageRoot) +{ + pageRootView_ = pageRoot; +} } // namespace ACELite } // namespace OHOS diff --git a/src/core/context/fatal_handler.h b/frameworks/src/core/context/fatal_handler.h old mode 100755 new mode 100644 similarity index 83% rename from src/core/context/fatal_handler.h rename to frameworks/src/core/context/fatal_handler.h index 93fa377..93d3e07 --- a/src/core/context/fatal_handler.h +++ b/frameworks/src/core/context/fatal_handler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -17,8 +17,10 @@ #define OHOS_ACELITE_FATAL_HANDLER_H #include "component.h" +#include "js_ability.h" #include "list.h" #include "non_copyable.h" +#include "ui_view.h" namespace OHOS { namespace ACELite { @@ -27,9 +29,10 @@ public: ACE_DISALLOW_COPY_AND_MOVE(FatalHandler); static FatalHandler& GetInstance(); const char* GetErrorStr(int errorCode) const; - void RegisterFatalHandler() const; + void RegisterFatalHandler(JSAbility *ability); void SetFatalError(int errorCode); void HandleFatalError(int errorCode); + void HandleFatalInternal(); void CleanUpFatalResource(); bool IsJSRuntimeFatal() const; bool IsJSHeapOverflow() const; @@ -43,6 +46,8 @@ public: void ResetRendering(); void SetExitingFlag(bool flag); bool IsAppExiting() const; + // when the page is attached or destroyed by state machine, the fatal handler will be got notified + void SetCurrentPageRootView(UIView *pageRoot); // define all fatal error below, please note the jerry fatal defines, avoid conflicts static const int ERR_INVALID = 0; static const int ERR_NATIVE_OUT_OF_MEMORY = 200; @@ -53,7 +58,9 @@ public: private: FatalHandler() - : componentNodes_(), + : jsAbility_(nullptr), + pageRootView_(nullptr), + componentNodes_(), fatalErrorCode_(0), isRecycling_(false), isFatalHandled_(false), @@ -62,6 +69,8 @@ private: ~FatalHandler() {} bool IsErrorSupported(int errorCode) const; void RecycleComponents(); + JSAbility *jsAbility_; + UIView *pageRootView_; List componentNodes_; int fatalErrorCode_; bool isRecycling_; diff --git a/src/core/context/js_ability.cpp b/frameworks/src/core/context/js_ability.cpp old mode 100755 new mode 100644 similarity index 69% rename from src/core/context/js_ability.cpp rename to frameworks/src/core/context/js_ability.cpp index 6f09c25..f541a1c --- a/src/core/context/js_ability.cpp +++ b/frameworks/src/core/context/js_ability.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -19,20 +19,20 @@ #include "ace_event_error_code.h" #include "ace_log.h" #include "acelite_config.h" +#include "async_task_manager.h" #ifdef OHOS_ACELITE_PRODUCT_WATCH #include "dft_impl.h" +#include "js_async_work.h" #endif // OHOS_ACELITE_PRODUCT_WATCH #include "fatal_handler.h" #include "js_ability_impl.h" #include "js_profiler.h" -#ifdef FEATURE_ACELITE_PRODUCT_MEMORY_POOL -#include "mem_pool.h" -#endif +#include "product_adapter.h" namespace OHOS { namespace ACELite { /** - * This is a helper function to cast void* to JSAbilityImpl*, for header seperating purpose. + * This is a helper function to cast void* to JSAbilityImpl*, for header separating purpose. */ static JSAbilityImpl *CastAbilityImpl(void *abilityImpl) { @@ -45,14 +45,15 @@ static JSAbilityImpl *CastAbilityImpl(void *abilityImpl) static void DumpNativeMemoryUsage() { -#ifdef FEATURE_ACELITE_PRODUCT_MEMORY_POOL - MemPool::MemInfo memInfo; - MemPool::GetInstance()->GetMemInfo(&memInfo); - HILOG_DEBUG(HILOG_MODULE_ACE, "avaliable free size: %d", memInfo.freeSize); -#endif // FEATURE_ACELITE_PRODUCT_MEMORY_POOL +#ifdef OHOS_ACELITE_PRODUCT_WATCH + NativeMemInfo memInfo; + ProductAdapter::GetNativeMemInfo(&memInfo); + HILOG_DEBUG(HILOG_MODULE_ACE, "available free size: %d", memInfo.freeSize); +#endif // OHOS_ACELITE_PRODUCT_WATCH } -void JSAbility::Launch(const char * const abilityPath, const char * const bundleName, uint16_t token) +void JSAbility::Launch(const char * const abilityPath, const char * const bundleName, uint16_t token, + const char *pageInfo) { if (jsAbilityImpl_ != nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "Launch only can be triggered once"); @@ -80,9 +81,9 @@ void JSAbility::Launch(const char * const abilityPath, const char * const bundle } START_TRACING(LAUNCH); JSAbilityImpl *jsAbilityImpl = CastAbilityImpl(jsAbilityImpl_); - FatalHandler::GetInstance().RegisterFatalHandler(); jsAbilityImpl->InitEnvironment(abilityPath, bundleName, token); - jsAbilityImpl->DeliverCreate(); + FatalHandler::GetInstance().RegisterFatalHandler(this); + jsAbilityImpl->DeliverCreate(pageInfo); STOP_TRACING(); OUTPUT_TRACE(); } @@ -96,6 +97,8 @@ void JSAbility::Show() const JSAbilityImpl *jsAbilityImpl = CastAbilityImpl(jsAbilityImpl_); jsAbilityImpl->Show(); + AsyncTaskManager::GetInstance().SetFront(true); + ProductAdapter::UpdateShowingState(true); } void JSAbility::Hide() const @@ -107,6 +110,7 @@ void JSAbility::Hide() const JSAbilityImpl *jsAbilityImpl = CastAbilityImpl(jsAbilityImpl_); jsAbilityImpl->Hide(); + AsyncTaskManager::GetInstance().SetFront(false); } void JSAbility::TransferToDestroy() @@ -122,9 +126,11 @@ void JSAbility::TransferToDestroy() jsAbilityImpl_ = nullptr; // Reset render flag or low layer task mutex in case we are during the rendering process, // this situation might happen if the destroy function is called outside of JS thread, such as AMS. + ProductAdapter::UpdateShowingState(false); FatalHandler::GetInstance().ResetRendering(); FatalHandler::GetInstance().SetExitingFlag(false); #ifdef OHOS_ACELITE_PRODUCT_WATCH + JsAsyncWork::SetAppQueueHandler(nullptr); DftImpl::GetInstance()->RegisterPageReplaced(nullptr); #endif // OHOS_ACELITE_PRODUCT_WATCH DumpNativeMemoryUsage(); @@ -146,35 +152,50 @@ const char *JSAbility::GetPackageName() return JsAppContext::GetInstance()->GetCurrentBundleName(); } +// this public interface will be deprecated, only fatal scenario can trigger force destroy void JSAbility::ForceDestroy() { -#ifdef OHOS_ACELITE_PRODUCT_WATCH - FatalHandler::GetInstance().HandleFatalError(FatalHandler::ERR_INVALID); - TransferToDestroy(); - FatalHandler::GetInstance().CleanUpFatalResource(); -#endif // OHOS_ACELITE_PRODUCT_WATCH + HILOG_ERROR(HILOG_MODULE_ACE, "ForceDestroy interface is deprecated as JS engine can not run on other task"); } -#ifdef OHOS_ACELITE_PRODUCT_WATCH -static RenderTickHandler g_renderTick = nullptr; -#endif // OHOS_ACELITE_PRODUCT_WATCH -void JSAbility::RegisterTEHandler(RenderTickHandler handler) +LazyLoadManager *GetLazyLoadManager() { -#ifdef OHOS_ACELITE_PRODUCT_WATCH - if (g_renderTick != nullptr) { - // the TE handler registering only can be performed once after whole system booting up + JsAppContext *context = JsAppContext::GetInstance(); + return const_cast(context->GetLazyLoadManager()); +} + +LazyLoadState GetLazyLoadManagerState() +{ + LazyLoadManager *lazyLoadManager = GetLazyLoadManager(); + return lazyLoadManager->GetState(); +} + +void JSAbility::LazyLoadHandleRenderTick(void *data) +{ + UNUSED(data); + // double check, if state reseted, break + LazyLoadState state = GetLazyLoadManagerState(); + if (state == LazyLoadState::INIT || state == LazyLoadState::DONE) { return; } - g_renderTick = handler; -#endif // OHOS_ACELITE_PRODUCT_WATCH + + GetLazyLoadManager()->RenderLazyLoadWatcher(); } void JSAbility::HandleRenderTick() { +#if defined(TARGET_SIMULATOR) && defined(FEATURE_LAZY_LOADING_MODULE) + LazyLoadHandleRenderTick(nullptr); +#endif + #ifdef OHOS_ACELITE_PRODUCT_WATCH - if ((g_renderTick != nullptr) && !(FatalHandler::GetInstance().IsAppExiting())) { + if ((ProductAdapter::IsTEHandlersRegisted()) && !(FatalHandler::GetInstance().IsAppExiting())) { FatalHandler::GetInstance().SetTEHandlingFlag(true); - g_renderTick(); + ProductAdapter::ProcessOneTE(); + // check if state is ready + if (GetLazyLoadManagerState() == LazyLoadState::READY) { + JsAsyncWork::DispatchAsyncWork(LazyLoadHandleRenderTick, nullptr); + } FatalHandler::GetInstance().SetTEHandlingFlag(false); } #endif // OHOS_ACELITE_PRODUCT_WATCH diff --git a/src/core/context/js_ability_impl.cpp b/frameworks/src/core/context/js_ability_impl.cpp old mode 100755 new mode 100644 similarity index 93% rename from src/core/context/js_ability_impl.cpp rename to frameworks/src/core/context/js_ability_impl.cpp index 29d35c4..cddf4cc --- a/src/core/context/js_ability_impl.cpp +++ b/frameworks/src/core/context/js_ability_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -12,21 +12,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_ability_impl.h" -#include "component.h" -#include "js_app_context.h" -#include "js_app_environment.h" -#if ENABLED(SECURE_C_FUNCTION) -#include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) #include "ace_event_error_code.h" #include "ace_log.h" +#include "component.h" #include "component_utils.h" #include "fatal_handler.h" +#include "js_app_context.h" +#include "js_app_environment.h" #include "js_profiler.h" #include "module_manager.h" #include "presets/localization_module.h" #include "presets/timer_module.h" +#include "securec.h" namespace OHOS { namespace ACELite { @@ -104,7 +103,7 @@ void JSAbilityImpl::CleanUp() OUTPUT_TRACE(); } -void JSAbilityImpl::DeliverCreate() +void JSAbilityImpl::DeliverCreate(const char *param) { START_TRACING(APP_ON_CREATE); // call InvokeOnCreate @@ -116,8 +115,13 @@ void JSAbilityImpl::DeliverCreate() return; } // call render to setup user interface - jerry_value_t object = jerry_create_object(); - JerrySetStringProperty(object, ROUTER_PAGE_URI, PATH_DEFAULT); + jerry_value_t object = UNDEFINED; + if (param == nullptr) { + object = jerry_create_object(); + JerrySetStringProperty(object, ROUTER_PAGE_URI, PATH_DEFAULT); + } else { + object = jerry_json_parse(reinterpret_cast(param), strlen(param)); + } if (router_) { jerry_release_value(router_->Replace(object, false)); rendered_ = true; diff --git a/src/core/context/js_ability_impl.h b/frameworks/src/core/context/js_ability_impl.h old mode 100755 new mode 100644 similarity index 95% rename from src/core/context/js_ability_impl.h rename to frameworks/src/core/context/js_ability_impl.h index 5385476..8ba98ed --- a/src/core/context/js_ability_impl.h +++ b/frameworks/src/core/context/js_ability_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -80,10 +80,10 @@ public: /** * @fn JSAbilityRuntime::DeliverCreate(); - * + * @param param the JS object to init the app start * @brief call this function when transfer lifecycle into init */ - void DeliverCreate(); + void DeliverCreate(const char *param = nullptr); /** * @fn JSAbilityRuntime::Show(); diff --git a/src/core/context/js_app_context.cpp b/frameworks/src/core/context/js_app_context.cpp similarity index 90% rename from src/core/context/js_app_context.cpp rename to frameworks/src/core/context/js_app_context.cpp index 22679c2..61635c5 100755 --- a/src/core/context/js_app_context.cpp +++ b/frameworks/src/core/context/js_app_context.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -21,14 +21,11 @@ #endif #include "component_factory.h" #include "component_utils.h" -#include "js_app_environment.h" -#include "platform_adapter.h" -#if ENABLED(SECURE_C_FUNCTION) -#include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) #include "fatal_handler.h" +#include "js_app_environment.h" #include "js_profiler.h" -#include "root_view.h" +#include "platform_adapter.h" +#include "securec.h" #include "string_util.h" #include "task_manager.h" #include "ui_view_group.h" @@ -64,10 +61,10 @@ jerry_value_t JsAppContext::Eval(const char * const jsFileFullPath, size_t fileN uint32_t contentLength = 0; START_TRACING(PAGE_CODE_LOAD); bool snapshotMode = JsAppEnvironment::GetInstance()->IsSnapshotMode(); - char *jsCode = ReadFile(jsFileFullPath, &contentLength, snapshotMode); + char *jsCode = ReadFile(jsFileFullPath, contentLength, snapshotMode); STOP_TRACING(); - if (jsCode == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "empty js file, eval user code failed"); + if ((jsCode == nullptr) || (contentLength > FILE_CONTENT_LENGTH_MAX)) { + HILOG_ERROR(HILOG_MODULE_ACE, "empty js file or length is incorrect, eval user code failed"); ACE_ERROR_CODE_PRINT(EXCE_ACE_ROUTER_REPLACE_FAILED, EXCE_ACE_PAGE_FILE_READ_FAILED); return UNDEFINED; } @@ -75,7 +72,8 @@ jerry_value_t JsAppContext::Eval(const char * const jsFileFullPath, size_t fileN START_TRACING(PAGE_CODE_EVAL); jerry_value_t viewModel = UNDEFINED; if (snapshotMode) { - viewModel = jerry_exec_snapshot(reinterpret_cast(jsCode), contentLength, 0, 1); + const uint32_t *snapshotContent = reinterpret_cast(jsCode); + viewModel = jerry_exec_snapshot(snapshotContent, contentLength, 0, 1); } else { const jerry_char_t *jsScript = reinterpret_cast(jsCode); jerry_value_t retValue = jerry_parse(reinterpret_cast(jsFileFullPath), fileNameLength, @@ -146,27 +144,6 @@ jerry_value_t JsAppContext::Render(jerry_value_t viewModel) const return nativeElement; } -void JsAppContext::Show() const -{ - RootView *rootView = RootView::GetInstance(); - if (rootView == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "get rootView is nullptr"); - return; - } - rootView->Invalidate(); -} - -void JsAppContext::RemoveAllView() const -{ - RootView *rootView = RootView::GetInstance(); - if (rootView == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "get rootView is nullptr"); - return; - } - rootView->RemoveAll(); - rootView->Invalidate(); -} - void JsAppContext::TerminateAbility() const { if (currentToken_ == 0) { @@ -271,8 +248,8 @@ char *JsAppContext::GetResourcePath(const char *uri) const return nullptr; } size_t size = strlen(uri); - if (size == 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "uri is empty."); + if (size == 0 || size > NAME_LENGTH_MAX) { + HILOG_ERROR(HILOG_MODULE_ACE, "uri is empty or too long."); return nullptr; } if (StringUtil::StartsWith(uri, URI_PREFIX_DATA)) { @@ -308,4 +285,4 @@ char *JsAppContext::GetResourcePath(const char *uri) const return RelocateResourceFilePath(currentAbilityPath_, uri); } } // namespace ACELite -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/src/core/context/js_app_context.h b/frameworks/src/core/context/js_app_context.h similarity index 72% rename from src/core/context/js_app_context.h rename to frameworks/src/core/context/js_app_context.h index 3e1446c..9313aa6 100755 --- a/src/core/context/js_app_context.h +++ b/frameworks/src/core/context/js_app_context.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,7 +15,8 @@ #ifndef OHOS_ACELITE_JS_APP_CONTEXT_H #define OHOS_ACELITE_JS_APP_CONTEXT_H - +#include "acelite_config.h" +#include "lazy_load_manager.h" #include "stylemgr/app_style_manager.h" namespace OHOS { @@ -26,7 +27,7 @@ class JSAbilityImpl; */ class JsAppContext final : public MemoryHeap { public: - static JsAppContext* GetInstance() + static JsAppContext *GetInstance() { static JsAppContext instance; return &instance; @@ -50,13 +51,6 @@ public: * @param: page instance, viewModel to call render on */ jerry_value_t Render(jerry_value_t viewModel) const; - /** - * @brief call FeatureAbility's show function - * - * @param: page instance, nativeElement to call show on - */ - void Show() const; - void RemoveAllView() const; /** * @brief set the ability path, bundle name and token info for current ability * @@ -66,7 +60,7 @@ public: /** * @brief return ability path */ - const char* GetCurrentAbilityPath() const + const char *GetCurrentAbilityPath() const { return currentAbilityPath_; } @@ -79,34 +73,35 @@ public: /** * @brief return js path */ - const char* GetCurrentJsPath() const + const char *GetCurrentJsPath() const { return currentJsPath_; } /** * @brief return current bundle name */ - const char* GetCurrentBundleName() const + const char *GetCurrentBundleName() const { return currentBundleName_; } - const JSAbilityImpl* GetTopJSAbilityImpl() const + const JSAbilityImpl *GetTopJSAbilityImpl() const { return topJSAbilityImpl_; } /** * @brief return current ability implementation */ - void SetTopJSAbilityImpl(JSAbilityImpl* object) + void SetTopJSAbilityImpl(JSAbilityImpl *object) { topJSAbilityImpl_ = object; } - const AppStyleManager* GetStyleManager() + const AppStyleManager *GetStyleManager() { if (styleManage_ == nullptr) { styleManage_ = new AppStyleManager(); + styleManage_->Prepare(); } return styleManage_; } @@ -124,6 +119,21 @@ public: */ void ClearContext(); + const LazyLoadManager *GetLazyLoadManager() + { + if (lazyLoadManager_ == nullptr) { + lazyLoadManager_ = new LazyLoadManager(); + } + return lazyLoadManager_; + } + + void ReleaseLazyLoadManager() + { + if (lazyLoadManager_) { + delete lazyLoadManager_; + lazyLoadManager_ = nullptr; + } + } char *GetResourcePath(const char *uri) const; private: @@ -133,12 +143,13 @@ private: void ReleaseAbilityInfo(); void SetGlobalNamedProperty(bool isAppEval, jerry_value_t viewModel) const; - char* currentBundleName_ = nullptr; - char* currentAbilityPath_ = nullptr; - char* currentJsPath_ = nullptr; - JSAbilityImpl* topJSAbilityImpl_ = nullptr; - AppStyleManager* styleManage_ = nullptr; - // record current runing ability's uuid && ability path, will be release during app-cleanup + char *currentBundleName_ = nullptr; + char *currentAbilityPath_ = nullptr; + char *currentJsPath_ = nullptr; + JSAbilityImpl *topJSAbilityImpl_ = nullptr; + AppStyleManager *styleManage_ = nullptr; + LazyLoadManager *lazyLoadManager_ = nullptr; + // record current running ability's uuid && ability path, will be release during app-cleanup uint16_t currentToken_ = 0; }; } // namespace ACELite diff --git a/src/core/context/js_app_environment.cpp b/frameworks/src/core/context/js_app_environment.cpp similarity index 88% rename from src/core/context/js_app_environment.cpp rename to frameworks/src/core/context/js_app_environment.cpp index bbc7526..93377f6 100755 --- a/src/core/context/js_app_environment.cpp +++ b/frameworks/src/core/context/js_app_environment.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,6 +15,7 @@ #include "js_app_environment.h" #include "ace_event_error_code.h" #include "ace_log.h" +#include "async_task_manager.h" #include "handler.h" #include "js_app_context.h" #include "js_framework_raw.h" @@ -24,6 +25,7 @@ #include "platform_adapter.h" #include "presets/console_module.h" #include "presets/feature_ability_module.h" +#include "presets/intl_module.h" #include "presets/jstest_module.h" #include "presets/localization_module.h" #include "presets/profiler_module.h" @@ -31,6 +33,11 @@ #include "presets/require_module.h" #include "presets/timer_module.h" #include "presets/version_module.h" +#ifdef JS_ENGINE_STATIC_MULTI_CONTEXTS_ENABLED +extern "C" { +#include "generate-bytecode.h" +} +#endif namespace OHOS { namespace ACELite { @@ -49,12 +56,18 @@ void JsAppEnvironment::LoadAceBuiltInModules() const TimersModule::Load(); PerformaceProfilerModule::Load(); AceVersionModule::Load(); + IntlControlModule::Load(); } void JsAppEnvironment::InitJsFramework() const { START_TRACING(ENGINE_INIT); +#ifdef JS_ENGINE_STATIC_MULTI_CONTEXTS_ENABLED + js_task_context_init(); +#endif +#ifndef JERRY_PORTING_DEPENDENCY Srand((unsigned)jerry_port_get_current_time()); +#endif Debugger::GetInstance().SetupJSContext(); jerry_init(JERRY_INIT_EMPTY); STOP_TRACING(); @@ -64,6 +77,7 @@ void JsAppEnvironment::InitJsFramework() const jerry_release_value(jerryx_set_property_str(globalThis, "globalThis", globalThis)); jerry_release_value(globalThis); #endif // JSFWK_TEST + AsyncTaskManager::GetInstance().Init(); LoadAceBuiltInModules(); LoadFramework(); LocalModule::Load(); @@ -107,6 +121,9 @@ void JsAppEnvironment::Cleanup() jerry_cleanup(); // free the external JS context, only can be called after clean up engine Debugger::GetInstance().ReleaseJSContext(); +#ifdef JS_ENGINE_STATIC_MULTI_CONTEXTS_ENABLED + jerry_port_default_remove_current_context_record(); +#endif } /** diff --git a/src/core/context/js_app_environment.h b/frameworks/src/core/context/js_app_environment.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/context/js_app_environment.h rename to frameworks/src/core/context/js_app_environment.h diff --git a/src/core/context/js_framework_raw.cpp b/frameworks/src/core/context/js_framework_raw.cpp old mode 100755 new mode 100644 similarity index 85% rename from src/core/context/js_framework_raw.cpp rename to frameworks/src/core/context/js_framework_raw.cpp index cefab13..7498091 --- a/src/core/context/js_framework_raw.cpp +++ b/frameworks/src/core/context/js_framework_raw.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -29,11 +29,10 @@ const char *GetFrameworkRawBuffer(bool snapshotMode, size_t &bufLen) { if (snapshotMode) { bufLen = sizeof(g_frameworkBCBuffer); - return g_frameworkBCBuffer; - } else { - bufLen = strlen(g_frameworkJSBuffer); - return g_frameworkJSBuffer; + return reinterpret_cast(g_frameworkBCBuffer); } + bufLen = strlen(g_frameworkJSBuffer); + return g_frameworkJSBuffer; } } // namespace ACELite } // namespace OHOS diff --git a/src/core/context/js_framework_raw.h b/frameworks/src/core/context/js_framework_raw.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/context/js_framework_raw.h rename to frameworks/src/core/context/js_framework_raw.h diff --git a/src/core/context/js_profiler.cpp b/frameworks/src/core/context/js_profiler.cpp old mode 100755 new mode 100644 similarity index 93% rename from src/core/context/js_profiler.cpp rename to frameworks/src/core/context/js_profiler.cpp index f1d86a6..4a0fd4d --- a/src/core/context/js_profiler.cpp +++ b/frameworks/src/core/context/js_profiler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -22,19 +22,15 @@ #include "js_fwk_common.h" #include "key_parser.h" #if defined(FEATURE_ACELITE_MC_JS_PROFILER) -#include "common/file.h" -#include "los_swtmr.h" +#include +#include "los_tick.h" +#include "unistd.h" #elif defined(FEATURE_ACELITE_JS_PROFILER) #include #else #include #endif // FEATURE_ACELITE_MC_JS_PROFILER -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#else // ENABLED(SECURE_C_FUNCTION) -#include -#endif // ENABLED(SECURE_C_FUNCTION) - #include namespace OHOS { @@ -228,7 +224,7 @@ void JSProfiler::FlushProfilerMsg(void *data) return; } - int32_t fd = FileOpen(fullPath, O_CREAT | O_RDWR); + int32_t fd = open(fullPath, O_CREAT | O_RDWR); if (fd < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "ace js profiler open error"); ace_free(fullPath); @@ -237,13 +233,13 @@ void JSProfiler::FlushProfilerMsg(void *data) } for (uint16_t i = 0; i < g_profiler_msg_index; i++) { - if (FileWrite(fd, JSProfiler::GetInstance()->msg_[i].msg, strlen(JSProfiler::GetInstance()->msg_[i].msg)) < 0) { + if (write(fd, JSProfiler::GetInstance()->msg_[i].msg, strlen(JSProfiler::GetInstance()->msg_[i].msg)) < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "ace dump js profiler msg error"); break; } } - if (FileClose(fd) < 0) { + if (close(fd) < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "ace js profiler close error"); } @@ -265,21 +261,11 @@ void JSProfiler::Release() void JSProfiler::ResetData() { if (data_) { -#if ENABLED(SECURE_C_FUNCTION) if (memset_s(data_, (maxTracingDataCount * sizeof(PerformanceData)), 0, (maxTracingDataCount * sizeof(PerformanceData))) != 0) { HILOG_ERROR(HILOG_MODULE_ACE, "ace js profiler memset_s failed"); return; } -#else - for (uint16_t i = 0; i < maxTracingDataCount; i++) { - data_[i].start = 0; - data_[i].end = 0; - data_[i].label = 0; - data_[i].description = 0; - data_[i].component = 0; - } -#endif } #ifdef FEATURE_ACELITE_MC_JS_PROFILER @@ -306,9 +292,8 @@ void JSProfiler::PushTrace(PerformanceTag tag, uint8_t name, uint8_t description if (g_isFirst) { if ((tag != LAUNCH) && (tag != ROUTER_REPLACE)) { return; - } else { - g_isFirst = false; } + g_isFirst = false; } if (g_startOffset == 0) { @@ -422,21 +407,17 @@ uint64_t JSProfiler::GetCurrentClockTick() const // convert clock tick intervals into milliseconds uint64_t JSProfiler::CalculateElapsedTime(uint64_t start, uint64_t end) const { -#ifndef FEATURE_ACELITE_JS_PROFILER - const uint32_t msPerSec = 1000; -#endif if (start >= end) { return 0; } uint64_t interval = end - start; -#if defined(FEATURE_ACELITE_MC_JS_PROFILER) +#if defined(FEATURE_ACELITE_MC_JS_PROFILER) || defined(FEATURE_ACELITE_JS_PROFILER) // real device - return (interval * msPerSec) / LOSCFG_BASE_CORE_TICK_PER_SECOND; -#elif defined(FEATURE_ACELITE_JS_PROFILER) return interval; #else // PC simulator + const uint32_t msPerSec = 1000; return (interval * msPerSec) / CLOCKS_PER_SEC; #endif } diff --git a/src/core/context/js_profiler.h b/frameworks/src/core/context/js_profiler.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/context/js_profiler.h rename to frameworks/src/core/context/js_profiler.h diff --git a/src/core/context/js_timer_list.cpp b/frameworks/src/core/context/js_timer_list.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/context/js_timer_list.cpp rename to frameworks/src/core/context/js_timer_list.cpp diff --git a/src/core/context/js_timer_list.h b/frameworks/src/core/context/js_timer_list.h similarity index 100% rename from src/core/context/js_timer_list.h rename to frameworks/src/core/context/js_timer_list.h diff --git a/src/core/base/BUILD.gn b/frameworks/src/core/context/test/unittest/BUILD.gn similarity index 54% rename from src/core/base/BUILD.gn rename to frameworks/src/core/context/test/unittest/BUILD.gn index ebbefa1..f159a31 100755 --- a/src/core/base/BUILD.gn +++ b/frameworks/src/core/context/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -#Copyright (c) 2020 Huawei Device Co., Ltd. +#Copyright (c) 2021 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 @@ -9,18 +9,19 @@ #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. +#limitations under the License. -source_set("base") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "js_fwk_common.cpp", - "key_parser.cpp", - "ace_log.cpp", - "time_util.cpp", - ] - include_dirs = [ - ] +import("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +unittest("js_frameworks_test_jsfwk") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "common/jsfwk_tdd_test.cpp" ] + deps = ace_test_deps +} + +group("js_frameworks_unittest") { + deps = [ ":js_frameworks_test_jsfwk" ] } diff --git a/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.cpp b/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.cpp new file mode 100755 index 0000000..b140af4 --- /dev/null +++ b/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.cpp @@ -0,0 +1,454 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "jsfwk_tdd_test.h" +#include +#include "ace_version.h" +#include "acelite_config.h" +#include "js_ability.h" +#include "js_app_context.h" +#include "js_config.h" +#include "js_debugger_config.h" + +namespace OHOS { +namespace ACELite { +JSfwkTddTest::JSfwkTddTest(){} + +static JSAbility* g_targetJSAbility = nullptr; +static char* g_currentTestCaseName = nullptr; +static uint8_t g_assertRecord = 0; + +void JSfwkTddTest::TestCaseB(const char* name) const +{ + g_assertRecord = 0; + g_currentTestCaseName = const_cast(name); +} + +void JSfwkTddTest::JudeTestCaseResult() const +{ + if (g_assertRecord > 0) { + printf("[Test Case] [%s] FAILED \n", g_currentTestCaseName); + } else { + printf("[Test Case] [%s] PASSED \n", g_currentTestCaseName); + } +} + +void JSfwkTddTest::SetUp() +{ + g_targetJSAbility = new JSAbility(); +} + +void JSfwkTddTest::TearDown() +{ + if (g_targetJSAbility != nullptr) { + delete g_targetJSAbility; + g_targetJSAbility = nullptr; + } +} + +void JSfwkTddTest::StartUpEngine() +{ + // free the external JS context, only can be called after clean up engine + Debugger::GetInstance().SetupJSContext(); + jerry_init(JERRY_INIT_EMPTY); +} + +void JSfwkTddTest::TearDownEngine() +{ + jerry_cleanup(); + // free the external JS context, only can be called after clean up engine + Debugger::GetInstance().ReleaseJSContext(); + JudeTestCaseResult(); +} + +void JSfwkTddTest::ACELiteFrameworkInitialization001() +{ + TestCaseB("ACELiteFrameworkInitialization001"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step2. call Launch method and give invalid input paramaters + */ + g_targetJSAbility->Launch("", "", 0); + + /** + * @tc.steps: step3. check if the top JS ability is initialized + */ + JSAbilityImpl* jsAbilityImpl = const_cast(JsAppContext::GetInstance()->GetTopJSAbilityImpl()); + EXPECT_TRUE(jsAbilityImpl == nullptr); + /** + * @tc.steps: step4. clean up test environment + */ + TDD_CASE_END(); +} + +void JSfwkTddTest::ACELiteFrameworkInitialization002() +{ + TestCaseB("ACELiteFrameworkInitialization002"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step2. call Launch method and give invalid input paramaters + */ + g_targetJSAbility->Launch("user/data/demo/", "", 0); + + /** + * @tc.steps: step3. check if the top JS ability is initialized + */ + JSAbilityImpl* jsAbilityImpl = const_cast(JsAppContext::GetInstance()->GetTopJSAbilityImpl()); + EXPECT_TRUE(jsAbilityImpl == nullptr); + /** + * @tc.steps: step4. clean up test environment + */ + TDD_CASE_END(); +} + +void JSfwkTddTest::ACELiteFrameworkInitialization003() +{ + TestCaseB("ACELiteFrameworkInitialization003"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step2. call Launch method and give invalid input paramaters + */ + constexpr char packageName[] = "test"; + g_targetJSAbility->Launch("user/data/test/", packageName, 0); + + /** + * @tc.steps: step3. check if the top JS ability is initialized + */ + JSAbilityImpl* jsAbilityImpl = const_cast(JsAppContext::GetInstance()->GetTopJSAbilityImpl()); + EXPECT_TRUE(jsAbilityImpl != nullptr); + + /** + * @tc.steps: step4. try to call back-pressed to trigger terminating + */ + g_targetJSAbility->BackPressed(); + + /** + * @tc.steps: step5. check the package name is same with the one we passed + */ + if (strcmp(g_targetJSAbility->GetPackageName(), packageName)) { + g_assertRecord++; + } + EXPECT_TRUE(!strcmp(g_targetJSAbility->GetPackageName(), packageName)); + + /** + * @tc.steps: step5. clean up test environment + */ + g_targetJSAbility->TransferToDestroy(); + g_targetJSAbility = nullptr; + TDD_CASE_END(); +} + +void JSfwkTddTest::ACELiteFrameworkInitialization009() +{ + TestCaseB("ACELiteFrameworkInitialization009"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); +#if ENABLED(ACE_LITE_VERSION_JS_API) + /** + * @tc.steps: step2. check version code + */ + EXPECT_TRUE(ACEVersion::GetStr() != nullptr); + /** + * @tc.steps: step3. check commit code + */ + EXPECT_TRUE(ACEVersion::GetCommit() != nullptr); + /** + * @tc.steps: step4. check build timestamp + */ + const char* buildStamp = ACEVersion::GetTimeStamp(); + EXPECT_TRUE(buildStamp != nullptr); + constexpr char firstVersionBuildStamp[] = "2020-05-09 16:31:41"; + if (strcmp(buildStamp, firstVersionBuildStamp) == 0) { + // the version code header file is not updated, make the case failed + g_assertRecord++; + } + EXPECT_TRUE(strcmp(buildStamp, firstVersionBuildStamp) != 0); +#endif + TDD_CASE_END(); +} + +void JSfwkTddTest::ACELiteFrameworkInitialization011() +{ + TestCaseB("ACELiteFrameworkInitialization011"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step2. call launch + */ + constexpr char packageName[] = "com.huawei.test"; + g_targetJSAbility->Launch("user/data/test/", packageName, 0); + + /** + * @tc.steps: step3. call show + */ + g_targetJSAbility->Show(); + + /** + * @tc.steps: step4. verify + */ + if (strcmp(g_targetJSAbility->GetPackageName(), packageName)) { + g_assertRecord++; + } + EXPECT_TRUE(!strcmp(g_targetJSAbility->GetPackageName(), packageName)); + TDD_CASE_END(); +} + +void JSfwkTddTest::ACELiteFrameworkInitialization012() +{ + TestCaseB("ACELiteFrameworkInitialization012"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step2. call launch + */ + constexpr char packageName[] = "com.huawei.test"; + g_targetJSAbility->Launch("user/data/test/", packageName, 0); + + /** + * @tc.steps: step3. call show then hide + */ + g_targetJSAbility->Show(); + g_targetJSAbility->Hide(); + + /** + * @tc.steps: step4. verify + */ + if (strcmp(g_targetJSAbility->GetPackageName(), packageName)) { + g_assertRecord++; + } + EXPECT_TRUE(!strcmp(g_targetJSAbility->GetPackageName(), packageName)); + TDD_CASE_END(); +} + +void JSfwkTddTest::AceliteFrameworkEngineIntegrating01() +{ + TestCaseB("AceliteFrameworkEngineIntegrating01"); + /** + * @tc.steps: step1. init test environment + */ + StartUpEngine(); + /** + * @tc.steps: step2. check the jerry engine's configuration parser + */ + bool featureOn = jerry_is_feature_enabled(JERRY_FEATURE_JS_PARSER); + + /** + * @tc.steps: step3. check JS parser feature is on + */ + EXPECT_TRUE(featureOn); + /** + * @tc.steps: step4. clean up test environment + */ + TearDownEngine(); +} + +void JSfwkTddTest::AceliteFrameworkEngineIntegrating02() +{ + TestCaseB("AceliteFrameworkEngineIntegrating02"); + /** + * @tc.steps: step1. init test environment + */ + StartUpEngine(); + /** + * @tc.steps: step1. check the jerry engine's configuration promise(which is part of es2005) + */ + bool featureOn = jerry_is_feature_enabled(JERRY_FEATURE_PROMISE); + + /** + * @tc.steps: step2. check JS promise feature is off + */ + EXPECT_FALSE(featureOn); + + /** + * @tc.steps: step3. check the jerry engine's configuration typedarray (which is part of es2005) + */ + featureOn = jerry_is_feature_enabled(JERRY_FEATURE_TYPEDARRAY); + + /** + * @tc.steps: step4. check JS typedarray is off + */ + EXPECT_TRUE(featureOn); + /** + * @tc.steps: step5. cleanup test environment + */ + TearDownEngine(); +} + +void JSfwkTddTest::AceliteFrameworkEngineIntegrating03() +{ + TestCaseB("AceliteFrameworkEngineIntegrating03"); + /** + * @tc.steps: step1. init test environment + */ + StartUpEngine(); + + /** + * @tc.steps: step2. check the jerry engine's configuration snapshot + */ + bool featureOn = jerry_is_feature_enabled(JERRY_FEATURE_SNAPSHOT_EXEC); + + /** + * @tc.steps: step3. check JS snapshot feature is on + */ + EXPECT_TRUE(featureOn); + TearDownEngine(); +} + +void JSfwkTddTest::AceliteFrameworkEngineIntegrating04() +{ + TestCaseB("AceliteFrameworkEngineIntegrating04"); + StartUpEngine(); + /** + * @tc.steps: step1. check the jerry engine's configuration regexp + */ + bool featureOn = jerry_is_feature_enabled(JERRY_FEATURE_REGEXP); + + /** + * @tc.steps: step2. check JS regexp feature is on + */ + EXPECT_FALSE(featureOn); + TearDownEngine(); +} + +void JSfwkTddTest::RunTests() +{ + ACELiteFrameworkInitialization001(); + ACELiteFrameworkInitialization002(); + ACELiteFrameworkInitialization003(); + ACELiteFrameworkInitialization009(); + AceliteFrameworkEngineIntegrating01(); + AceliteFrameworkEngineIntegrating02(); + AceliteFrameworkEngineIntegrating03(); + AceliteFrameworkEngineIntegrating04(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: ACELiteFrameworkInitialization001 + * @tc.desc: Verify if the invalid input will lead exception . + * @tc.require: AR000DSEEU + */ +HWTEST_F(JSfwkTddTest, init001, TestSize.Level1) +{ + JSfwkTddTest::ACELiteFrameworkInitialization001(); +} + +/** + * @tc.name: ACELiteFrameworkInitialization002 + * @tc.desc: Verify if the invalid input will lead exception . + * @tc.require: AR000DSEEU + */ +HWTEST_F(JSfwkTddTest, init002, TestSize.Level1) +{ + JSfwkTddTest::ACELiteFrameworkInitialization002(); +} + +/** + * @tc.name: ACELiteFrameworkInitialization003 + * @tc.desc: Verify if the invalid input will lead exception . + * @tc.require: AR000DSEEU + */ +HWTEST_F(JSfwkTddTest, init003, TestSize.Level1) +{ + JSfwkTddTest::ACELiteFrameworkInitialization003(); +} + +/** + * @tc.name: ACELiteFrameworkInitialization009 + * @tc.desc: Verify the version API. + * @tc.require: AR000DSEEU + */ +HWTEST_F(JSfwkTddTest, init009, TestSize.Level1) +{ + JSfwkTddTest::ACELiteFrameworkInitialization009(); +} + +/** + * @tc.name: ACELiteFrameworkInitialization011 + * @tc.desc: Verify hide and show. + * @tc.require: AR000DSEEU + */ +HWTEST_F(JSfwkTddTest, init011, TestSize.Level1) +{ + JSfwkTddTest::ACELiteFrameworkInitialization011(); +} + +/** + * @tc.name: ACELiteFrameworkInitialization012 + * @tc.desc: Verify hide and show. + * @tc.require: AR000DSEEU + */ +HWTEST_F(JSfwkTddTest, init012, TestSize.Level1) +{ + JSfwkTddTest::ACELiteFrameworkInitialization012(); +} + +/** + * @tc.name: AceliteFrameworkEngineIntegrating01 + * @tc.desc: Verify the configuration of jerry engine. + * @tc.require: AR000DT7BN + */ +HWTEST_F(JSfwkTddTest, engineIntegrating001, TestSize.Level1) +{ + JSfwkTddTest::AceliteFrameworkEngineIntegrating01(); +} + +/** + * @tc.name: AceliteFrameworkEngineIntegrating02 + * @tc.desc: Verify the configuration of jerry engine. + * @tc.require: AR000DT7BN + */ +HWTEST_F(JSfwkTddTest, engineIntegrating002, TestSize.Level1) +{ + JSfwkTddTest::AceliteFrameworkEngineIntegrating02(); +} + +/** + * @tc.name: AceliteFrameworkEngineIntegrating03 + * @tc.desc: Verify the configuration of jerry engine. + * @tc.require: AR000DT7BN + */ +HWTEST_F(JSfwkTddTest, engineIntegrating003, TestSize.Level1) +{ + JSfwkTddTest::AceliteFrameworkEngineIntegrating03(); +} + +/** + * @tc.name: AceliteFrameworkEngineIntegrating04 + * @tc.desc: Verify the configuration of jerry engine. + * @tc.require: AR000DT7BN + */ +HWTEST_F(JSfwkTddTest, engineIntegrating004, TestSize.Level1) +{ + JSfwkTddTest::AceliteFrameworkEngineIntegrating04(); +} +#endif +} +} \ No newline at end of file diff --git a/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h b/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h new file mode 100755 index 0000000..abe4d52 --- /dev/null +++ b/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef ACELITE_JSFWK_TDD_TEST_H +#define ACELITE_JSFWK_TDD_TEST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "acelite_config.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class JSfwkTddTest : public testing::Test { +#else +class JSfwkTddTest { +#endif +public: + JSfwkTddTest(); + ~JSfwkTddTest(){}; + void SetUp(); + void TearDown(); + void JudeTestCaseResult() const; + void StartUpEngine(); + void TearDownEngine(); + void TestCaseB(const char* name) const; + void ACELiteFrameworkInitialization001(); + void ACELiteFrameworkInitialization002(); + void ACELiteFrameworkInitialization003(); + void ACELiteFrameworkInitialization009(); + void AceliteFrameworkEngineIntegrating01(); + void AceliteFrameworkEngineIntegrating02(); + void AceliteFrameworkEngineIntegrating03(); + void AceliteFrameworkEngineIntegrating04(); + void ACELiteFrameworkInitialization011(); + void ACELiteFrameworkInitialization012(); + void RunTests(); +}; +} +} +#endif // ACELITE_JSFWK_TDD_TEST_H diff --git a/frameworks/src/core/dialog/js_dialog.cpp b/frameworks/src/core/dialog/js_dialog.cpp new file mode 100755 index 0000000..c3b0d64 --- /dev/null +++ b/frameworks/src/core/dialog/js_dialog.cpp @@ -0,0 +1,234 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "acelite_config.h" +#ifdef FEATURE_MODULE_DIALOG +#include "ace_log.h" +#include "js_async_work.h" +#include "js_dialog.h" + +namespace OHOS { +namespace ACELite { +JSDialog::JSDialog() + : dialog_(nullptr), + dialogListener_(nullptr), + dismissListener_(nullptr), + title_(nullptr), + message_(nullptr) {} + +JSDialog::~JSDialog() +{ + ReleaseResource(); +} + +void JSDialog::ReleaseResource() +{ + ACE_FREE(title_); + ACE_FREE(message_); + ACE_DELETE(dialog_); + ACE_DELETE(dismissListener_); + ACE_DELETE(dialogListener_); +} + +void JSDialog::SetTitle(char *title) +{ + title_ = title; +} +void JSDialog::SetMessage(char *message) +{ + message_ = message; +} + +/** + * This the async callback used to release the JSDialog instance. + */ +static void DialogRecycleExecutor(void *jsDialog) +{ + if (jsDialog == nullptr) { + return; + } + // release resource + delete reinterpret_cast(jsDialog); +} + +bool JSDialog::ShowDialog(JSIValue thisVal, + JSIValue buttons, + JSIValue successFunc, + JSIValue cancelFunc, + JSIValue completeFunc) +{ + ACE_DELETE(dialog_); + dialog_ = new UIDialog(); + if (dialog_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create ui dialog failed, return "); + return false; + } + + dialog_->SetTitle(title_); + dialog_->SetText(message_); + + // set dialog dismiss listener + dismissListener_ = new DismissListener(this, cancelFunc, completeFunc, thisVal); + if (dismissListener_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create dialog dismissListener_ is nullptr, return nullptr."); + return false; + } + dialog_->SetOnCancelListener(dismissListener_); + + // parser dialog button and set button listenr + if (!ParseButton(this, buttons, successFunc, completeFunc, thisVal)) { + HILOG_ERROR(HILOG_MODULE_ACE, "parse dialog button error"); + return false; + } + + dialog_->EnableAutoCancel(true); + // show dialog + dialog_->Show(); + return true; +} + + +bool JSDialog::ParseButton(JSDialog *jsDialog, + JSIValue buttonArrayObject, + JSIValue successFuncObject, + JSIValue completeFuncObject, + JSIValue context) +{ + if (jsDialog == nullptr) { + return false; + } + UIDialog *dialog = const_cast(jsDialog->GetUIDialog()); + if (dialog == nullptr) { + return false; + } + /* parse dialog buttons */ + uint32_t len = JSI::GetArrayLength(buttonArrayObject); + const uint8_t maxButtonNum = 3; + const char * const buttonTextKey = "text"; + const char * const buttonColorKey = "color"; + // support up to 3 buttons + for (uint16_t index = 0; index < len; index++) { + if (index >= maxButtonNum) { + HILOG_WARN(HILOG_MODULE_ACE, "dialog support up to 3 buttons, please check dialog button num"); + break; + } + // parse button text + JSIValue buttonObject = JSI::GetPropertyByIndex(buttonArrayObject, index); + char *buttonText = JSI::GetStringProperty(buttonObject, buttonTextKey); + + // parse button text color + char *buttonColorText = JSI::GetStringProperty(buttonObject, buttonColorKey); + ColorType color = ParseButtonColor(buttonColorText); + dialog->SetButtonColor(static_cast(index), color); + // set button click listener + dialogListener_ = new DialogListener(jsDialog, index, successFuncObject, completeFuncObject, context); + if (dialogListener_ == nullptr) { + JSI::ReleaseString(buttonText); + JSI::ReleaseString(buttonColorText); + JSI::ReleaseValue(buttonObject); + return false; + } + dialog->SetButton(static_cast(index), buttonText, dialogListener_); + // release button JSI value + JSI::ReleaseString(buttonText); + JSI::ReleaseString(buttonColorText); + JSI::ReleaseValue(buttonObject); + } + return true; +} + +ColorType JSDialog::ParseButtonColor(const char * const buttonColorText) +{ + uint32_t color = 0; // default color + uint8_t alpha = 0; + if (!ParseColor(buttonColorText, color, alpha)) { + HILOG_ERROR(HILOG_MODULE_ACE, "input dialog button color error, please check. default color instead"); + return Color::GetColorFromRGB(0, 0, 0); + } + HILOG_INFO(HILOG_MODULE_ACE, "dialog buttonColorText = %s, colorVal = %d", buttonColorText, color); + uint8_t red8 = uint8_t((color & TEXT_RED_COLOR_MASK) >> RED_COLOR_START_BIT); + uint8_t green8 = uint8_t((color & TEXT_GREEN_COLOR_MASK) >> GREEN_COLOR_START_BIT); + uint8_t blue8 = uint8_t((color & TEXT_BLUE_COLOR_MASK)); + return Color::GetColorFromRGB(red8, green8, blue8); +} + +/** + * Call this function if the dialog is dismissed in any scenario. + */ +void JSDialog::DispatchReleaseRequest(const JSDialog *jsDialog) +{ + if (!JsAsyncWork::DispatchAsyncWork(DialogRecycleExecutor, const_cast(jsDialog))) { + // dispatch the release request failed, JSDialog resource leaked + HILOG_ERROR(HILOG_MODULE_ACE, "dispatch the release request failed, resource leaked [%{private}p]", jsDialog); + } +} + +DialogListener::DialogListener(JSDialog *jsDialog, + uint8_t index, + JSIValue successFunc, + JSIValue completeFunc, + JSIValue context) + : jsDialog_(jsDialog), + buttonIndex_(index), + jsSuccessFunc_(JSI::AcquireValue(successFunc)), + jsCompleteFunc_(JSI::AcquireValue(completeFunc)), + jsContext_(JSI::AcquireValue(context)) {} + +DialogListener::~DialogListener() {} + +bool DialogListener::OnClick(UIView &view, const ClickEvent &event) +{ + HILOG_INFO(HILOG_MODULE_ACE, "dialog button on click"); + JSIValue args[1]; + args[0] = JSI::CreateObject(); + const char * const indexStr = "index"; + + JSI::SetNumberProperty(args[0], indexStr, buttonIndex_); + if (JSI::ValueIsFunction(jsSuccessFunc_)) { + JSI::CallFunction(jsSuccessFunc_, jsContext_, args, 1); + } + if (JSI::ValueIsFunction(jsCompleteFunc_)) { + JSI::CallFunction(jsCompleteFunc_, jsContext_, nullptr, 0); + } + JSI::ReleaseValueList(args[0], jsSuccessFunc_, jsCompleteFunc_, jsContext_); + // the dialog is going to be dismissed, request to do the recycling + JSDialog::DispatchReleaseRequest(jsDialog_); + return true; +} + +DismissListener::DismissListener(JSDialog *jsDialog, JSIValue cancelFunc, JSIValue completeFunc, JSIValue context) + : jsDialog_(jsDialog), + jsCancelFunc_(JSI::AcquireValue(cancelFunc)), + jsCompleteFunc_(JSI::AcquireValue(completeFunc)), + jsContext_(JSI::AcquireValue(context)) {} + +DismissListener::~DismissListener() {} +bool DismissListener::OnClick(UIView &view, const ClickEvent &event) +{ + HILOG_INFO(HILOG_MODULE_ACE, "dialog dismiss button on click"); + if (JSI::ValueIsFunction(jsCancelFunc_)) { + JSI::CallFunction(jsCancelFunc_, jsContext_, nullptr, 0); + } + if (JSI::ValueIsFunction(jsCompleteFunc_)) { + JSI::CallFunction(jsCompleteFunc_, jsContext_, nullptr, 0); + } + JSI::ReleaseValueList(jsCancelFunc_, jsCompleteFunc_, jsContext_); + // the dialog is going to be dismissed, request to do the recycling + JSDialog::DispatchReleaseRequest(jsDialog_); + return true; +} +} // namespace ACELite +} // namespace OHOS +#endif // FEATURE_MODULE_DIALOG \ No newline at end of file diff --git a/frameworks/src/core/dialog/js_dialog.h b/frameworks/src/core/dialog/js_dialog.h new file mode 100755 index 0000000..9320f0f --- /dev/null +++ b/frameworks/src/core/dialog/js_dialog.h @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_JS_DIALOG_H +#define OHOS_ACELITE_JS_DIALOG_H + +#include "acelite_config.h" +#ifdef FEATURE_MODULE_DIALOG +#include "jsi.h" +#include "js_fwk_common.h" +#include "non_copyable.h" +#include "dialog/js_dialog.h" +#include "event_listener.h" +#include "ui_dialog.h" + +namespace OHOS { +namespace ACELite { +class DialogListener; +class DismissListener; +/** + * @brief: The module of dialog, show dialog in window + */ +class JSDialog final : public MemoryHeap { +public: + ACE_DISALLOW_COPY_AND_MOVE(JSDialog); + JSDialog(); + ~JSDialog(); + void ReleaseResource(); + + void SetTitle(char *title); + void SetMessage(char *message); + + bool ShowDialog(JSIValue thisVal, + JSIValue buttons, + JSIValue successFunc, + JSIValue cancelFunc, + JSIValue completeFunc); + static void DispatchReleaseRequest(const JSDialog *jsDialog); + + const UIDialog *GetUIDialog() const + { + return dialog_; + } + +private: + UIDialog *dialog_; + DialogListener *dialogListener_; + DismissListener *dismissListener_; + char *title_; + char *message_; + + bool ParseButton(JSDialog *dialog, + JSIValue object, + JSIValue successFuncObject, + JSIValue completeFuncObject, + JSIValue context); + ColorType ParseButtonColor(const char * const buttonColorText); +}; + +class DialogListener final: public UIView::OnClickListener { +public: + ACE_DISALLOW_COPY_AND_MOVE(DialogListener); + DialogListener(JSDialog *jsDialog, uint8_t index, JSIValue successFunc, JSIValue completeFunc, JSIValue context); + ~DialogListener(); + bool OnClick(UIView &view, const ClickEvent &event) override; + +private: + JSDialog *jsDialog_; + uint8_t buttonIndex_; + JSIValue jsSuccessFunc_; + JSIValue jsCompleteFunc_; + JSIValue jsContext_; +}; + +class DismissListener final : public UIView::OnClickListener { +public: + ACE_DISALLOW_COPY_AND_MOVE(DismissListener); + DismissListener(JSDialog *jsDialog, JSIValue cancelFunc, JSIValue completeFunc, JSIValue context); + ~DismissListener(); + bool OnClick(UIView &view, const ClickEvent &event) override; + +private: + JSDialog *jsDialog_; + JSIValue jsCancelFunc_; + JSIValue jsCompleteFunc_; + JSIValue jsContext_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // FEATURE_MODULE_DIALOG +#endif // OHOS_ACELITE_DIALOG_MODULE_H \ No newline at end of file diff --git a/src/core/directive/descriptor_utils.cpp b/frameworks/src/core/directive/descriptor_utils.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/directive/descriptor_utils.cpp rename to frameworks/src/core/directive/descriptor_utils.cpp diff --git a/src/core/directive/descriptor_utils.h b/frameworks/src/core/directive/descriptor_utils.h old mode 100755 new mode 100644 similarity index 98% rename from src/core/directive/descriptor_utils.h rename to frameworks/src/core/directive/descriptor_utils.h index afe4c99..3525b98 --- a/src/core/directive/descriptor_utils.h +++ b/frameworks/src/core/directive/descriptor_utils.h @@ -67,7 +67,7 @@ public: /** * @brief Check whether the if directive descriptor object can be shown or not? - * @param descriptor The if directive descriptor objeect to be checked. + * @param descriptor The if directive descriptor object to be checked. * @return The check result. */ static bool IsIfDescriptorShown(JSValue descriptor); diff --git a/src/core/directive/directive_watcher_callback.cpp b/frameworks/src/core/directive/directive_watcher_callback.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/directive/directive_watcher_callback.cpp rename to frameworks/src/core/directive/directive_watcher_callback.cpp diff --git a/src/core/directive/directive_watcher_callback.h b/frameworks/src/core/directive/directive_watcher_callback.h old mode 100755 new mode 100644 similarity index 94% rename from src/core/directive/directive_watcher_callback.h rename to frameworks/src/core/directive/directive_watcher_callback.h index 70960bd..63453b7 --- a/src/core/directive/directive_watcher_callback.h +++ b/frameworks/src/core/directive/directive_watcher_callback.h @@ -32,10 +32,10 @@ public: ~DirectiveWatcherCallback() {} /** - * @brief The watcher callback function which will be trigger when the dirctive condition was changed. + * @brief The watcher callback function which will be trigger when the directive condition was changed. * @param func The watcher callback function. * @param context The execute context of watcher callback. - * @param args The arguments of watcher callabck function. + * @param args The arguments of watcher callback function. * @param argsSize the arguments size of watcher callback function. * @return The return value when the watcher callback was executed. */ diff --git a/src/core/jsi/internal/jsi_internal.h b/frameworks/src/core/jsi/internal/jsi_internal.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/jsi/internal/jsi_internal.h rename to frameworks/src/core/jsi/internal/jsi_internal.h diff --git a/src/core/jsi/jsi.cpp b/frameworks/src/core/jsi/jsi.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/jsi/jsi.cpp rename to frameworks/src/core/jsi/jsi.cpp diff --git a/src/core/directive/BUILD.gn b/frameworks/src/core/jsi/test/unittest/BUILD.gn similarity index 53% rename from src/core/directive/BUILD.gn rename to frameworks/src/core/jsi/test/unittest/BUILD.gn index 7bebaef..3fdc046 100755 --- a/src/core/directive/BUILD.gn +++ b/frameworks/src/core/jsi/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -#Copyright (c) 2020 Huawei Device Co., Ltd. +#Copyright (c) 2021 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 @@ -9,16 +9,19 @@ #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. +#limitations under the License. -source_set("directive") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "descriptor_utils.cpp", - "directive_watcher_callback.cpp" - ] - include_dirs = [ - ] +import("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +unittest("js_frameworks_test_jsiinterface") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "common/jsi_interface_tdd_test.cpp" ] + deps = ace_test_deps +} + +group("jsi_unittest") { + deps = [ ":js_frameworks_test_jsiinterface" ] } diff --git a/frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.cpp b/frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.cpp new file mode 100755 index 0000000..d4d2bb1 --- /dev/null +++ b/frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.cpp @@ -0,0 +1,1132 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "jsi_interface_tdd_test.h" +#include +#include +#include "acelite_config.h" +#include "js_debugger_config.h" + +namespace OHOS { +namespace ACELite { +static int8_t g_descValue = 0; + +JsiInterfaceTddTest::JsiInterfaceTddTest(){} + +void JsiInterfaceTddTest::SetUp() +{ + Debugger::GetInstance().SetupJSContext(); + jerry_init(JERRY_INIT_EMPTY); +} + +void JsiInterfaceTddTest::TearDown() +{ + jerry_cleanup(); + Debugger::GetInstance().ReleaseJSContext(); +} + +JSIValue JsiInterfaceTddTest::Function(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum) +{ + printf("Function called\n"); + return JSI::CreateUndefined(); +} + +JSIValue JsiInterfaceTddTest::Setter(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum) +{ + double newValue = JSI::ValueToNumber(args[0]); + g_descValue = (int8_t)newValue; + + printf("Setter called, setting: %d\n", g_descValue); + return JSI::CreateUndefined(); +} + +JSIValue JsiInterfaceTddTest::Getter(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum) +{ + g_descValue++; + printf("Getter called, returning: %d\n", g_descValue); + return JSI::CreateNumber(g_descValue); +} + +void JsiInterfaceTddTest::OnDestroy(int8_t statusCode) +{ + printf("OnDestroy called, statusCode=%d\n", statusCode); +} + +void JsiInterfaceTddTest::OnTerminate(int8_t statusCode) +{ + printf("OnTerminate called, statusCode=%d\n", statusCode); +} + +void JsiInterfaceTddTest::JSIInterfaceTest001() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateObject + */ + JSIValue object = JSI::CreateObject(); + /** + * @tc.expected: step1. ValueIsObject return true + */ + bool res = JSI::ValueIsObject(object); + if (res) { + printf("JSIInterfaceTest001 pass\n"); + } else { + printf("JSIInterfaceTest001 fail\n"); + } + EXPECT_TRUE(res); + JSI::ReleaseValue(object); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest002() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI GetGlobalObject + */ + JSIValue global = JSI::GetGlobalObject(); + /** + * @tc.expected: step1. global is not undefined + */ + if (JSI::ValueIsUndefined(global)) { + printf("JSIInterfaceTest002 fail\n"); + } else { + printf("JSIInterfaceTest002 pass\n"); + } + EXPECT_FALSE(JSI::ValueIsUndefined(global)); + JSI::ReleaseValue(global); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest003() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI GetJSHeapStatus + */ + JSHeapStatus status; + bool res = JSI::GetJSHeapStatus(status); + /** + * @tc.expected: step1. res is true + */ + if (res) { + printf("JSIInterfaceTest003 JSHeapStatus:totalBytes=%d allocBytes=%d peakAllocBytes=%d\n", status.totalBytes, + status.allocBytes, status.peakAllocBytes); + printf("JSIInterfaceTest003 pass\n"); + } else { + printf("JSIInterfaceTest003 fail\n"); + } + EXPECT_TRUE(res); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest004() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateArray + */ + uint32_t initLength = 10; + JSIValue array = JSI::CreateArray(initLength); + + /** + * @tc.steps: step2. call JSI ValueIsArray with Array object + */ + bool res1 = JSI::ValueIsArray(array); + JSIValue undefined = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsArray with Undefined object + */ + bool res2 = JSI::ValueIsArray(undefined); + + /** + * @tc.steps: step4. call JSI GetArrayLength + */ + uint32_t length = JSI::GetArrayLength(array); + /** + * @tc.expected: step2-step4. res1 = true, res2 = false and length = 10 + */ + if (res1 && !res2 && (length == initLength)) { + printf("JSIInterfaceTest004 pass\n"); + } else { + printf("JSIInterfaceTest004 fail\n"); + } + EXPECT_TRUE(res1 && !res2 && (length == initLength)); + JSI::ReleaseValueList(array, undefined); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest005() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateFunction + */ + JSIValue func = JSI::CreateFunction(Function); + + /** + * @tc.steps: step2. call JSI ValueIsFunction with Function object + */ + bool res1 = JSI::ValueIsFunction(func); + JSIValue undefined = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsFunction with Undefined object + */ + bool res2 = JSI::ValueIsFunction(undefined); + + /** + * @tc.steps: step4. call JSI CallFunction + */ + JSI::CallFunction(func, undefined, nullptr, 0); + /** + * @tc.expected: step2-step4. res1 = true, res2 = false and Function was called + */ + if (res1 && !res2) { + printf("JSIInterfaceTest005 pass\n"); + } else { + printf("JSIInterfaceTest005 fail\n"); + } + EXPECT_TRUE(res1 && !res2); + JSI::ReleaseValueList(func, undefined); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest006() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateFunction + */ + double initNum = 123; + JSIValue num = JSI::CreateNumber(initNum); + + /** + * @tc.steps: step2. call JSI ValueIsNumber with Number object + */ + bool res1 = JSI::ValueIsNumber(num); + JSIValue undefined = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsNumber with Undefined object + */ + bool res2 = JSI::ValueIsNumber(undefined); + + /** + * @tc.steps: step4. call JSI ValueToNumber + */ + int32_t numValue = (int32_t)JSI::ValueToNumber(num); + /** + * @tc.expected: step2-step4. res1 = true, res2 = false and numValue = 123 + */ + if (res1 && !res2 && numValue == (int32_t)initNum) { + printf("JSIInterfaceTest006 pass\n"); + } else { + printf("JSIInterfaceTest006 fail\n"); + } + EXPECT_TRUE(res1 && !res2 && numValue == (int32_t)initNum); + JSI::ReleaseValueList(num, undefined); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest007() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateString + */ + JSIValue str = JSI::CreateString("test"); + + /** + * @tc.steps: step2. call JSI ValueIsString with String object + */ + bool res1 = JSI::ValueIsString(str); + JSIValue undefined = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsString with Undefined object + */ + bool res2 = JSI::ValueIsString(undefined); + + /** + * @tc.steps: step4. call JSI ValueToString + */ + char *strValue = JSI::ValueToString(str); + /** + * @tc.expected: step2-step4. res1 = true, res2 = false and strValue = "test" + */ + if ((strValue != nullptr) && res1 && !res2 && !strcmp(strValue, "test")) { + printf("JSIInterfaceTest007 pass\n"); + } else { + printf("JSIInterfaceTest007 fail\n"); + } + EXPECT_TRUE((strValue != nullptr) && res1 && !res2 && !strcmp(strValue, "test")); + JSI::ReleaseValueList(str, undefined); + JSI::ReleaseString(strValue); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest008() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateBoolean + */ + JSIValue jsBool = JSI::CreateBoolean(true); + + /** + * @tc.steps: step2. call JSI ValueIsBoolean with Boolean object + */ + bool res1 = JSI::ValueIsBoolean(jsBool); + JSIValue undefined = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsBoolean with Undefined object + */ + bool res2 = JSI::ValueIsBoolean(undefined); + + /** + * @tc.steps: step4. call JSI ValueToBoolean + */ + bool jsBoolValue = JSI::ValueToBoolean(jsBool); + /** + * @tc.expected: step2-step4. res1 = true, res2 = false and jsBoolValue = true + */ + if (res1 && !res2 && jsBoolValue) { + printf("JSIInterfaceTest008 pass\n"); + } else { + printf("JSIInterfaceTest008 fail\n"); + } + EXPECT_TRUE(res1 && !res2 && jsBoolValue); + JSI::ReleaseValueList(jsBool, undefined); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest009() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateUndefined + */ + JSIValue undef = JSI::CreateUndefined(); + + /** + * @tc.steps: step2. call JSI ValueIsUndefined with Undefined object + */ + bool res1 = JSI::ValueIsUndefined(undef); + JSIValue obj = JSI::CreateObject(); + + /** + * @tc.steps: step3. call JSI ValueIsUndefined with obj + */ + bool res2 = JSI::ValueIsUndefined(obj); + /** + * @tc.expected: step2-step3. res1 = true, res2 = false + */ + if (res1 && !res2) { + printf("JSIInterfaceTest009 pass\n"); + } else { + printf("JSIInterfaceTest009 fail\n"); + } + EXPECT_TRUE(res1 && !res2); + JSI::ReleaseValueList(undef, obj); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest010() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateNull + */ + JSIValue nullObj = JSI::CreateNull(); + + /** + * @tc.steps: step2. call JSI ValueIsNull with Null object + */ + bool res1 = JSI::ValueIsNull(nullObj); + JSIValue obj = JSI::CreateObject(); + + /** + * @tc.steps: step3. call JSI ValueIsNull with obj + */ + bool res2 = JSI::ValueIsNull(obj); + /** + * @tc.expected: step2-step3. res1 = true, res2 = false + */ + if (res1 && !res2) { + printf("JSIInterfaceTest010 pass\n"); + } else { + printf("JSIInterfaceTest010 fail\n"); + } + EXPECT_TRUE(res1 && !res2); + JSI::ReleaseValueList(nullObj, obj); + TDD_CASE_END(); +} + +#if ENABLED(JS_FWK_SYMBOL) +void JsiInterfaceTddTest::JSIInterfaceTest011() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateSymbol + */ + JSIValue strValue = JSI::CreateString("Symbol description string"); + JSIValue symbol = JSI::CreateSymbol(strValue); + + /** + * @tc.steps: step2. call JSI ValueIsSymbol with Symbol object + */ + bool res1 = JSI::ValueIsSymbol(symbol); + JSIValue undef = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsSymbol with undef + */ + bool res2 = JSI::ValueIsSymbol(undef); + /** + * @tc.expected: step2-step3. res1 = true, res2 = false + */ + if (res1 && !res2) { + printf("JSIInterfaceTest011 pass\n"); + } else { + printf("JSIInterfaceTest011 fail\n"); + } + EXPECT_TRUE(res1 && !res2); + JSI::ReleaseValueList(strValue, symbol); + TDD_CASE_END(); +} +#endif // ENABLED(JS_FWK_SYMBOL) + +void JsiInterfaceTddTest::JSIInterfaceTest012() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateObject + */ + JSIValue obj = JSI::CreateObject(); + + /** + * @tc.steps: step2. call JSI ValueIsObject with obj + */ + bool res1 = JSI::ValueIsObject(obj); + JSIValue undef = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsObject with undef + */ + bool res2 = JSI::ValueIsObject(undef); + /** + * @tc.expected: step2-step3. res1 = true, res2 = false + */ + if (!res1 || res2) { + printf("JSIInterfaceTest012 fail\n"); + } + EXPECT_FALSE(!res1 || res2); + + /** + * @tc.steps: step4. call JSI AcquireValue + */ + JSIValue acquire = JSI::AcquireValue(obj); + if (acquire != undef) { + printf("JSIInterfaceTest012 pass\n"); + } + EXPECT_TRUE(acquire != undef); + /** + * @tc.steps: step5. call JSI ReleaseValue on acquire + */ + JSI::ReleaseValue(acquire); + /** + * @tc.expected: step5. no exception log + */ + JSI::ReleaseValueList(obj, undef); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest013() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI JsonParse + */ + JSIValue jsonValue = JSI::JsonParse("{\"key1\":\"value1\",\"key2\":\"value2\"}"); + + /** + * @tc.steps: step2. call JSI ValueIsObject with obj + */ + char *jsonStr = JSI::JsonStringify(jsonValue); + /** + * @tc.expected: step2. jsonStr = "{\"key1\":\"value1\",\"key2\":\"value2\"}" + */ + if ((jsonStr != nullptr) && + !strcmp(jsonStr, "{\"key1\":\"value1\",\"key2\":\"value2\"}")) { + printf("JSIInterfaceTest013 pass\n"); + } else { + printf("JSIInterfaceTest013 fail\n"); + } + EXPECT_TRUE((jsonStr != nullptr) && + !strcmp(jsonStr, "{\"key1\":\"value1\",\"key2\":\"value2\"}")); + JSI::ReleaseValue(jsonValue); + JSI::ReleaseString(jsonStr); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest014() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI SetNumberProperty + */ + JSIValue obj = JSI::CreateObject(); + double initNum = 123; + JSI::SetNumberProperty(obj, "num", initNum); + + /** + * @tc.steps: step2. call JSI GetNumberProperty + */ + int32_t num = (int32_t)JSI::GetNumberProperty(obj, "num"); + /** + * @tc.expected: step2. num = 123 + */ + if (num == (int32_t)initNum) { + printf("JSIInterfaceTest014 pass\n"); + } else { + printf("JSIInterfaceTest014 fail\n"); + } + EXPECT_TRUE(num == (int32_t)initNum); + JSI::ReleaseValue(obj); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest015() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI SetBooleanProperty + */ + JSIValue obj = JSI::CreateObject(); + JSI::SetBooleanProperty(obj, "bool", true); + + /** + * @tc.steps: step2. call JSI GetBooleanProperty + */ + bool boolValue = JSI::GetBooleanProperty(obj, "bool"); + /** + * @tc.expected: step2. boolValue = true + */ + if (boolValue) { + printf("JSIInterfaceTest015 pass\n"); + } else { + printf("JSIInterfaceTest015 fail\n"); + } + EXPECT_TRUE(boolValue); + JSI::ReleaseValue(obj); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest016() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI SetStringProperty + */ + JSIValue obj = JSI::CreateObject(); + JSI::SetStringProperty(obj, "string", "test"); + + /** + * @tc.steps: step2. call JSI GetStringProperty + */ + char *str = JSI::GetStringProperty(obj, "string"); + /** + * @tc.expected: step2. str = "test" + */ + if (str != nullptr && !strcmp(str, "test")) { + printf("JSIInterfaceTest016 pass\n"); + } else { + printf("JSIInterfaceTest016 fail\n"); + } + EXPECT_TRUE(str != nullptr && !strcmp(str, "test")); + JSI::ReleaseValue(obj); + JSI::ReleaseString(str); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest017() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI SetPropertyByIndex + */ + uint32_t initLength = 2; + double initNum = 123; + JSIValue array = JSI::CreateArray(initLength); + JSIValue numValue = JSI::CreateNumber(initNum); + JSIValue strValue = JSI::CreateString("test"); + JSI::SetPropertyByIndex(array, 0, numValue); + JSI::SetPropertyByIndex(array, 1, strValue); + + /** + * @tc.steps: step2. call JSI GetPropertyByIndex + */ + JSIValue numValueGet = JSI::GetPropertyByIndex(array, 0); + JSIValue strValueGet = JSI::GetPropertyByIndex(array, 1); + int32_t num = (int32_t)JSI::ValueToNumber(numValueGet); + char *str = JSI::ValueToString(strValueGet); + /** + * @tc.expected: step2. str = "test", num = 123 + */ + if ((str != nullptr) && !strcmp(str, "test") && (num == (int32_t)initNum)) { + printf("JSIInterfaceTest017 pass\n"); + } else { + printf("JSIInterfaceTest017 fail\n"); + } + EXPECT_TRUE((str != nullptr) && !strcmp(str, "test") && (num == (int32_t)initNum)); + JSI::ReleaseValueList(array, numValue, strValue, numValueGet, strValueGet); + JSI::ReleaseString(str); + TDD_CASE_END(); +} + +#if ENABLED(JS_FWK_TYPEDARRAY) +void JsiInterfaceTddTest::JSIInterfaceTest018() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. call JSI CreateArrayBuffer + */ + uint8_t *ptr = nullptr; + size_t initLength = 2; + uint8_t value1 = 128; + uint8_t value2 = 255; + JSIValue buffer = JSI::CreateArrayBuffer(initLength, ptr); + if (!ptr) { + JSI::ReleaseValue(buffer); + printf("JSIInterfaceTest018 fail\n"); + EXPECT_TRUE(false); + return; + } + ptr[0] = value1; + ptr[1] = value2; + JSIValue undef = JSI::CreateUndefined(); + + /** + * @tc.steps: step2. call JSI ValueIsArrayBuffer + */ + bool res1 = JSI::ValueIsArrayBuffer(buffer); + + /** + * @tc.steps: step3. call JSI ValueIsArrayBuffer with undef + */ + bool res2 = JSI::ValueIsArrayBuffer(undef); + + /** + * @tc.steps: step4. call JSI GetArrayBufferInfo + */ + size_t length; + uint8_t *ptr2 = JSI::GetArrayBufferInfo(buffer, length); + /** + * @tc.expected: step2-step4. res1 = true, res2 = false, length = 2 + */ + if ((ptr2 != nullptr) && res1 && !res2 && (length == initLength) && (ptr2[0] == value1) && (ptr2[1] == value2)) { + printf("JSIInterfaceTest018 pass\n"); + } else { + printf("JSIInterfaceTest018 fail\n"); + } + EXPECT_TRUE((ptr2 != nullptr) && res1 && !res2 && (length == initLength) && (ptr2[0] == value1) && + (ptr2[1] == value2)); + JSI::ReleaseValueList(buffer, undef); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest019() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. create an ArrayBuffer + */ + uint8_t *ptr = nullptr; + size_t initLength = 4; + uint8_t value1 = 128; + uint8_t value2 = 255; + size_t initOffset = 2; + JSIValue buffer = JSI::CreateArrayBuffer(initLength, ptr); + if (!ptr) { + JSI::ReleaseValue(buffer); + printf("JSIInterfaceTest019 fail\n"); + EXPECT_TRUE(false); + return; + } + ptr[0] = 0; + ptr[1] = 0; + ptr[initOffset] = value1; + ptr[initOffset + 1] = value2; + + /** + * @tc.steps: step2. create an TypedArray + */ + size_t byteLength = 2; + JSIValue typedArray = JSI::CreateTypedArray(TypedArrayType::JSI_UINT8_ARRAY, byteLength, buffer, initOffset); + JSI::ReleaseValue(buffer); + JSIValue undef = JSI::CreateUndefined(); + + /** + * @tc.steps: step3. call JSI ValueIsTypedArray + */ + bool res1 = JSI::ValueIsTypedArray(typedArray); + + /** + * @tc.steps: step4. call JSI ValueIsTypedArray with undef + */ + bool res2 = JSI::ValueIsTypedArray(undef); + + /** + * @tc.steps: step5. call JSI GetTypedArrayInfo + */ + TypedArrayType type; + size_t length, offset; + JSIValue arrayBuffer; + uint8_t *ptr2 = JSI::GetTypedArrayInfo(typedArray, type, length, arrayBuffer, offset); + /** + * @tc.expected: step3-step5. res1 = true, res2 = false, typedArray params are correct + */ + if (res1 && !res2 && (type == TypedArrayType::JSI_UINT8_ARRAY) && (length == byteLength) && + (offset == initOffset) && ptr2 != nullptr && (ptr2[offset] == value1) && + (ptr2[offset + 1] == value2)) { + printf("JSIInterfaceTest019 pass\n"); + } else { + printf("JSIInterfaceTest019 fail\n"); + } + EXPECT_TRUE(res1 && !res2 && (type == TypedArrayType::JSI_UINT8_ARRAY) && (length == byteLength) && + (offset == initOffset) && ptr2 != nullptr && (ptr2[offset] == value1) && (ptr2[offset + 1] == value2)); + + JSI::ReleaseValueList(typedArray, undef, arrayBuffer); + TDD_CASE_END(); +} +#endif // ENABLED(JS_FWK_TYPEDARRAY) + +void JsiInterfaceTddTest::JSIInterfaceTest020() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. initial JSPropertyDescriptor object + */ + JSPropertyDescriptor desc; + const char *propName = "propTest"; + desc.getter = Getter; + desc.setter = Setter; + + /** + * @tc.steps: step2. call JSI DefineNamedProperty + */ + JSIValue globalObj = JSI::GetGlobalObject(); + bool res = JSI::DefineNamedProperty(globalObj, propName, desc); + JSI::ReleaseValue(globalObj); + + /** + * @tc.steps: step3. run an example js code to use the getter/setter + */ + const char *jerrySrc = "this.propTest; this.propTest; this.propTest = 4; this.propTest"; + jerry_value_t evalResult = + jerry_eval(reinterpret_cast(jerrySrc), strlen(jerrySrc), JERRY_PARSE_NO_OPTS); + int8_t num = jerry_get_number_value(evalResult); + uint8_t expectedNum = 5; + /** + * @tc.expected: step3. res = true, num = 5 + */ + if (res && (num == expectedNum)) { + printf("JSIInterfaceTest020 pass\n"); + } else { + printf("JSIInterfaceTest020 fail\n"); + } + EXPECT_TRUE(res && (num == expectedNum)); + jerry_release_value(evalResult); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest021() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. create an object and set properties + */ + JSIValue object = JSI::CreateObject(); + const char *key1 = "key1"; + const char *key2 = "key2"; + JSI::SetNumberProperty(object, key1, 0); + JSI::SetNumberProperty(object, key2, 1); + + /** + * @tc.steps: step2. call JSI GetObjectKeys + */ + JSIValue keys = JSI::GetObjectKeys(object); + JSIValue keyValue1 = JSI::GetPropertyByIndex(keys, 0); + JSIValue keyValue2 = JSI::GetPropertyByIndex(keys, 1); + char *keyAcquired1 = JSI::ValueToString(keyValue1); + char *keyAcquired2 = JSI::ValueToString(keyValue2); + int32_t num1 = JSI::GetNumberProperty(object, keyAcquired1); + int32_t num2 = JSI::GetNumberProperty(object, keyAcquired2); + /** + * @tc.expected: step2. keyAcquired1 = key1, num1 = 0, keyAcquired2 = key2, num1 = 1 + */ + if (keyAcquired1 != nullptr && !strcmp(keyAcquired1, key1) && + num1 == 0 && keyAcquired2 != nullptr && + !strcmp(keyAcquired2, key2) && num2 == 1) { + printf("JSIInterfaceTest021 pass\n"); + } else { + printf("JSIInterfaceTest021 fail\n"); + } + EXPECT_TRUE(keyAcquired1 != nullptr && !strcmp(keyAcquired1, key1) && num1 == 0 && + keyAcquired2 != nullptr && !strcmp(keyAcquired2, key2) && num2 == 1); + + JSI::ReleaseValueList(object, keys, keyValue1, keyValue2); + JSI::ReleaseString(keyAcquired1); + JSI::ReleaseString(keyAcquired2); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest022() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. create an object and call JSI SetOnDestroy + */ + JSIValue object = JSI::CreateObject(); + JSI::SetOnDestroy(object, OnDestroy); + + /** + * @tc.steps: step2. get destroy callback from object + */ + const char *name = "onDestroyHandler"; + JSIValue funObj = JSI::GetNamedProperty(object, name); + void *nativePtr = nullptr; + jerry_value_t jObj = (jerry_value_t)(uintptr_t)(funObj); + bool exist = jerry_get_object_native_pointer(jObj, &nativePtr, nullptr); + /** + * @tc.expected: step2. invoke callback and the OnDestroy function will be called + */ + if (!exist || (nativePtr == nullptr)) { + printf("JSIInterfaceTest022 fail\n"); + } else { + JsiCallback callback = reinterpret_cast(nativePtr); + (*callback)(JSI_ERR_OK); + printf("JSIInterfaceTest022 pass\n"); + } + EXPECT_TRUE(nativePtr != nullptr); + jerry_delete_object_native_pointer(jObj, nullptr); + JSI::ReleaseValueList(object, funObj); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::JSIInterfaceTest023() +{ + TDD_CASE_BEGIN(); + /** + * @tc.steps: step1. create an object and call JSI SetOnTerminate + */ + JSIValue object = JSI::CreateObject(); + JSI::SetOnTerminate(object, OnTerminate); + + /** + * @tc.steps: step2. get terminate callback from object + */ + const char *name = "onTerminateHandler"; + JSIValue funObj = JSI::GetNamedProperty(object, name); + void *nativePtr = nullptr; + jerry_value_t jObj = (jerry_value_t)(uintptr_t)(funObj); + bool exist = jerry_get_object_native_pointer(jObj, &nativePtr, nullptr); + /** + * @tc.expected: step2. invoke callback and the OnTerminate function will be called + */ + if (!exist || (nativePtr == nullptr)) { + printf("JSIInterfaceTest023 fail\n"); + } else { + JsiCallback callback = reinterpret_cast(nativePtr); + (*callback)(JSI_ERR_OK); + printf("JSIInterfaceTest023 pass\n"); + } + EXPECT_TRUE(nativePtr != nullptr); + jerry_delete_object_native_pointer(jObj, nullptr); + JSI::ReleaseValueList(object, funObj); + TDD_CASE_END(); +} + +void JsiInterfaceTddTest::RunTests() +{ + JSIInterfaceTest001(); + JSIInterfaceTest002(); + JSIInterfaceTest003(); + JSIInterfaceTest004(); + JSIInterfaceTest005(); + JSIInterfaceTest006(); + JSIInterfaceTest007(); + JSIInterfaceTest008(); + JSIInterfaceTest009(); + JSIInterfaceTest010(); +#if ENABLED(JS_FWK_SYMBOL) + JSIInterfaceTest011(); +#endif // ENABLED(JS_FWK_SYMBOL) + JSIInterfaceTest012(); + JSIInterfaceTest013(); + JSIInterfaceTest014(); + JSIInterfaceTest015(); + JSIInterfaceTest016(); + JSIInterfaceTest017(); +#if ENABLED(JS_FWK_TYPEDARRAY) + JSIInterfaceTest018(); + JSIInterfaceTest019(); +#endif // ENABLED(JS_FWK_TYPEDARRAY) + JSIInterfaceTest020(); + JSIInterfaceTest021(); + JSIInterfaceTest022(); + JSIInterfaceTest023(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: JSIInterfaceTest001 + * @tc.desc: Verify JSI interface CreateObject. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test001, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest001(); +} + +/** + * @tc.name: JSIInterfaceTest002 + * @tc.desc: Verify JSI interface GetGlobalObject. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test002, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest002(); +} + +/** + * @tc.name: JSIInterfaceTest003 + * @tc.desc: Verify JSI interface GetJSHeapStatus. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test003, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest003(); +} + +/** + * @tc.name: JSIInterfaceTest004 + * @tc.desc: Verify JSI interface related to Array object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test004, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest004(); +} + +/** + * @tc.name: JSIInterfaceTest005 + * @tc.desc: Verify JSI interface related to Function object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test005, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest005(); +} + +/** + * @tc.name: JSIInterfaceTest006 + * @tc.desc: Verify JSI interface related to Number object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test006, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest006(); +} + +/** + * @tc.name: JSIInterfaceTest007 + * @tc.desc: Verify JSI interface related to String object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test007, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest007(); +} + +/** + * @tc.name: JSIInterfaceTest008 + * @tc.desc: Verify JSI interface related to Boolean object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test008, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest008(); +} + +/** + * @tc.name: JSIInterfaceTest009 + * @tc.desc: Verify JSI interface related to Undefined object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test009, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest009(); +} + +/** + * @tc.name: JSIInterfaceTest010 + * @tc.desc: Verify JSI interface related to Null object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test010, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest010(); +} + +#if ENABLED(JS_FWK_SYMBOL) +/** + * @tc.name: JSIInterfaceTest011 + * @tc.desc: Verify JSI interface related to Symbol object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test011, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest011(); +} +#endif // ENABLED(JS_FWK_SYMBOL) + +/** + * @tc.name: JSIInterfaceTest012 + * @tc.desc: Verify JSI interface related to JS Object. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test012, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest012(); +} + +/** + * @tc.name: JSIInterfaceTest013 + * @tc.desc: Verify JSI interface related to JS JSON. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test013, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest013(); +} + +/** + * @tc.name: JSIInterfaceTest014 + * @tc.desc: Verify JSI interface related to JS Number property. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test014, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest014(); +} + +/** + * @tc.name: JSIInterfaceTest015 + * @tc.desc: Verify JSI interface related to JS Boolean property. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test015, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest015(); +} + +/** + * @tc.name: JSIInterfaceTest016 + * @tc.desc: Verify JSI interface related to JS String property. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test016, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest016(); +} + +/** + * @tc.name: JSIInterfaceTest017 + * @tc.desc: Verify JSI interface related to JS property with index. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test017, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest017(); +} + +#if ENABLED(JS_FWK_TYPEDARRAY) +/** + * @tc.name: JSIInterfaceTest018 + * @tc.desc: Verify JSI interface related to JS ArrayBuffer. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test018, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest018(); +} + +/** + * @tc.name: JSIInterfaceTest019 + * @tc.desc: Verify JSI interface related to JS TypedArray. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test019, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest019(); +} +#endif + +/** + * @tc.name: JSIInterfaceTest020 + * @tc.desc: Verify JSI interface related to JS descriptor. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test020, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest020(); +} + +/** + * @tc.name: JSIInterfaceTest021 + * @tc.desc: Verify JSI interface GetObjectKeys. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test021, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest021(); +} + +/** + * @tc.name: JSIInterfaceTest022 + * @tc.desc: Verify JSI interfaces related to OnDestroy callback. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test022, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest022(); +} + +/** + * @tc.name: JSIInterfaceTest023 + * @tc.desc: Verify JSI interfaces related to OnTerminate callback. + * @tc.require: AR000DSEHC + */ +HWTEST_F(JsiInterfaceTddTest, test023, TestSize.Level1) +{ + JsiInterfaceTddTest::JSIInterfaceTest023(); +} +#endif +} +} \ No newline at end of file diff --git a/frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.h b/frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.h new file mode 100755 index 0000000..63f7218 --- /dev/null +++ b/frameworks/src/core/jsi/test/unittest/common/jsi_interface_tdd_test.h @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef ACELITE_JSI_INTERFACE_TDD_TEST_H +#define ACELITE_JSI_INTERFACE_TDD_TEST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#endif + +#include "acelite_config.h" +#include "jerryscript.h" +#include "js_config.h" +#include "jsi.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class JsiInterfaceTddTest : public testing::Test { +#else +class JsiInterfaceTddTest { +#endif +public: + JsiInterfaceTddTest(); + ~JsiInterfaceTddTest(){}; + void SetUp(); + void TearDown(); + static void OnDestroy(int8_t statusCode); + static void OnTerminate(int8_t statusCode); + static JSIValue Setter(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum); + static JSIValue Getter(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum); + static JSIValue Function(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum); + void JSIInterfaceTest001(); + void JSIInterfaceTest002(); + void JSIInterfaceTest003(); + void JSIInterfaceTest004(); + void JSIInterfaceTest005(); + void JSIInterfaceTest006(); + void JSIInterfaceTest007(); + void JSIInterfaceTest008(); + void JSIInterfaceTest009(); + void JSIInterfaceTest010(); +#if ENABLED(JS_FWK_SYMBOL) + void JSIInterfaceTest011(); +#endif // ENABLED(JS_FWK_SYMBOL) + void JSIInterfaceTest012(); + void JSIInterfaceTest013(); + void JSIInterfaceTest014(); + void JSIInterfaceTest015(); + void JSIInterfaceTest016(); + void JSIInterfaceTest017(); +#if ENABLED(JS_FWK_TYPEDARRAY) + void JSIInterfaceTest018(); + void JSIInterfaceTest019(); +#endif // ENABLED(JS_FWK_TYPEDARRAY) + void JSIInterfaceTest020(); + void JSIInterfaceTest021(); + void JSIInterfaceTest022(); + void JSIInterfaceTest023(); + void RunTests(); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // ACELITE_JSI_INTERFACE_TDD_TEST_H diff --git a/src/core/modules/app_module.cpp b/frameworks/src/core/modules/app_module.cpp old mode 100755 new mode 100644 similarity index 98% rename from src/core/modules/app_module.cpp rename to frameworks/src/core/modules/app_module.cpp index 17776f0..a27b7cd --- a/src/core/modules/app_module.cpp +++ b/frameworks/src/core/modules/app_module.cpp @@ -74,7 +74,7 @@ cJSON *AppModule::ReadManifest() } uint32_t fileSize = 0; - char *manifestContent = ReadFile(manifestPath, &fileSize, false); + char *manifestContent = ReadFile(manifestPath, fileSize, false); ace_free(manifestPath); manifestPath = nullptr; diff --git a/src/core/modules/app_module.h b/frameworks/src/core/modules/app_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/app_module.h rename to frameworks/src/core/modules/app_module.h diff --git a/src/core/modules/dfx_module.cpp b/frameworks/src/core/modules/dfx_module.cpp similarity index 91% rename from src/core/modules/dfx_module.cpp rename to frameworks/src/core/modules/dfx_module.cpp index a199a71..e4a4fec 100755 --- a/src/core/modules/dfx_module.cpp +++ b/frameworks/src/core/modules/dfx_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -19,7 +19,9 @@ #ifdef FEATURE_ACELITE_MC_DFX_MODULE #include "ui_snapshot.h" #elif defined(FEATURE_ACELITE_LITE_DFX_MODULE) +#ifdef __LITEOS_A__ #include "ability_env.h" +#endif #include "ace_mem_base.h" #include "js_fwk_common.h" #include "ui_screenshot.h" @@ -71,8 +73,12 @@ JSIValue DfxModule::Screenshot(const JSIValue thisVal, const JSIValue *args, uin return retVal; #elif defined(FEATURE_ACELITE_LITE_DFX_MODULE) JSIValue retVal = JSI::CreateBoolean(true); - const char * const dataPath = GetDataPath(); - char *path = RelocateResourceFilePath(dataPath, SCREEN_SNAP_PATH); +#ifdef __LITEOS_A__ + const char * const savingPath = GetDataPath(); +#else + const char * const savingPath = "user/log"; +#endif + char *path = RelocateResourceFilePath(savingPath, SCREEN_SNAP_PATH); // uikit will deal with if path is null if ((UIScreenshot::GetInstance() == nullptr) || (!UIScreenshot::GetInstance()->ScreenshotToFile(path))) { HILOG_ERROR(HILOG_MODULE_ACE, "screenshot failed"); @@ -96,8 +102,12 @@ JSIValue DfxModule::DumpDomTree(const JSIValue thisVal, const JSIValue *args, ui char *viewId = GetDomViewId(args); #ifdef FEATURE_ACELITE_LITE_DFX_MODULE - const char * const dataPath = GetDataPath(); - char *path = RelocateResourceFilePath(dataPath, DOM_TREE_PATH); +#ifdef __LITEOS_A__ + const char * const savingPath = GetDataPath(); +#else + const char * const savingPath = "user/log"; +#endif + char *path = RelocateResourceFilePath(savingPath, DOM_TREE_PATH); // uikit will deal with if path and viewid is null if ((UIDumpDomTree::GetInstance() != nullptr) && (UIDumpDomTree::GetInstance()->DumpDomTree(viewId, path))) { #else @@ -177,12 +187,11 @@ JSIValue DfxModule::InjectPointEvent(const JSIValue *args, EventDataType type) (EventInjector::GetInstance()->SetInjectEvent(data, realLen, type))) { ace_free(data); return retVal; - } else { - HILOG_ERROR(HILOG_MODULE_ACE, "simulator point event error"); - ace_free(data); - JSI::ReleaseValue(retVal); - return JSI::CreateBoolean(false); } + HILOG_ERROR(HILOG_MODULE_ACE, "simulator point event error"); + ace_free(data); + JSI::ReleaseValue(retVal); + return JSI::CreateBoolean(false); } JSIValue DfxModule::InjectEvent(const JSIValue thisVal, const JSIValue *args, uint8_t argsNum) @@ -206,9 +215,8 @@ JSIValue DfxModule::InjectEvent(const JSIValue thisVal, const JSIValue *args, ui return JSI::CreateBoolean(false); } return InjectPointEvent(args, type); - } else { - HILOG_ERROR(HILOG_MODULE_ACE, "only support point event"); } + HILOG_ERROR(HILOG_MODULE_ACE, "only support point event"); JSI::ReleaseString(eventType); return JSI::CreateBoolean(false); diff --git a/src/core/modules/dfx_module.h b/frameworks/src/core/modules/dfx_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/dfx_module.h rename to frameworks/src/core/modules/dfx_module.h diff --git a/frameworks/src/core/modules/dialog_module.cpp b/frameworks/src/core/modules/dialog_module.cpp new file mode 100755 index 0000000..9cc8e13 --- /dev/null +++ b/frameworks/src/core/modules/dialog_module.cpp @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "acelite_config.h" +#ifdef FEATURE_MODULE_DIALOG +#include "dialog_module.h" +#include "ace_log.h" +#include "js_profiler.h" +#include "jsi/internal/jsi_internal.h" +#include "ui_dialog.h" + +#include "ui_scroll_view.h" +#include "root_view.h" +#include "screen.h" + +namespace OHOS { +namespace ACELite { +const char * const DialogModule::TITLE_KEY = "title"; +const char * const DialogModule::MSG_KEY = "message"; +const char * const DialogModule::BUTTON_KEY = "buttons"; +const char * const DialogModule::SUCCESS_FUNC_KEY = "success"; +const char * const DialogModule::CANCEL_FUNC_KEY = "cancel"; +const char * const DialogModule::COMPLETE_FUNC_KEY = "complete"; + +JSIValue DialogModule::ShowDialog(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum) +{ + // js calling allow argsNum > 1, but do not process. + if (argsNum < 1) { + HILOG_ERROR(HILOG_MODULE_ACE, "ShowDialog args num(%d) is invalid.", argsNum); + return AS_JSI_VALUE(jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("params should only be one object."))); + } + + // support show another dialog when first dialog showing. second dialog cover first one. + // click second dialog disappear, first one keep going showing + JSDialog *jsDialog = new JSDialog(); + if (jsDialog == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "dialog is nullptr"); + return AS_JSI_VALUE(jerry_create_error(JERRY_ERROR_TYPE, + reinterpret_cast("create dialog error."))); + } + + /* parse dialog title */ + char *dialogTitle = JSI::GetStringProperty(args[0], TITLE_KEY); + jsDialog->SetTitle(dialogTitle); + HILOG_INFO(HILOG_MODULE_ACE, "dialog title = %s", dialogTitle); + + /* parse dialog message */ + char *message = JSI::GetStringProperty(args[0], MSG_KEY); + jsDialog->SetMessage(message); + HILOG_INFO(HILOG_MODULE_ACE, "dialog message =%s", message); + + /* parse dialog button */ + JSIValue buttons = JSI::GetNamedProperty(args[0], BUTTON_KEY); + + /* parse dialog js function */ + JSIValue successFunc = JSI::GetNamedProperty(args[0], SUCCESS_FUNC_KEY); + JSIValue cancelFunc = JSI::GetNamedProperty(args[0], CANCEL_FUNC_KEY); + JSIValue completeFunc = JSI::GetNamedProperty(args[0], COMPLETE_FUNC_KEY); + + bool result = jsDialog->ShowDialog(thisVal, buttons, successFunc, cancelFunc, completeFunc); + if (!result) { + delete jsDialog; + jsDialog = nullptr; + } + + JSI::ReleaseValueList(buttons, successFunc, cancelFunc, completeFunc); + + return AS_JSI_VALUE(UNDEFINED); +} +} // namespace ACELite +} // namespace OHOS +#endif // FEATURE_MODULE_DIALOG diff --git a/frameworks/src/core/modules/dialog_module.h b/frameworks/src/core/modules/dialog_module.h new file mode 100755 index 0000000..5da154f --- /dev/null +++ b/frameworks/src/core/modules/dialog_module.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_DIALOG_MODULE_H +#define OHOS_ACELITE_DIALOG_MODULE_H + +#include "acelite_config.h" +#ifdef FEATURE_MODULE_DIALOG +#include "jsi.h" +#include "js_fwk_common.h" +#include "non_copyable.h" + +#include "ui_dialog.h" +#include "dialog/js_dialog.h" + +namespace OHOS { +namespace ACELite { +/** + * @brief: The module of dialog, show dialog in window + */ +class DialogModule final : public MemoryHeap { +public: + ACE_DISALLOW_COPY_AND_MOVE(DialogModule); + DialogModule() {} + ~DialogModule() {} + static JSIValue ShowDialog(const JSIValue thisVal, const JSIValue args[], uint8_t argsNum); + +private: + static const char * const TITLE_KEY; + static const char * const MSG_KEY; + static const char * const BUTTON_KEY; + static const char * const SUCCESS_FUNC_KEY; + static const char * const CANCEL_FUNC_KEY; + static const char * const COMPLETE_FUNC_KEY; +}; + +void InitDialogModule(JSIValue exports) +{ + JSI::SetModuleAPI(exports, "showDialog", DialogModule::ShowDialog); +} +} // namespace ACELite +} // namespace OHOS +#endif // FEATURE_MODULE_DIALOG +#endif // OHOS_ACELITE_DIALOG_MODULE_H \ No newline at end of file diff --git a/src/core/modules/maplejs/readme.txt b/frameworks/src/core/modules/maplejs/readme.txt similarity index 100% rename from src/core/modules/maplejs/readme.txt rename to frameworks/src/core/modules/maplejs/readme.txt diff --git a/src/core/modules/module_manager.cpp b/frameworks/src/core/modules/module_manager.cpp old mode 100755 new mode 100644 similarity index 93% rename from src/core/modules/module_manager.cpp rename to frameworks/src/core/modules/module_manager.cpp index cdd846f..0f69b4f --- a/src/core/modules/module_manager.cpp +++ b/frameworks/src/core/modules/module_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -28,14 +28,6 @@ namespace OHOS { namespace ACELite { -// external methods for JS modules -#ifdef FEATURE_PRODUCT_MODULE -extern const Module* GetProductModules(uint16_t& moduleCount); -#endif // FEATURE_PRODUCT_MODULE -#ifdef FEATURE_PRIVATE_MODULE -extern const PrivateModule* GetPrivateModules(uint16_t& moduleCount); -#endif // FEATURE_PRIVATE_MODULE - // Initialization of static variables JSIValue ModuleManager::requiredSystemModules = 0; @@ -53,14 +45,14 @@ JSIValue ModuleManager::RequireModule(const char * const moduleName) uint16_t moduleCount = sizeof(OHOS_MODULES) / sizeof(Module); moduleObj = GetModuleObject(name, OHOS_MODULES, moduleCount, requiredSystemModules); #ifdef FEATURE_PRODUCT_MODULE - if (JSI::ValueIsUndefined(moduleObj)) { + if ((JSI::ValueIsUndefined(moduleObj)) && (productModulesGetter_ != nullptr)) { uint16_t prodModCount; - const Module* prodModules = GetProductModules(prodModCount); + const Module* prodModules = productModulesGetter_(prodModCount); moduleObj = GetModuleObject(name, prodModules, prodModCount, requiredSystemModules); } #endif // FEATURE_PRODUCT_MODULE #ifdef FEATURE_PRIVATE_MODULE - if (JSI::ValueIsUndefined(moduleObj)) { + if ((JSI::ValueIsUndefined(moduleObj)) && (privateModulesGetter_ != nullptr)) { const char * const bundleName = JsAppContext::GetInstance()->GetCurrentBundleName(); moduleObj = GetModuleObject(name, nullptr, 0, requiredSystemModules, bundleName); } @@ -166,7 +158,8 @@ JSIValue ModuleManager::GetModuleObject(const char * const moduleName, const Mod #ifdef FEATURE_PRIVATE_MODULE else { uint16_t count; - const PrivateModule* privateModules = GetPrivateModules(count); + const PrivateModule *privateModules = + (privateModulesGetter_ != nullptr) ? privateModulesGetter_(count) : nullptr; if (privateModules == nullptr) { return JSI::CreateUndefined(); } @@ -340,5 +333,16 @@ JsiCallback ModuleManager::GetJsiCallback(JSIValue object, const char * const na void *callback = GetObjectNamedPointer(object, name); return reinterpret_cast(callback); } + + +void ModuleManager::SetProductModulesGetter(ProductModulesGetter getter) +{ + productModulesGetter_ = getter; +} + +void ModuleManager::SetPrivateModulesGetter(PrivateModulesGetter getter) +{ + privateModulesGetter_ = getter; +} } // namespace ACELite } // namespace OHOS diff --git a/src/core/modules/module_manager.h b/frameworks/src/core/modules/module_manager.h old mode 100755 new mode 100644 similarity index 87% rename from src/core/modules/module_manager.h rename to frameworks/src/core/modules/module_manager.h index c3d0bcd..ec7908b --- a/src/core/modules/module_manager.h +++ b/frameworks/src/core/modules/module_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -18,6 +18,7 @@ #include "jsi.h" #include "non_copyable.h" +#include "product_adapter.h" namespace OHOS { namespace ACELite { @@ -60,6 +61,19 @@ public: */ void OnTerminate(); + /** + * @brief: Set product modules getter hook. + * + * @param: the hook + */ + void SetProductModulesGetter(ProductModulesGetter getter); + /** + * @brief: Set private modules getter hook. + * + * @param: the hook + */ + void SetPrivateModulesGetter(PrivateModulesGetter getter); + private: struct CallbackNode : public MemoryHeap { ACE_DISALLOW_COPY_AND_MOVE(CallbackNode); @@ -78,7 +92,13 @@ private: struct CallbackNode *next; }; - ModuleManager() : onDestroyHead_(nullptr), onTerminateHead_(nullptr) {} + ModuleManager() + : onDestroyHead_(nullptr), + onTerminateHead_(nullptr), + productModulesGetter_(nullptr), + privateModulesGetter_(nullptr) + { + } virtual ~ModuleManager() {} /** @@ -129,6 +149,8 @@ private: CallbackNode *onDestroyHead_; CallbackNode *onTerminateHead_; + ProductModulesGetter productModulesGetter_; + PrivateModulesGetter privateModulesGetter_; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/modules/ohos_module_config.h b/frameworks/src/core/modules/ohos_module_config.h similarity index 83% rename from src/core/modules/ohos_module_config.h rename to frameworks/src/core/modules/ohos_module_config.h index ea61b7f..f42f058 100755 --- a/src/core/modules/ohos_module_config.h +++ b/frameworks/src/core/modules/ohos_module_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -29,10 +29,15 @@ extern void InitAppModule(JSIValue exports); #ifdef FEATURE_MODULE_AUDIO extern void InitAudioModule(JSIValue exports); #endif // FEATURE_MODULE_AUDIO +#ifdef FEATURE_ACELITE_DFX_MODULE extern void InitDfxModule(JSIValue exports); +#endif // FEATURE_ACELITE_DFX_MODULE #ifdef ENABLE_MODULE_CIPHER extern void InitCipherModule(JSIValue exports); #endif +#ifdef FEATURE_MODULE_DIALOG +extern void InitDialogModule(JSIValue exports); +#endif // FEATURE_MODULE_DIALOG #ifdef FEATURE_MODULE_STORAGE extern void InitNativeApiFs(JSIValue exports); @@ -64,6 +69,10 @@ extern void InitBatteryModule(JSIValue exports); extern void InitLocaleModule(JSIValue exports); #endif +#ifdef FEATURE_ACELITE_SYSTEM_CAPABILITY +extern void InitCapabilityModule(JSIValue exports); +#endif + // Config information for built-in JS modules of OHOS platform const Module OHOS_MODULES[] = { #ifdef ENABLE_MODULE_REQUIRE_TEST @@ -73,11 +82,16 @@ const Module OHOS_MODULES[] = { #ifdef FEATURE_MODULE_AUDIO {"audio", InitAudioModule}, #endif // FEATURE_MODULE_AUDIO +#ifdef FEATURE_ACELITE_DFX_MODULE {"dfx", InitDfxModule}, +#endif // FEATURE_ACELITE_DFX_MODULE {"router", InitRouterModule}, #ifdef ENABLE_MODULE_CIPHER {"cipher", InitCipherModule}, #endif +#ifdef FEATURE_MODULE_DIALOG + {"prompt", InitDialogModule}, +#endif // FEATURE_MODULE_DIALOG #ifdef FEATURE_MODULE_STORAGE {"file", InitNativeApiFs}, @@ -102,6 +116,9 @@ const Module OHOS_MODULES[] = { #ifdef FEATURE_MODULE_CONFIGURATION {"configuration", InitLocaleModule}, #endif +#ifdef FEATURE_ACELITE_SYSTEM_CAPABILITY + {"capability", InitCapabilityModule}, +#endif }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/modules/presets/cjson_parser.cpp b/frameworks/src/core/modules/presets/cjson_parser.cpp similarity index 51% rename from src/core/modules/presets/cjson_parser.cpp rename to frameworks/src/core/modules/presets/cjson_parser.cpp index 4cfd9b1..c525789 100755 --- a/src/core/modules/presets/cjson_parser.cpp +++ b/frameworks/src/core/modules/presets/cjson_parser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -23,25 +23,26 @@ #else #include "file.h" #endif -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif +#include "string_util.h" #include namespace OHOS { namespace ACELite { CJSONParser::CJSONParser() - : curFileIndex_(0), - totalFiles_(0), + : isCached_(false), + isAllocated_(true), + startPos_(-1), countries_(nullptr), language_(nullptr), filePath_(nullptr), - fileList_(nullptr) + languageFile_(nullptr) { char left = '{'; leftDelemeter_ = left; char right = '}'; rightDelemeter_ = right; + usedOffset_ = sizeof(uint32_t) * MAX_KEY_NUM; } bool CJSONParser::Init() @@ -49,151 +50,29 @@ bool CJSONParser::Init() const char * const filePath = JsAppContext::GetInstance()->GetCurrentAbilityPath(); const char * const folderName = "i18n"; filePath_ = RelocateResourceFilePath(filePath, folderName); + void *ram = ace_malloc(LOCALIZATION_SIZE); + if (ram == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc cache ram failed"); + isAllocated_ = false; + return false; + } + startPos_ = reinterpret_cast(ram); return (filePath_ != nullptr); } -bool CJSONParser::ChangeJsonFile(cJSON *¤tItem) -{ - if (currentItem != nullptr) { // if the currentItem is not null, it must be free - cJSON_Delete(currentItem); - currentItem = nullptr; - } - SetLanguage(); // get the new locale string - if (totalFiles_ == 0) { - return false; - } - char *name = nullptr; - if (curFileIndex_ == totalFiles_) { - return false; - } else { - // read the next json resource file - name = GetNode(fileList_, curFileIndex_ + 1); - } - char *content = ReadJSFile(filePath_, name); - if (content == nullptr) { - currentItem = nullptr; - curFileIndex_++; - return true; - } - currentItem = cJSON_Parse(content); - ace_free(content); - content = nullptr; - // point to next file - curFileIndex_++; - return true; -} - -bool CJSONParser::GetFiles() -{ - ClearNode(fileList_); - totalFiles_ = 0; - if (language_ == nullptr) { - return false; - } - ListNode *languageFile = nullptr; // save language-XXX.json - ListNode *countryFile = nullptr; // save language-country-XXX.json -#if (defined(_WIN32) || defined(_WIN64)) - if (!ReadWinFile(languageFile, countryFile)) { - ClearNode(languageFile); - ClearNode(countryFile); - return false; - } -#else - if (!ReadFile(languageFile, countryFile)) { - ClearNode(languageFile); - ClearNode(countryFile); - return false; - } -#endif - SortFileName(fileList_); - SortFileName(languageFile); - SortFileName(countryFile); - const char *defaultFileName = "en-US.json"; // add the default file name - ListNode *defaultFile = new ListNode(); - if (defaultFile == nullptr) { - // release the list which stores atrget file name, the fileList_ release in destructor or next used time - ClearNode(languageFile); - ClearNode(countryFile); - return false; - } - defaultFile->value = SubStr(defaultFileName, 0, strlen(defaultFileName)); - totalFiles_++; - MergeList(countryFile, defaultFile); - MergeList(languageFile, countryFile); - MergeList(fileList_, languageFile); - return true; -} - -#if (!defined(_WIN32) && !defined(_WIN64)) -bool CJSONParser::ReadFile(ListNode *&languageFile, ListNode *&countryFile) -{ - void *files = FileOpenDir(filePath_); - FileDirentInfo info; - if (files == nullptr) { - return false; - } - bool result = true; - while ((FileReadDir(files, &info) == 0) && (totalFiles_ < UINT8_MAX)) { - if ((info.name == nullptr) || (strncmp(info.name, language_, strlen(language_)) != 0)) { - continue; - } - size_t infoNameLen = strlen(info.name); - if (infoNameLen >= NAME_LENGTH_MAX) { - break; - } - char *value = static_cast(ace_malloc(infoNameLen + 1)); - if (value == nullptr) { - break; - } - errno_t error = strcpy_s(value, infoNameLen + 1, info.name); - if (error != 0) { - ace_free(value); - value = nullptr; - break; - } - bool check = true; - int8_t fileType = CompareFileName(info.name); - if (fileType == COUNTRY) { - check = AddNode(fileList_, value); - } else if (fileType == LANG) { - check = AddNode(languageFile, value); - } else if (fileType == OTHERCOUNTRY) { - check = AddNode(countryFile, value); - } else { - ace_free(value); - value = nullptr; - result = false; // the country and lang list would be release if return false - break; - } - if (!check) { - ace_free(value); - value = nullptr; - } else { - totalFiles_++; - } - } - FileCloseDir(files); - return result; -} -#endif - -#ifdef LOCALIZATION_PLURAL -char *CJSONParser::FillPlaceholder(char *format, jerry_value_t arg, jerry_length_t num, bool isPlural) -#else -char *CJSONParser::FillPlaceholder(const char *format, jerry_value_t arg, jerry_length_t num) -#endif // LOCALIZATION_PLURAL +char *CJSONParser::FillPlaceholder(const char *format, jerry_value_t arg, jerry_length_t num, bool isPlural) { if (format == nullptr) { return nullptr; } -#ifdef LOCALIZATION_PLURAL if (isPlural) { +#ifdef LOCALIZATION_PLURAL format = GetPluralValue(format, arg); if (format == nullptr) { return nullptr; } - } #endif + } ListNode *values = nullptr; // store the value after split. #ifdef LOCALIZATION_PLURAL uint8_t length = FormatString(format, arg, values, isPlural, num); @@ -234,20 +113,20 @@ uint8_t CJSONParser::FormatString(const char *format, jerry_value_t arg, ListNod leftIndex++; index = IndexOf(format, rightDelemeter_, leftIndex); // get the index of '}' if (index > 0 && num > 1) { - char *content = nullptr; - content = SubStr(format, leftIndex, index - leftIndex); + char *content = SubStr(format, leftIndex, index - leftIndex); #ifdef LOCALIZATION_PLURAL char *contentValue = GetParamValue(content, arg, isPlural); #else char *contentValue = GetParamValue(content, arg); #endif // LOCALIZATION_PLURAL + ACE_FREE(content); if (AddNode(values, contentValue)) { length++; } else { ACE_FREE(contentValue); } } - if ((index > 0) && (index < strlen(format))) { + if ((index > 0) && (static_cast(index) < strlen(format))) { index++; // move the index '}' to the next char } else { // add the remain character to node.eg.the value is {count}aa, add the last aa to the node @@ -260,7 +139,7 @@ uint8_t CJSONParser::FormatString(const char *format, jerry_value_t arg, ListNod } leftIndex = IndexOf(format, leftDelemeter_, index); } - if (leftIndex < 0 && (index < strlen(format))) { + if (leftIndex < 0 && (static_cast(index) < strlen(format))) { char* currentVal = SubStr(format, index, strlen(format) - index); if (AddNode(values, currentVal)) { length++; @@ -294,11 +173,6 @@ char *CJSONParser::GetPluralValue(char *value, jerry_value_t param) } #endif // LOCALIZATION_PLURAL -void CJSONParser::ResetIndex() -{ - curFileIndex_ = 0; -} - bool CJSONParser::AddNode(ListNode *&head, char *current) { if (current == nullptr || strlen(current) == 0) { @@ -349,22 +223,20 @@ char *CJSONParser::ToString(ListNode *node, uint8_t length) uint8_t index = 0; uint16_t strLength = 0; // the length of result while (node != nullptr) { - if ((length - index - 1 >= 0) && (node->value != nullptr)) { - if (strLength > (UINT16_MAX - (uint16_t)(strlen(node->value)))) { + if ((length - index > 0) && (node->value != nullptr)) { + size_t valueLen = strlen(node->value); + if ((valueLen > (MAX_VALUE_LEN - 1)) || (strLength > (MAX_VALUE_LEN - 1)) || + (strLength + valueLen > (MAX_VALUE_LEN - 1))) { ACE_FREE(temp); return nullptr; } temp[length - 1 - index] = node->value; - strLength += strlen(node->value); + strLength += valueLen; } node = node->next; index++; } - if (strLength == UINT16_MAX) { - HILOG_ERROR(HILOG_MODULE_ACE, "the str length is too long"); - ACE_FREE(temp); - return nullptr; - } + // the strLength is no more than maxValueLen_ - 1 strLength++; char *result = static_cast(ace_malloc(strLength)); if (result == nullptr) { @@ -396,7 +268,7 @@ char *CJSONParser::SubStr(const char *src, size_t start, size_t length) if (src == nullptr || start >= strlen(src)) { return nullptr; } - if (length >= UINT8_MAX) { + if (length > (MAX_VALUE_LEN - 1)) { HILOG_ERROR(HILOG_MODULE_ACE, "the length is too long"); return nullptr; } @@ -416,143 +288,298 @@ char *CJSONParser::SubStr(const char *src, size_t start, size_t length) return result; } -int8_t CJSONParser::CompareFileName(const char *name) +CJSONParser::LanguageState CJSONParser::ChangeLanguage() { - if ((name == nullptr) || (language_ == nullptr)) { - return ERRORCODE; + char *currentLanguage = static_cast(ace_malloc(MAX_LANGUAGE_LENGTH)); + char *currentOrigion = static_cast(ace_malloc(MAX_REGION_LENGTH)); + if ((currentLanguage == nullptr) || (currentOrigion == nullptr)) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc system language info failed"); + ACE_FREE(currentLanguage); + ACE_FREE(currentOrigion); + return LanguageState::LANGUAGE_FAIL; } - size_t languageLen = strlen(language_); - if (languageLen >= UINT8_MAX) { - return ERRORCODE; + int langRet = GLOBAL_GetLanguage(currentLanguage, MAX_LANGUAGE_LENGTH); + int regionRet = GLOBAL_GetRegion(currentOrigion, MAX_REGION_LENGTH); + LanguageState result = LanguageState::LANGUAGE_CHANGED; + if ((langRet != 0) || (regionRet != 0)) { + result = LanguageState::LANGUAGE_FAIL; } - const char delemeter = '-'; - const int countryLen = 2; - size_t minLen = languageLen + 1 + countryLen; // the length of .json - if ((strlen(name) <= minLen) || (name[languageLen] != delemeter)) { - return 1; - } else { - int result = COUNTRY; - if (countries_ == nullptr) { - return ERRORCODE; - } - char *countryName = static_cast(ace_malloc(countryLen + 1)); - if (countryName == nullptr) { - return ERRORCODE; - } - for (int i = 0; i < countryLen; i++) { - countryName[i] = name[languageLen + 1 + i]; - } - countryName[countryLen] = '\0'; - if (strstr(countries_, countryName) == nullptr) { - const char startIndex = 'A'; - int index = countryName[0] - startIndex; - const char * const countries = GetCountries(index); - if ((countries != nullptr) && (IndexOf(const_cast(countries), countryName[1], 0) > 0)) { - result = OTHERCOUNTRY; - } else { - result = LANG; - } - } - ace_free(countryName); - countryName = nullptr; + if ((language_ != nullptr) && (strcmp(currentLanguage, language_) == 0) && + (countries_ != nullptr) && (strcmp(currentOrigion, countries_) == 0)) { + result = LanguageState::LANGUAGE_NOT_CHANGE; + } + if ((result == LanguageState::LANGUAGE_NOT_CHANGE) || (result == LanguageState::LANGUAGE_FAIL)) { + ace_free(currentOrigion); + currentOrigion = nullptr; + ace_free(currentLanguage); + currentLanguage = nullptr; return result; } -} - -void CJSONParser::SetLanguage() -{ - char* currentLanguage = static_cast(ace_malloc(MAX_LANGUAGE_LENGTH)); - if (currentLanguage == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc language failed\n"); - return; - } - if (GLOBAL_GetLanguage(currentLanguage, MAX_LANGUAGE_LENGTH) != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "get language failed\n"); - ace_free(currentLanguage); - currentLanguage = nullptr; - return; - } - - char* currentOrigion = static_cast(ace_malloc(MAX_REGION_LENGTH)); - if (currentOrigion == nullptr) { - ace_free(currentLanguage); - currentLanguage = nullptr; - return; - } - if (GLOBAL_GetRegion(currentOrigion, MAX_REGION_LENGTH) != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "get origion failed"); - ace_free(currentOrigion); - currentOrigion = nullptr; - ace_free(currentLanguage); - currentLanguage = nullptr; - return; - } - if ((language_ != nullptr) && (strcmp(currentLanguage, language_) == 0) - && (countries_ != nullptr) && (strcmp(currentOrigion, countries_) == 0)) { - ace_free(currentLanguage); - currentLanguage = nullptr; - ace_free(currentOrigion); - currentOrigion = nullptr; - return; - } ACE_FREE(language_); language_ = currentLanguage; ACE_FREE(countries_); countries_ = currentOrigion; - if (!GetFiles()) { // get the files whose name begins with the local string - return; - } - curFileIndex_ = 0; + return LanguageState::LANGUAGE_CHANGED; } -#if (defined(_WIN32) || (defined(_WIN64))) -bool CJSONParser::ReadWinFile(ListNode *&languageFile, ListNode *&countryFile) +bool CJSONParser::ChangeLanguageFileName() { - _finddata_t file; - intptr_t opendir; - const char * const match = "*.*"; - char* fileDir = RelocateResourceFilePath(filePath_, match); - if (fileDir == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "get localization path failed"); + if ((language_ == nullptr) || (countries_ == nullptr)) { + if ((languageFile_ != nullptr) && (!strcmp(languageFile_, "en-US.json"))) { + return false; + } + languageFile_ = StringUtil::Copy("en-US.json"); + return true; + } + uint8_t addedLen = 7; // the length of '-', ".json" and '\0' + uint8_t langLen = strlen(language_); + size_t fileLen = langLen + strlen(countries_) + addedLen; + char *languageFile = StringUtil::Malloc(fileLen); + if (languageFile == nullptr) { return false; } - if ((opendir = _findfirst(fileDir, &file)) == -1) { - HILOG_ERROR(HILOG_MODULE_ACE, "file not defined"); - ACE_FREE(fileDir); + errno_t error = strcpy_s(languageFile, fileLen, language_); + languageFile[langLen] = '-'; + languageFile[langLen + 1] = '\0'; + error += strcat_s(languageFile, fileLen, countries_); + error += strcat_s(languageFile, fileLen, ".json"); + if (error > 0) { + ace_free(languageFile); + languageFile = nullptr; return false; } + if ((languageFile_ != nullptr) && (!strcmp(languageFile, languageFile_))) { + ace_free(languageFile); + languageFile = nullptr; + } else { + ACE_FREE(languageFile_); + languageFile_ = languageFile; + } + return true; +} + +bool CJSONParser::CacheFile() +{ + if (!ChangeLanguageFileName()) { + return true; + } + isCached_ = false; + usedOffset_ = sizeof(uint32_t) * MAX_KEY_NUM; + if (!isAllocated_) { + return false; + } + if (memset_s(reinterpret_cast(startPos_), usedOffset_, 0, usedOffset_) != EOK) { + HILOG_ERROR(HILOG_MODULE_ACE, "initial psram failed"); + return false; + } + if (memset_s(reinterpret_cast(startPos_ + usedOffset_), LOCALIZATION_SIZE - usedOffset_, + '\0', LOCALIZATION_SIZE - usedOffset_) != EOK) { + HILOG_ERROR(HILOG_MODULE_ACE, "init cache content failed"); + return false; + } + // set the keyIndex 0 + for (int i = 0; i < MAX_KEY_NUM; i++) { + uint32_t *index = reinterpret_cast(startPos_ + i * sizeof(uint32_t)); + *index = 0; + } + if (languageFile_ == nullptr) { + // cache the default file en-US.json + languageFile_ = StringUtil::Copy("en-US.json"); + } + char *content = ReadJSFile(filePath_, languageFile_); + if (content == nullptr) { + return false; + } + cJSON *json = cJSON_Parse(content); + ace_free(content); + content = nullptr; + if (json == nullptr) { + return false; + } + isCached_ = CacheValue(nullptr, *json); + cJSON_Delete(json); + json = nullptr; + return isCached_; +} + +char *CJSONParser::GetMergeKey(const char *key, const char *addKey) +{ + if (addKey == nullptr) { + return const_cast(key); + } + uint16_t addKeyLen = strlen(addKey); + uint32_t preLen = (key == nullptr) ? 0 : strlen(key); + const uint8_t addedLen = 2; + uint16_t mergeLen = preLen + addKeyLen + addedLen; + char *mergeKey = reinterpret_cast(ace_malloc(mergeLen)); + if (mergeKey == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "merge key failed"); + return nullptr; + } + if (key != nullptr) { + if ((strcpy_s(mergeKey, mergeLen, key) != EOK) || (strcat_s(mergeKey, mergeLen, ".") != EOK) || + (strcat_s(mergeKey, mergeLen, addKey) != EOK)) { + HILOG_ERROR(HILOG_MODULE_ACE, "copy preKey failed"); + ace_free(mergeKey); + return nullptr; + } + } else { + if (strcpy_s(mergeKey, mergeLen, addKey)) { + HILOG_ERROR(HILOG_MODULE_ACE, "copy json key failed\n"); + ace_free(mergeKey); + return nullptr; + } + } + return mergeKey; +} + +bool CJSONParser::PutNumOrStrValue(const char *key, cJSON item) +{ + if (key == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "the json key is nullptr"); + return false; + } + uint32_t index = FNVHash(key); + uint32_t *valueIndex = reinterpret_cast(startPos_ + index * sizeof(uint32_t)); + if (valueIndex == nullptr) { + return false; + } + if (*valueIndex != 0) { + // the hash value is conflict + Node *currentNode = reinterpret_cast(startPos_ + (*valueIndex)); + while ((currentNode != nullptr) && (currentNode->nextIndex != 0)) { + currentNode = reinterpret_cast(startPos_ + currentNode->nextIndex); + } + if (currentNode != nullptr) { + currentNode->nextIndex = usedOffset_; + } + } else { + *valueIndex = usedOffset_; + } + Node *node = reinterpret_cast(startPos_ + usedOffset_); + usedOffset_ = GetUseLen(usedOffset_ + sizeof (Node)); + if (usedOffset_ == 0) { + return false; + } + node->pathIndex = usedOffset_; + if (!CacheStrValue(key)) { + return false; + } + if (item.type == cJSON_Number) { + node->isNumber = true; + node->valueIndex = item.valuedouble; + } + node->valueIndex = usedOffset_; + return CacheStrValue(item.valuestring); +} + +bool CJSONParser::CacheStrValue(const char *value) +{ + if (strcpy_s(reinterpret_cast(startPos_ + usedOffset_), LOCALIZATION_SIZE - usedOffset_, value)) { + HILOG_ERROR(HILOG_MODULE_ACE, "copy value failed"); + return false; + } + usedOffset_ = GetUseLen(usedOffset_ + strlen(value) + 1); + if (usedOffset_ == 0) { + return false; + } + return true; +} + +bool CJSONParser::CacheValue(const char *key, cJSON item) +{ + char *mergeKey = GetMergeKey(const_cast(key), item.string); bool result = true; - // get the file start with the split locale string, for example, en-US_XXX.json - while ((_findnext(opendir, &file) == 0) && (totalFiles_ < UINT8_MAX)) { - // if the file name is not start with the language , go to the next file - if (strncmp(file.name, language_, strlen(language_)) != 0) { - continue; + if ((item.type == cJSON_Number) || (item.type == cJSON_String)) { + result = PutNumOrStrValue(mergeKey, item); + } else if (item.type == cJSON_Object) { + if ((cJSON_IsNull(item.child)) || (!CacheValue(mergeKey, *item.child))) { + result = false; } - char *value = SubStr(file.name, 0, strlen(file.name)); - bool check = true; - int8_t fileType = CompareFileName(file.name); - if (fileType == COUNTRY) { - check = AddNode(fileList_, value); - } else if (fileType == LANG) { - check = AddNode(languageFile, value); - } else if (fileType == OTHERCOUNTRY) { - check = AddNode(countryFile, value); + } else { + // if the object is array, skip it. find the array value through read json file + } + ACE_FREE(mergeKey); + if (!result) { + return false; + } + return (item.next == nullptr) || (CacheValue(key, *item.next)); +} + +jerry_value_t CJSONParser::GetValueFromFile(const char *key, jerry_value_t args, jerry_size_t argsNum) +{ + HILOG_WARN(HILOG_MODULE_ACE, "get value from cache failed"); + ListNode *keys = nullptr; + uint8_t keyCount = Split(key, '.', *&keys); + const char *defaultFile = "en-US.json"; + char *content = ReadJSFile(filePath_, defaultFile); + cJSON *fileJson = cJSON_Parse(content); + ACE_FREE(content); + cJSON *curJsonItem = fileJson; + uint8_t curKeyIndex = 0; + do { + // get the current splited key + char *message = CJSONParser::GetNode(keys, keyCount - curKeyIndex); + curJsonItem = cJSON_GetObjectItem(curJsonItem, message); + curKeyIndex++; + } while (!(curKeyIndex == keyCount || (curJsonItem == nullptr))); + ClearNode(keys); + jerry_value_t result = UNDEFINED; + if (curJsonItem == nullptr) { + result = jerry_create_string(reinterpret_cast(key)); + } else { + if (cJSON_IsNumber(curJsonItem)) { + result = jerry_create_number(curJsonItem->valuedouble); } else { + char *value = FillPlaceholder(curJsonItem->valuestring, args, argsNum); + result = jerry_create_string(reinterpret_cast(value)); ACE_FREE(value); - result = false; // the country and lang list would be release if return false - break; - } - if (!check) { - ACE_FREE(value); - } else { - totalFiles_++; } } - _findclose(opendir); - ACE_FREE(fileDir); + cJSON_Delete(fileJson); + fileJson = nullptr; return result; } -#endif + +jerry_value_t CJSONParser::GetValue(const char *key, const jerry_value_t args[], const jerry_size_t argsNum) +{ + char *result = nullptr; + jerry_value_t arg = (argsNum > 1) ? args[1] : UNDEFINED; + if (isCached_) { + Node *node = GetValueFromCache(key); + if (node != nullptr) { + if (node->isNumber) { + return jerry_create_number(node->valueIndex); + } else { + result = reinterpret_cast(startPos_ + (uint32_t)(node->valueIndex)); + result = FillPlaceholder(result, arg, argsNum); + jerry_value_t resultProp = jerry_create_string(reinterpret_cast(result)); + ACE_FREE(result); + return resultProp; + } + } + } + return GetValueFromFile(key, arg, argsNum); +} + +CJSONParser::Node *CJSONParser::GetValueFromCache(const char *key) +{ + uint16_t index = FNVHash(key); + uint32_t *valueIndex = reinterpret_cast(startPos_ + index * sizeof (uint32_t)); + while ((valueIndex != nullptr) && (*valueIndex != 0)) { + Node *node = reinterpret_cast(startPos_ + (*valueIndex)); + if (node == nullptr) { + return nullptr; + } + char *nodeKey = reinterpret_cast(startPos_ + node->pathIndex); + if ((nodeKey != nullptr) && (!strcmp(key, nodeKey))) { + return node; + } else { + *valueIndex = node->nextIndex; + } + } + return nullptr; +} uint8_t CJSONParser::Split(const char *target, char delemeter, ListNode *&node) { @@ -575,7 +602,7 @@ uint8_t CJSONParser::Split(const char *target, char delemeter, ListNode *&node) startPos = pos + 1; pos = IndexOf(target, delemeter, startPos); } - if ((startPos != -1) && (startPos < strlen(target))) { + if ((startPos != -1) && (static_cast(startPos) < strlen(target))) { current = SubStr(target, startPos, strlen(target) - startPos); if (AddNode(node, current)) { nodeCount++; @@ -592,7 +619,7 @@ int CJSONParser::IndexOf(const char *string, char delemeter, int index) if (string == nullptr) { return -1; } - if ((index >= strlen(string)) || (index < 0) || (strlen(string) >= INT8_MAX)) { + if ((index < 0) || (strlen(string) >= INT8_MAX) || (static_cast(index) >= strlen(string))) { return -1; } int length = strlen(string); @@ -603,7 +630,7 @@ int CJSONParser::IndexOf(const char *string, char delemeter, int index) } i++; } while (i < length); - // if the delemeter is not find return the length of string + // if the delemeter is not find return -1 return -1; } @@ -612,6 +639,9 @@ char *CJSONParser::GetParamValue(const char *attrName, jerry_value_t param, bool #else char *CJSONParser::GetParamValue(const char *attrName, jerry_value_t param) { + if (attrName == nullptr) { + return nullptr; + } char *contentValue = nullptr; // store the value defined in param uint16_t contentLen = 0; #ifdef LOCALIZATION_PLURAL @@ -620,7 +650,7 @@ char *CJSONParser::GetParamValue(const char *attrName, jerry_value_t param) } #else jerry_value_t propName = jerry_create_string(reinterpret_cast(attrName)); - if (JerryHasProperty(param, propName)) { // get the placehoder {...} value defined in param + if (JerryHasProperty(param, propName)) { // get the placeholder {...} value defined in param jerry_value_t paramValue = jerry_get_property(param, propName); // the contentValue would be released in clearNode values contentValue = MallocStringOf(paramValue, &contentLen); @@ -631,63 +661,11 @@ char *CJSONParser::GetParamValue(const char *attrName, jerry_value_t param) // if the length of attrVal is 0, the node wouldn't add to the list if ((contentValue != nullptr) && contentLen != 0) { return contentValue; - } else { - ACE_FREE(contentValue); // if the contentValue is \0 - return nullptr; } + ACE_FREE(contentValue); // if the contentValue is \0 + return nullptr; } #endif - -void CJSONParser::SortFileName(ListNode *node) -{ - if (node == nullptr || (node->next == nullptr)) { - return; - } - ListNode *current = node; - ListNode *compare = nullptr; - const int suffixLen = 5; - while (current != nullptr) { - compare = current->next; - int currentLen = strlen(current->value); - while (compare != nullptr) { - int min = (currentLen < strlen(compare->value)) ? currentLen : strlen(compare->value); - int compareResult = strncmp(compare->value, current->value, min - suffixLen); - // when the file name is zh-CN.json and zh-CN-1.json, the sort result is zh-CN.json,zh-CN-1.json - if ((compareResult < 0) || ((compareResult == 0) && (min != currentLen))) { - char *value = compare->value; - compare->value = current->value; - current->value = value; - } - compare = compare->next; - } - current = current->next; - } -} - -const char *CJSONParser::GetCountries(int8_t index) -{ - if ((index >= maxLen_) || (index < 0)) { - return nullptr; - } - return allCountries_[index]; -} - -void CJSONParser::MergeList(ListNode *&destination, ListNode *source) -{ - // merge two list - if (source == nullptr) { - return; - } - if (destination == nullptr) { - destination = source; - return; - } - ListNode *current = destination; - while (current->next != nullptr) { - current = current->next; - } - current->next = source; -} } // namespace ACELite } // namespace OHOS #endif diff --git a/frameworks/src/core/modules/presets/cjson_parser.h b/frameworks/src/core/modules/presets/cjson_parser.h new file mode 100644 index 0000000..57f8257 --- /dev/null +++ b/frameworks/src/core/modules/presets/cjson_parser.h @@ -0,0 +1,232 @@ +/* + * Copyright (c) 2020-2021 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. + */ +#ifndef OHOS_ACELITE_CJSON_PARSER_H +#define OHOS_ACELITE_CJSON_PARSER_H +#include "acelite_config.h" + +#ifdef FEATURE_LOCALIZATION_MODULE +#include +#include +#ifdef __LITEOS_A__ +#include "dirent.h" +#include "unistd.h" +#endif +#include "ace_mem_base.h" +#include "js_app_context.h" +#include "non_copyable.h" + +namespace OHOS { +namespace ACELite { +class CJSONParser final : public MemoryHeap { +public: + ACE_DISALLOW_COPY_AND_MOVE(CJSONParser); + struct ListNode : public MemoryHeap { + char *value = nullptr; + ListNode *next = nullptr; + }; + + // can't create the node object.it is used to store the json node is psram/ram + struct Node { + double valueIndex = 0; + uint32_t pathIndex = 0; // the path value index in psram + uint16_t nextIndex = 0; // the conflicy Node index in array + bool isNumber = false; + }; + + enum LanguageState : uint8_t { + LANGUAGE_FAIL, + LANGUAGE_NOT_CHANGE, + LANGUAGE_CHANGED + }; + + CJSONParser(); + + ~CJSONParser() + { + void *value = reinterpret_cast(startPos_); + ACE_FREE(value); + ACE_FREE(countries_); + ACE_FREE(language_); + ACE_FREE(filePath_); + ACE_FREE(languageFile_); + } + + /** + * @brief: replace the placeholder in result with the data defined by user + * if plural is true, it will replace the number in placeholder, + * replace the same name in js object. + */ + char *FillPlaceholder(const char *format, jerry_value_t arg, jerry_length_t num, bool isPlural = false); + + /** + * @brief: init localization, get the resource file path + * and get the localization cache ram + */ + bool Init(); + + /** + * @brief: merge string destination and resource, save the merge result in destination + * if check is true, it will free destination string + */ + char *SubStr(const char *src, size_t start, size_t length); + + /** + * @brief: split the string by delemeter and save the split result in node + * + * @return the length of node + */ + uint8_t Split(const char *target, char delemeter, ListNode *&node); + + static bool AddNode(ListNode *&head, char *current); + static char *GetNode(ListNode *node, int index); + static void ClearNode(ListNode *&node); + static char *ToString(ListNode *node, uint8_t length); + + /** + * @brief get localization format result + * @param key: the json path + * @param args: the args defined the value of placeholder + * @return the JS value of localization result + */ + jerry_value_t GetValue(const char *key, const jerry_value_t args[], jerry_size_t argsNum); + + /** + * @brief judge the system language and origion is changed + * @return 1: the system language is changed + * 0: the system language + * -1: get system language failed + */ + LanguageState ChangeLanguage(); + + /** + * @brief cache the frist file in fileList to PSRAM/RAM + * @return the cache result, true: cache file success + * fail: the fileList is null or the file is too large + */ + bool CacheFile(); + +private: + enum conValue { + PRIME_OFFSET_1 = 3, + PRIME_OFFSET_2 = 5, + PRIME_OFFSET_3 = 7, + PRIME_OFFSET_4 = 13, + PRIME_OFFSET_5 = 17, + MAX_KEY_NUM = 500, + MAX_VALUE_LEN = 1024, + LOCALIZATION_SIZE = 10240, + NFV_PRIME = 16777619 + }; + + /** + * @Brief: get the position of delemeter after index + * @return if the index is upper than the length of string, return -1 + * else if the index is not defined in string, return the length, else return the position of it + */ + int IndexOf(const char *string, char delemeter, int index); + + /** + * @Brief: split the string defined in value by '|', and get value in the split string + * For example: the string is car|cars, if the value of param is odd, assign value car,else cars + */ +#ifdef LOCALIZATION_PLURAL + char *GetPluralValue(char *value, jerry_value_t param); + uint8_t FormatString(const char *format, jerry_value_t arg, ListNode *&node, bool isPlural, jerry_value_t num); + /** + * @brief: get the value defined in param + * @param: attrName:the attribute name in param, for example "name" + * param: the object defined attrName, for example {"name":"Jane"} + * @return: the value in param + */ + char *GetParamValue(const char *attrName, jerry_value_t param, bool isPlural); +#else + uint8_t FormatString(const char *format, jerry_value_t arg, ListNode *&node, jerry_value_t num); + char *GetParamValue(const char *attrName, jerry_value_t param); +#endif + + char* GetMergeKey(const char *key, const char *addKey); + + bool CacheValue(const char *key, cJSON item); + + bool PutNumOrStrValue(const char *key, cJSON item); + + bool CacheStrValue(const char *value); + + /** + * @brief get value from file in fileList + * @param key JSON path, args: the value to replace the placeholder, argsNum: the num of args + * @param fileJSON the jsonObject convert from file + * @return the js value of target key + */ + jerry_value_t GetValueFromFile(const char *key, jerry_value_t args, jerry_size_t argsNum); + + /** + * @brief get 4-byte aligned offset + * @param addr the used offset + * @return the nearest 4-byte aligned offset + */ + uint32_t GetUseLen(uint32_t usedOffset) + { + const uint8_t align = 2; + uint32_t len = usedOffset + (1 << align); + len = (len >> align) << align; + if (len > LOCALIZATION_SIZE) { + isCached_ = false; // cache json file failed + return 0; + } + return len; + } + + /** + * @brief get the string hash value.the hash algorithm is NFV-1a hash + * the Algorithm URL is https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV-1_hash + * @param key the string need to hash + * @return the hash result which is the index array number + */ + uint16_t FNVHash(const char *key) + { + uint64_t hash = 2166136261; + uint32_t len = strlen(key); + for (uint8_t i = 0; i < len; i++) { + uint8_t keyVal = key[i]; + hash = (hash ^ keyVal) * NFV_PRIME; + } + hash += hash << PRIME_OFFSET_4; + hash ^= hash >> PRIME_OFFSET_3; + hash += hash << PRIME_OFFSET_1; + hash ^= hash >> PRIME_OFFSET_5; + hash += hash << PRIME_OFFSET_2; + return hash % MAX_KEY_NUM; + } + + Node *GetValueFromCache(const char *key); + + bool ChangeLanguageFileName(); + + bool isCached_; + bool isAllocated_; + char leftDelemeter_; + char rightDelemeter_; + uint32_t usedOffset_; + uintptr_t startPos_; + char *countries_; // the current country and origion + char *language_; // the current system language + char *filePath_; + char *languageFile_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // FEATURE_LOCALIZATION_MODULE +#endif // OHOS_ACELITE_CJSON_PARSER_H diff --git a/src/core/modules/presets/console_log_impl.cpp b/frameworks/src/core/modules/presets/console_log_impl.cpp old mode 100755 new mode 100644 similarity index 93% rename from src/core/modules/presets/console_log_impl.cpp rename to frameworks/src/core/modules/presets/console_log_impl.cpp index 802ac40..5c69650 --- a/src/core/modules/presets/console_log_impl.cpp +++ b/frameworks/src/core/modules/presets/console_log_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -17,7 +17,7 @@ #if ENABLED(CONSOLE_LOG_OUTPUT) #include "js_app_environment.h" #ifdef FEATURE_USER_MC_LOG_PRINTF -#include "log_js.h" // mc js console log header +#include "product_adapter.h" #endif // FEATURE_USER_MC_LOG_PRINTF #ifdef FEATURE_ACELITE_HI_LOG_PRINTF #undef LOG_DOMAIN @@ -161,7 +161,7 @@ void LogChar(char c, const LogLevel logLevel, bool endFlag) logBuffer[logBufferIndex++] = c; if ((logBufferIndex == (LOG_BUFFER_SIZE - 1)) || (c == '\n')) { if ((c == '\n') && (logBufferIndex > 0)) { - logBufferIndex--; // will trace out line seperator after print the content out + logBufferIndex--; // will trace out line separator after print the content out } logBuffer[logBufferIndex] = '\0'; Output(logLevel, logBuffer, logBufferIndex); @@ -170,7 +170,7 @@ void LogChar(char c, const LogLevel logLevel, bool endFlag) // this is the newline during the console log, need to append the loglevel prefix, // example: console.log("aa\nbb"); #if !defined(FEATURE_ACELITE_HI_LOG_PRINTF) && !defined(FEATURE_USER_MC_LOG_PRINTF) - Output(logLevel, "\n", 1); // hilog will trace our the line seperator directly + Output(logLevel, "\n", 1); // hilog will trace our the line separator directly #endif if (!endFlag) { LogOutLevel(logLevel); @@ -210,22 +210,20 @@ static void OutputToHiLog(const LogLevel logLevel, const char * const str) { switch (logLevel) { case LOG_LEVEL_ERR: - HILOG_ERROR_JS(str); + ProductAdapter::OutputJSConsoleLog((uint8_t)(LOG_LEVEL_ERR), str); break; case LOG_LEVEL_WARN: - HILOG_WARN_JS(str); + ProductAdapter::OutputJSConsoleLog((uint8_t)(LOG_LEVEL_WARN), str); break; case LOG_LEVEL_INFO: - HILOG_INFO_JS(str); + ProductAdapter::OutputJSConsoleLog((uint8_t)(LOG_LEVEL_INFO), str); break; case LOG_LEVEL_DEBUG: - HILOG_DEBUG_JS(str); - break; + // fall through case LOG_LEVEL_TRACE: - HILOG_INFO_JS(str); - break; + // fall through case LOG_LEVEL_NONE: - HILOG_DEBUG_JS(str); + ProductAdapter::OutputJSConsoleLog((uint8_t)(LOG_LEVEL_DEBUG), str); break; default: break; diff --git a/src/core/modules/presets/console_log_impl.h b/frameworks/src/core/modules/presets/console_log_impl.h old mode 100755 new mode 100644 similarity index 87% rename from src/core/modules/presets/console_log_impl.h rename to frameworks/src/core/modules/presets/console_log_impl.h index 7f44258..47892a1 --- a/src/core/modules/presets/console_log_impl.h +++ b/frameworks/src/core/modules/presets/console_log_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -28,14 +28,14 @@ namespace ACELite { /** * The log level definations. */ -enum LogLevel { - LOG_LEVEL_FATAL, // fatal, no console.fatal - LOG_LEVEL_ERR, // console.error - LOG_LEVEL_WARN, // console.warn - LOG_LEVEL_INFO, // console.info - LOG_LEVEL_DEBUG, // console.debug - LOG_LEVEL_TRACE, // console.trace - LOG_LEVEL_NONE, // console.log +enum LogLevel : uint8_t { + LOG_LEVEL_NONE = 0, // console.log + LOG_LEVEL_DEBUG = 1, // console.debug + LOG_LEVEL_INFO = 2, // console.info + LOG_LEVEL_WARN = 3, // console.warn + LOG_LEVEL_ERR = 4, // console.error + LOG_LEVEL_FATAL = 5, // fatal, no console.fatal + LOG_LEVEL_TRACE = 6, // console.trace }; /** diff --git a/src/core/modules/presets/console_module.cpp b/frameworks/src/core/modules/presets/console_module.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/console_module.cpp rename to frameworks/src/core/modules/presets/console_module.cpp diff --git a/src/core/modules/presets/console_module.h b/frameworks/src/core/modules/presets/console_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/console_module.h rename to frameworks/src/core/modules/presets/console_module.h diff --git a/frameworks/src/core/modules/presets/date_time_format_module.cpp b/frameworks/src/core/modules/presets/date_time_format_module.cpp new file mode 100644 index 0000000..9856cf1 --- /dev/null +++ b/frameworks/src/core/modules/presets/date_time_format_module.cpp @@ -0,0 +1,731 @@ +/* + * Copyright (c) 2021 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. + */ +#include "date_time_format_module.h" +#ifdef FEATURE_DATE_FORMAT +#include +#include "ace_log.h" +#include "locale_util.h" +#include "keys.h" +#include "key_parser.h" +#include "string_util.h" +namespace OHOS { +namespace ACELite { +using namespace I18N; +jerry_object_native_info_t DateTimeFormatModule::GC_CALLBACK = {.free_cb = DateTimeFormatModule::DeleteDateFormat}; + +DateTimeFormatModule::DateTimeFormatModule(): dateFormat_(nullptr), + info_(nullptr), + timePattern_(I18N::AvailableDateTimeFormatPattern::SHORT), + datePattern_(I18N::AvailableDateTimeFormatPattern::SHORT), + weekStyle_(StyleState::UNKNOWN), + monthStyle_(StyleState::UNKNOWN), + numArray_(nullptr), + isSetTime_(false), + isSetDate_(false) +{ + if (memset_s(digitArray_, TIME_NUMBER_LEN, 0, TIME_NUMBER_LEN) != EOK) { + HILOG_ERROR(HILOG_MODULE_ACE, "init digit array failed"); + } +} + +void DateTimeFormatModule::Init(jerry_value_t intlHandle) +{ + jerry_value_t constructor = jerry_create_external_function(CreateDateTimeFormat); + jerry_value_t format = jerry_create_external_function(Format); + jerry_value_t baseObj = jerry_create_object(); + JerrySetNamedProperty(baseObj, "format", format); + JerrySetNamedProperty(constructor, "prototype", baseObj); + JerrySetNamedProperty(intlHandle, "DateTimeFormat", constructor); + ReleaseJerryValue(constructor, format, baseObj, VA_ARG_END_FLAG); +} + +DateTimeFormatModule::~DateTimeFormatModule() +{ + ACE_DELETE(dateFormat_); + ACE_DELETE(info_); + ReleaseNumArray(); +} + +void DateTimeFormatModule::ReleaseNumArray() +{ + if (numArray_ != nullptr) { + for (int i = 0; i < MAX_NUM_LEN; i++) { + ACE_FREE(numArray_[i]); + } + ace_free(numArray_); + numArray_ = nullptr; + } +} + +bool DateTimeFormatModule::InitNumArray(LocaleInfo info) +{ + ReleaseNumArray(); + int status = 0; + NumberFormat numFormat(info, status); + if (status == I18nStatus::IERROR) { + HILOG_ERROR(HILOG_MODULE_ACE, "init number format failed"); + return false; + } + numArray_ = reinterpret_cast(ace_malloc(MAX_NUM_LEN * sizeof(char *))); + if (numArray_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc number array failed"); + return false; + } + // get the number value 0-9 in specified locale info + for (uint8_t i = 0; i < MAX_NUM_LEN; i++) { + int numStatus = 0; + char *result = const_cast(numFormat.Format(i, numStatus).data()); + numArray_[i] = StringUtil::Copy(result); + } + return true; +} + +jerry_value_t DateTimeFormatModule::CreateDateTimeFormat(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + if (!jerry_value_is_constructor(func)) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast + ("use new to create number format")); + } + DateTimeFormatModule *dateModel = new DateTimeFormatModule(); + if (dateModel == nullptr) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast + ("create date format model failed")); + } + char *value = nullptr; + if (argsNum >= 1) { + value = MallocStringOf(args[0]); + } + dateModel->info_ = LocaleUtil::GetLocaleInfo(value); + ACE_FREE(value); + if (dateModel->info_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create LocaleInfo failed"); + delete dateModel; + dateModel = nullptr; + return jerry_create_error(JERRY_ERROR_COMMON, reinterpret_cast("lack of memory")); + } + // set the default format pattern year(numeric)-month(numeric)-day(numeric) + dateModel->dateFormat_ = new DateTimeFormat(AvailableDateTimeFormatPattern::SHORT, *dateModel->info_); + if ((dateModel->dateFormat_ == nullptr) || (!dateModel->InitNumArray(*dateModel->info_))) { + delete dateModel; + dateModel = nullptr; + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast + ("create dateTimeFormat failed")); + } + if (argsNum > 1) { + // deal the year month day style + const char *dateRes = dateModel->SetDateStyle(args[1]); + // deal the hour minute second style + const char *timeRes = dateModel->SetTimeStyle(args[1]); + // if dateRes or timeRes is not nullptr, the date style or time style is invalid + if ((dateRes != nullptr) || (timeRes != nullptr)) { + delete dateModel; + dateModel = nullptr; + const char *result = (dateRes != nullptr) ? dateRes : timeRes; + return (result == nullptr) ? jerry_create_null() : + jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast(result)); + } + } + jerry_set_object_native_pointer(context, dateModel, &GC_CALLBACK); + return UNDEFINED; +} + +void DateTimeFormatModule::ConvertLocalToGMT(time_t &time) const +{ + struct tm gmTime = {0}; + struct tm local = {0}; + gmtime_r(&time, &gmTime); + localtime_r(&time, &local); + time += mktime(&local) - mktime(&gmTime); +} + +jerry_value_t DateTimeFormatModule::Format(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + if (!jerry_is_feature_enabled(JERRY_FEATURE_DATE)) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("the date is not enabled")); + } + if (argsNum < 1) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("date is invalid")); + } + DateTimeFormatModule *formatter = nullptr; + if (!(jerry_get_object_native_pointer(context, reinterpret_cast(&formatter), &GC_CALLBACK)) || + (formatter == nullptr) || (formatter->dateFormat_ == nullptr)) { + HILOG_ERROR(HILOG_MODULE_ACE, "get format object failed"); + return UNDEFINED; + } + const uint16_t msToSec = 1000; + time_t dateTime = formatter->GetTimeVal(args[0], "getTime") / msToSec; + formatter->ConvertLocalToGMT(dateTime); + if (formatter->isSetDate_ || formatter->isSetTime_) { + uint8_t maxSize = 128; + char *res = reinterpret_cast(ace_malloc(maxSize)); + if (res == nullptr) { + return UNDEFINED; + } + res[0] = '\0'; + uint8_t start = 0; + if (formatter->isSetDate_) { + formatter->FormatDate(dateTime, res, maxSize, start); + } + if (formatter->isSetTime_) { + formatter->FormatTime(dateTime, res, maxSize, start); + } + jerry_value_t resultProp = jerry_create_string(reinterpret_cast(res)); + ace_free(res); + res = nullptr; + return resultProp; + } + // the style group is not support, format the lonely support style week or month + if (formatter->weekStyle_ != StyleState::UNKNOWN) { + int8_t weekIndex = formatter->GetTimeVal(args[0], "getDay"); + DateTimeDataType type = (formatter->weekStyle_ == StyleState::LONG) ? FORMAT_WIDE : FORMAT_ABBR; + return jerry_create_string(reinterpret_cast + (formatter->dateFormat_->GetWeekName(weekIndex, type).data())); + } else if (formatter->monthStyle_ != StyleState::UNKNOWN) { + return formatter->GetMonthVal(args[0]); + } + // if the style is valid, the style pattern is not support, format the date style as default style + std::string result, timeZone; + I18nStatus status = I18nStatus::ISUCCESS; + formatter->dateFormat_->Format(dateTime, timeZone, result, status); + if (status == I18nStatus::IERROR) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("format date failed")); + } + return jerry_create_string(reinterpret_cast(result.data())); +} + +jerry_value_t DateTimeFormatModule::GetMonthVal(jerry_value_t time) const +{ + int month = GetTimeVal(time, "getMonth"); + // format the long style ans short month style + if ((monthStyle_ == StyleState::LONG) || (monthStyle_ == StyleState::SHORT)) { + DateTimeDataType type = (monthStyle_ == StyleState::LONG) ? FORMAT_WIDE : FORMAT_ABBR; + return jerry_create_string(reinterpret_cast + (dateFormat_->GetMonthName(month, type).data())); + } + const uint8_t monthIndex = 1; + const uint8_t maxMonthLen = 20; + uint8_t start = 0; + char *result = reinterpret_cast(ace_malloc(maxMonthLen)); + if (result == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc month str failed"); + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("memory is not enough")); + } + const char *date = dateFormat_->GetMonthName(month, DateTimeDataType::STANDALONE_ABBR).data(); + // format the number month to 2-digit or not through the month digit flag + jerry_value_t resultProp = UNDEFINED; + if (FormatDigit(date, result, maxMonthLen, start, digitArray_[monthIndex]) > 0) { + resultProp = jerry_create_string(reinterpret_cast(result)); + } + ace_free(result); + result = nullptr; + return resultProp; +} + +uint8_t DateTimeFormatModule::GetNumInDate(const char *date) const +{ + if (date == nullptr) { + return 0; + } + uint8_t len = 0; + int16_t dateLen = strlen(date); + bool check = true; + for (int16_t index = 0; index < dateLen; index++) { + int16_t numEnd = GetNumberEnd(date, index); + if (numEnd >= 0) { + if (check) { + len++; + check = false; + } + index = numEnd; // check the number from the next character + } else { + check = true; + } + } + return len; +} + +void DateTimeFormatModule::FormatDate(time_t time, char *res, const uint8_t resSize, uint8_t &start) +{ + if (dateFormat_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "dateFormat is nullptr"); + return; + } + std::string result, timeZone, check; + I18nStatus status = I18nStatus::ISUCCESS; + dateFormat_->ApplyPattern(datePattern_); + dateFormat_->Format(time, timeZone, result, status); + if (status == I18nStatus::IERROR) { + return; + } + bool isMonthFirst = false; + // if month is numeric, format the date to full year-month-day, if the first digit is number, the format string + // is day-month-year or year-month-day, else month-day-year + const char *dateStr = result.data(); + const uint8_t numMaxInDate = 3; + uint8_t numInDate = GetNumInDate(dateStr); + if (numInDate == numMaxInDate) { + dateFormat_->ApplyPattern(AvailableDateTimeFormatPattern::YEAR_WIDE_MONTH_DAY); + dateFormat_->Format(time, timeZone, check, status); + if (status == I18nStatus::IERROR) { + return; + } + isMonthFirst = (GetNumberEnd(check.data(), 0) < 0); + } + const uint8_t dayStyleIndex = 2; // the day number style index + const uint8_t monthStyleIndex = 1; // the month style index + uint8_t firstFormatIndex = dayStyleIndex; + int16_t formatIndex = 0; + if (numInDate == numMaxInDate) { + uint8_t secondFormatIndex = monthStyleIndex; + if (isMonthFirst) { + // set the format order month-day-year + firstFormatIndex = monthStyleIndex; + secondFormatIndex = dayStyleIndex; + } + formatIndex = FormatDigit(dateStr, res, resSize, start, digitArray_[firstFormatIndex]); + if (formatIndex < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "format the first number in date str failed"); + return; + } + formatIndex = FormatDigit(dateStr + formatIndex, res, resSize, + start, digitArray_[secondFormatIndex]) + formatIndex; + } else { + // format the day digit or year digit + formatIndex = FormatDigit(dateStr, res, resSize, start, digitArray_[dayStyleIndex]); + } + if (formatIndex < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "format date string failed"); + return; + } + // format the year + if (FormatDigit(dateStr + formatIndex, res, resSize, start, digitArray_[firstFormatIndex]) < 0) { + res[0] = '\0'; + } +} + +void DateTimeFormatModule::FormatTime(time_t time, char *res, const uint8_t resSize, uint8_t &start) +{ + if (res == nullptr) { + return; + } + if (start != 0) { + res[start] = ' '; + start++; + } + std::string result, timeZone; + I18nStatus status = I18nStatus::ISUCCESS; + dateFormat_->ApplyPattern(timePattern_); + dateFormat_->Format(time, timeZone, result, status); + if (status == I18nStatus::IERROR) { + return; + } + const uint8_t hourIndex = 3; + const uint8_t minuteIndex = 4; + const uint8_t secondIndex = 5; + const char *timeStr = result.data(); + int16_t curIndex = 0; + curIndex = FormatDigit(timeStr, res, resSize, start, digitArray_[hourIndex]); + if (curIndex < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "format hour style failed"); + return; + } + curIndex = FormatDigit(timeStr + curIndex, res, resSize, start, digitArray_[minuteIndex]) + curIndex; + if (curIndex < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "format minute style failed"); + return; + } + if (FormatDigit(timeStr + curIndex, res, resSize, start, digitArray_[secondIndex]) < 0) { + res[0] = '\0'; + } +} + +int16_t DateTimeFormatModule::FormatDigit(const char *time, + char *res, + const uint8_t resSize, + uint8_t &start, + bool is2Digit) const +{ + if ((time == nullptr) || (strlen(time) == 0)) { + return 0; + } + int16_t index = GetNum(time); + if (index >= 0) { + if (strncpy_s(res + start, resSize - start + 1, time, index + 1) != 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "copy string before number failed"); + return -1; + } + start = start + index + 1; + } + index = (index < 0) ? 0 : (index + 1); + int16_t num1 = GetNumberEnd(time, index); + if (num1 < 0) { + return -1; + } + int16_t num2 = GetNumberEnd(time, num1 + 1); + int16_t numEnd = num1; + if (num2 < 0) { + if (is2Digit && (numArray_[0] != nullptr)) { + uint8_t zeroLen = strlen(numArray_[0]); + if (strncpy_s(res + start, resSize - start + 1, numArray_[0], zeroLen)) { + HILOG_ERROR(HILOG_MODULE_ACE, "add zero failed"); + return -1; + } + start = start + zeroLen; + } + } else { + int num3 = GetNumberEnd(time, num2 + 1); + // format the 4 digit year + if (num3 >= 0) { + // the year style is 2-digit + if (digitArray_[0]) { + index = num2 + 1; + } + numEnd = GetNumberEnd(time, num3 + 1); + } else { + numEnd = num2; + } + } + numEnd = GetNum(time + numEnd + 1) + numEnd + 1; + if (numEnd >= index) { + if (strncpy_s(res + start, resSize - start + 1, time + index, numEnd - index + 1) != 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "copy string failed"); + return -1; + } + start = start + numEnd - index + 1; + } + res[start] = '\0'; + return numEnd + 1; +} + +int16_t DateTimeFormatModule::GetNum(const char *format) const +{ + uint8_t len = strlen(format); + int16_t res = -1; + for (uint8_t index = 0; index < len; index++) { + int16_t numIndex = GetNumberEnd(format, index); + if (numIndex >= 0) { + break; + } else { + res = index; + } + } + return res; +} + +int16_t DateTimeFormatModule::GetNumberEnd(const char *compare, uint8_t start) const +{ + for (uint8_t index = 0; index < MAX_NUM_LEN; index++) { + const char *str = compare + start; + if (StringUtil::StartsWith(str, numArray_[index])) { + return start + strlen(numArray_[index]) - 1; + } + } + return -1; +} + +double DateTimeFormatModule::GetTimeVal(jerry_value_t time, const char *funcName) const +{ + jerry_value_t funcProp = jerryx_get_property_str(time, funcName); + if (IS_UNDEFINED(funcProp)) { + return 0; + } + jerry_value_t result = CallJSFunction(funcProp, time, nullptr, 0); + double timeVal = jerry_get_number_value(result); + ReleaseJerryValue(funcProp, result, VA_ARG_END_FLAG); + return timeVal; +} + +void DateTimeFormatModule::DeleteDateFormat(void *pointer) +{ + DateTimeFormatModule *formatter = reinterpret_cast(pointer); + if (formatter != nullptr) { + delete formatter; + formatter = nullptr; + } +} + +const char *DateTimeFormatModule::SetDateStyle(jerry_value_t style) +{ + weekStyle_ = GetWeekdayStyle(style); + if (weekStyle_ == StyleState::ERROR) { + return "the weekday style value is out of range"; + } + const uint8_t yearIndex = 0; + StyleState yearStyle = GetStyle(style, "year", yearIndex); + if (yearStyle == StyleState::ERROR) { + return "the year style value is out of range"; + } + monthStyle_ = GetMonthStyle(style); + if (monthStyle_ == StyleState::ERROR) { + return "the month style value is out of range"; + } + const uint8_t dayIndex = 2; + StyleState dayStyle = GetStyle(style, "day", dayIndex); + if (dayStyle == StyleState::ERROR) { + return "the day style value is out of range"; + } + isSetDate_ = SetDatePattern(weekStyle_, yearStyle, monthStyle_, dayStyle); + return nullptr; +} + +DateTimeFormatModule::StyleState DateTimeFormatModule::GetWeekdayStyle(jerry_value_t style) const +{ + if (!jerryx_has_property_str(style, "weekday")) { + return StyleState::UNKNOWN; + } + StyleState weekdayStyle = StyleState::UNKNOWN; + jerry_value_t weekProp = jerryx_get_property_str(style, "weekday"); + uint16_t len = 0; + char *weekStyle = MallocStringOf(weekProp, &len); + jerry_release_value(weekProp); + uint16_t weekId = KeyParser::ParseKeyId(weekStyle, len); + ACE_FREE(weekStyle); + if (!KeyParser::IsKeyValid(weekId)) { + return StyleState::ERROR; + } + switch (weekId) { + case K_SHORT: { + weekdayStyle = StyleState::SHORT; + break; + } + case K_LONG: { + weekdayStyle = StyleState::LONG; + break; + } + default: { + weekdayStyle = StyleState::ERROR; + break; + } + } + return weekdayStyle; +} + +DateTimeFormatModule::StyleState DateTimeFormatModule::GetMonthStyle(jerry_value_t style) +{ + if (!jerryx_has_property_str(style, "month")) { + return StyleState::UNKNOWN; + } + jerry_value_t monthProp = jerryx_get_property_str(style, "month"); + uint16_t len = 0; + char *monthStyle = MallocStringOf(monthProp, &len); + jerry_release_value(monthProp); + uint16_t monthId = KeyParser::ParseKeyId(monthStyle, len); + ACE_FREE(monthStyle); + if (!KeyParser::IsKeyValid(monthId)) { + return StyleState::ERROR; + } + StyleState monthStyleState = StyleState::UNKNOWN; + switch (monthId) { + case K_LONG: { + monthStyleState = StyleState::LONG; + break; + } + case K_SHORT: { + monthStyleState = StyleState::SHORT; + break; + } + case K_NUMERIC: { + monthStyleState = StyleState::NUMERIC; + break; + } + case K_DIGIT2: { + const uint8_t monthIndex = 1; + digitArray_[monthIndex] = true; + monthStyleState = StyleState::NUMERIC; + break; + } + default: { + monthStyleState = StyleState::ERROR; + break; + } + } + return monthStyleState; +} + +DateTimeFormatModule::StyleState DateTimeFormatModule::GetStyle(jerry_value_t style, + const char *attrName, + const uint8_t index) +{ + if (!jerryx_has_property_str(style, attrName)) { + return StyleState::UNKNOWN; + } + jerry_value_t attrProp = jerryx_get_property_str(style, attrName); + uint16_t len = 0; + char *attrVal = MallocStringOf(attrProp, &len); + jerry_release_value(attrProp); + uint16_t attrId = KeyParser::ParseKeyId(attrVal, len); + ACE_FREE(attrVal); + if (!KeyParser::IsKeyValid(attrId)) { + return StyleState::ERROR; + } + StyleState styleState = StyleState::UNKNOWN; + switch (attrId) { + case K_NUMERIC: { + styleState = StyleState::NUMERIC; + break; + } + case K_DIGIT2: { + digitArray_[index] = true; + styleState = StyleState::NUMERIC; + break; + } + default: { + styleState = StyleState::ERROR; + break; + } + } + return styleState; +} + +const char *DateTimeFormatModule::SetTimeStyle(jerry_value_t style) +{ + const uint8_t hourIndex = 3; + StyleState hourStyle = GetStyle(style, "hour", hourIndex); + if (hourStyle == StyleState::ERROR) { + return "the hour style value is out of range"; + } + const uint8_t minuteIndex = 4; + StyleState minuteStyle = GetStyle(style, "minute", minuteIndex); + if (minuteStyle == StyleState::ERROR) { + return "the minute style value is out of range"; + } + const uint8_t secondIndex = 5; + StyleState secondStyle = GetStyle(style, "second", secondIndex); + if (secondStyle == StyleState::ERROR) { + return "the second style value is out of range"; + } + // the hour12 style is invalid when hour style is not set + if (hourStyle != StyleState::UNKNOWN) { + if (jerryx_has_property_str(style, "hour12")) { + jerry_value_t hour12Style = jerryx_get_property_str(style, "hour12"); + bool isHour12 = BoolOf(hour12Style); + jerry_release_value(hour12Style); + hourStyle = isHour12 ? StyleState::HOUR12 : StyleState::HOUR24; + } else { + hourStyle = StyleState::HOUR; + } + } + // find the most suitable mode for hour minute second style + isSetTime_ = GetTimePattern(hourStyle, minuteStyle, secondStyle); + if ((!isSetTime_) && (weekStyle_ == StyleState::UNKNOWN) && (monthStyle_ == StyleState::UNKNOWN)) { + isSetTime_ = true; + timePattern_ = AvailableDateTimeFormatPattern::SHORT; + } + return nullptr; +} + +bool DateTimeFormatModule::SetMonthPattern(StyleState monthStyle, + AvailableDateTimeFormatPattern widePattern, + AvailableDateTimeFormatPattern shortPattern, + AvailableDateTimeFormatPattern numberPattern) +{ + bool result = true; + switch (monthStyle) { + case StyleState::LONG: { + datePattern_ = widePattern; + break; + } + case StyleState::SHORT: { + datePattern_ = shortPattern; + break; + } + case StyleState::NUMERIC: { + datePattern_ = numberPattern; + break; + } + default: { + result = false; + break; + } + } + return result; +} + +bool DateTimeFormatModule::SetDatePattern(StyleState weekdayStyle, + StyleState yearStyle, + StyleState monthStyle, + StyleState dayStyle) +{ + // the pattern support is (weekday)-year-month-day + if ((yearStyle == StyleState::UNKNOWN) || + (dayStyle == StyleState::UNKNOWN) || + (monthStyle == StyleState::UNKNOWN)) { + return false; + } + bool result = true; + switch (weekdayStyle) { + case StyleState::LONG: { + result = SetMonthPattern(monthStyle, AvailableDateTimeFormatPattern::FULL, + AvailableDateTimeFormatPattern::YEAR_ABBR_MONTH_WIDE_WEEKDAY_DAY, + AvailableDateTimeFormatPattern::YEAR_SHORT_MONTH_WIDE_WEEKDAY_DAY); + break; + } + case StyleState::SHORT: { + result = SetMonthPattern(monthStyle, AvailableDateTimeFormatPattern::YEAR_WIDE_MONTH_ABBR_WEEKDAY_DAY, + AvailableDateTimeFormatPattern::YEAR_ABBR_MONTH_ABBR_WEEKDAY_DAY, + AvailableDateTimeFormatPattern::YEAR_SHORT_MONTH_ABBR_WEEKDAY_DAY); + break; + } + default: { + result = SetMonthPattern(monthStyle, AvailableDateTimeFormatPattern::YEAR_WIDE_MONTH_DAY, + AvailableDateTimeFormatPattern::MEDIUM, + AvailableDateTimeFormatPattern::SHORT); + break; + } + } + return result; +} + +bool DateTimeFormatModule::GetTimePattern(StyleState hourStyle, + StyleState minuteStyle, + StyleState secondStyle) +{ + // the support pattern is hour-minute-(second) + if ((hourStyle == StyleState::UNKNOWN) || (minuteStyle == StyleState::UNKNOWN)) { + return false; + } + bool result = true; + switch (hourStyle) { + case StyleState::HOUR12: { + timePattern_ = (secondStyle == StyleState::UNKNOWN) ? AvailableDateTimeFormatPattern::HOUR12_MINUTE : + AvailableDateTimeFormatPattern::HOUR12_MINUTE_SECOND; + break; + } + case StyleState::HOUR24: { + timePattern_ = (secondStyle == StyleState::UNKNOWN) ? AvailableDateTimeFormatPattern::HOUR24_MINUTE : + AvailableDateTimeFormatPattern::HOUR24_MINUTE_SECOND; + break; + } + case StyleState::HOUR: { + timePattern_ = (secondStyle == StyleState::UNKNOWN) ? AvailableDateTimeFormatPattern::HOUR_MINUTE : + HOUR_MINUTE_SECOND; + break; + } + default: { + result = false; + break; + } + } + return result; +} +} +} +#endif diff --git a/frameworks/src/core/modules/presets/date_time_format_module.h b/frameworks/src/core/modules/presets/date_time_format_module.h new file mode 100644 index 0000000..c874503 --- /dev/null +++ b/frameworks/src/core/modules/presets/date_time_format_module.h @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_DATE_TIME_FORMAT_MODULE_H +#define OHOS_ACELITE_DATE_TIME_FORMAT_MODULE_H + +#include "acelite_config.h" +#ifdef FEATURE_DATE_FORMAT +#include "js_fwk_common.h" +#include "date_time_format.h" +namespace OHOS { +namespace ACELite { +class DateTimeFormatModule final : public MemoryHeap { +public: + /** + * @brief register dateTimeFormat attribute and register the format method to dateTimeFormat + */ + static void Init(jerry_value_t intlHandle); + + static void DeleteDateFormat(void *pointer); + + static jerry_object_native_info_t GC_CALLBACK; + +private: + constexpr static uint8_t TIME_NUMBER_LEN = 6; // the num of number in format string + constexpr static uint8_t MAX_NUM_LEN = 10; + DateTimeFormatModule(); + + ~DateTimeFormatModule(); + + /** + * @brief get the locale number form 0-9 + * @param info the language and region object + * @return get the number digit result + */ + bool InitNumArray(I18N::LocaleInfo info); + + enum StyleState : uint8_t { + SHORT, + NUMERIC, + LONG, + HOUR12, + HOUR24, + HOUR, + UNKNOWN, // the style is not set + ERROR // the style value is invalid + }; + + static jerry_value_t CreateDateTimeFormat(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static jerry_value_t Format(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + const char *SetDateStyle(jerry_value_t style); + + const char *SetTimeStyle(jerry_value_t style); + + /** + * @brief set the date time pattern + */ + bool SetDatePattern(StyleState weekdayStyle, + StyleState yearStyle, + StyleState monthStyle, + StyleState dayStyle); + + /** + * @brief get the hour minute second style pattern + */ + bool GetTimePattern(StyleState hourStyle, + StyleState minuteStyle, + StyleState secondStyle); + + /** + * @brief check the specified position in coampared string is number or not + * @param comapre: the compare string + * @param start: the specified position + * @return if the specified string is digit, return the last position of single number, + * else return -1 + */ + int16_t GetNumberEnd(const char *compare, uint8_t start) const; + + StyleState GetWeekdayStyle(jerry_value_t style) const; + + StyleState GetStyle(jerry_value_t style, const char *attrName, const uint8_t index); + + StyleState GetMonthStyle(jerry_value_t style); + + /** + * @brief execute the function in date object + * @param time : the js date object + * funcName : the name of executed function + * @return the number value of execute the function + */ + double GetTimeVal(jerry_value_t time, const char *funcName) const; + + /** + * @brief format the time to date through locale info + * @param date: the time need to format + * res : store the format date string + * resSize : the size of format result + * start: the start storage position in res + */ + void FormatDate(time_t date, char *res, const uint8_t resSize, uint8_t &start); + + /** + * @brief get the time zone, and convert local time to GMT time + * @param time the timestamp of local time + */ + void ConvertLocalToGMT(time_t &time) const; + + /** + * @brief format the time to hour-minute-second through locale info + * @param date: the time need to format + * res : store the format date string + * resSize : the length of format result + * start: the start storage position in res + */ + void FormatTime(time_t time, char *res, const uint8_t resSize, uint8_t &start); + + /** + * @brief get the first number in string + * @param the string to get the first number + * @return if string starts with number, return the end index of first number in string + * else return -1 + */ + int16_t GetNum(const char *format) const; + + /** + * @brief Get the month format value + * @param time the js time which need to format + * @return the format js value + */ + jerry_value_t GetMonthVal(jerry_value_t time) const; + + /** + * @brief format the first number to 2 digit + * @param time the string need to format to 2-digit or remain + * res the string to store the format result + * start the start position to store format result + * isDigit2 if true, format the first number to 2-digit + * if false remain the first digit + * @return the next number index + */ + int16_t FormatDigit(const char *time, char *res, const uint8_t resSize, uint8_t &start, bool isDigit2) const; + + void ReleaseNumArray(); + + bool SetMonthPattern(StyleState monthStyle, + I18N::AvailableDateTimeFormatPattern widePattern, + I18N::AvailableDateTimeFormatPattern shortPattern, + I18N::AvailableDateTimeFormatPattern numberPattern); + + uint8_t GetNumInDate(const char *date) const; + I18N::DateTimeFormat *dateFormat_; + I18N::LocaleInfo *info_; + I18N::AvailableDateTimeFormatPattern timePattern_; + I18N::AvailableDateTimeFormatPattern datePattern_; + StyleState weekStyle_; + StyleState monthStyle_; + char **numArray_; + bool isSetTime_; + bool isSetDate_; + bool digitArray_[TIME_NUMBER_LEN]; +}; +} +} +#endif +#endif // DATE_TIME_FORMAT_MODEL_H diff --git a/src/core/modules/presets/feature_ability_module.cpp b/frameworks/src/core/modules/presets/feature_ability_module.cpp similarity index 90% rename from src/core/modules/presets/feature_ability_module.cpp rename to frameworks/src/core/modules/presets/feature_ability_module.cpp index b7c1189..6c4acab 100755 --- a/src/core/modules/presets/feature_ability_module.cpp +++ b/frameworks/src/core/modules/presets/feature_ability_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -21,9 +21,7 @@ #include "js_app_context.h" #include "js_async_work.h" #include "js_fwk_common.h" -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) namespace OHOS { namespace ACELite { @@ -162,8 +160,8 @@ jerry_value_t FeatureAbilityModule::Detect(const jerry_value_t func, } char *bundleName = const_cast(JsAppContext::GetInstance()->GetCurrentBundleName()); - int32_t ret = AbilityKit::DetectPhoneApp(bundleName, dstAbilityName, - detectSuccessCallback_, detectFailCallback_, detectCallbackContext_); + int32_t ret = AbilityKit::DetectPhoneApp(bundleName, dstAbilityName, detectSuccessCallback_, detectFailCallback_, + detectCallbackContext_); if (ret != 0) { SyncFailCallback(detectFailCallback_, context, ERR_SEND_FAIL, ERR_CODE_SEND_MSG_FAILED); } @@ -214,10 +212,9 @@ jerry_value_t FeatureAbilityModule::SendMsgToPeer(const jerry_value_t func, SyncSendMsgCallback(args[0], context, ERR_MESSAGE, ERR_CODE_INVALID_PARAMETER, false); } else { char *bundleName = const_cast(JsAppContext::GetInstance()->GetCurrentBundleName()); - int32_t ret = AbilityKit::SendMsgToPeerApp((idLength == 0), bundleName, dstBundleName, - (reinterpret_cast(message)), strlen(message), - sendMsgSuccessCallback_, sendMsgFailCallback_, - sendMsgCallbackContext_); + int32_t ret = AbilityKit::SendMsgToPeerApp( + (idLength == 0), bundleName, dstBundleName, (reinterpret_cast(message)), strlen(message), + sendMsgSuccessCallback_, sendMsgFailCallback_, sendMsgCallbackContext_); // if the message is sent out successfully, do not invoke user's callback until the peer result back if (ret != 0) { SyncSendMsgCallback(args[0], context, ERR_SEND_FAIL, ERR_CODE_SEND_MSG_FAILED, false); @@ -265,7 +262,7 @@ jerry_value_t FeatureAbilityModule::SubscribeMessage(const jerry_value_t func, if (!registed) { char *bundleName = const_cast(JsAppContext::GetInstance()->GetCurrentBundleName()); AbilityKit::RegisterReceiver(bundleName, MessageSuccessCallback, MessageFailCallback, successCallback_, - failCallback_, callbackContext_); + failCallback_, callbackContext_); registed = true; } @@ -291,36 +288,28 @@ int32_t FeatureAbilityModule::MessageSuccessCallback(const void *data) if (data == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "message error"); return -1; - } else { - ACE_FEATURE_EVENT_PRINT(MT_ACE_FEATUREABILITY, MT_ACE_FEATUREABILITY_SUBSCRIBEMSG, 0); - const FeatureAbilityDataInfo *origin = static_cast(data); - FeatureAbilityDataInfo *target = - static_cast(ace_malloc(sizeof(FeatureAbilityDataInfo))); - if (target == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "Failed to ace_malloc data"); - return -1; - } -#if ENABLED(SECURE_C_FUNCTION) - if (memset_s(target, sizeof(FeatureAbilityDataInfo), 0, sizeof(FeatureAbilityDataInfo)) != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "MessageSuccessCallback memset_s failed"); - ACE_FREE(target); - return -1; - } -#else - target->deviceID = nullptr; - target->bundleName = nullptr; - target->abilityName = nullptr; - target->messageLength = 0; - target->message = nullptr; -#endif - CopySuccessMessage(origin, target); - if (!JsAsyncWork::DispatchAsyncWork(AsyncSuccessCallback, target)) { - ACE_FREE(target->deviceID); - ACE_FREE(target->bundleName); - ACE_FREE(target->abilityName); - ACE_FREE(target->message); - ACE_FREE(target); - } + } + ACE_FEATURE_EVENT_PRINT(MT_ACE_FEATUREABILITY, MT_ACE_FEATUREABILITY_SUBSCRIBEMSG, 0); + const FeatureAbilityDataInfo *origin = static_cast(data); + FeatureAbilityDataInfo *target = static_cast(ace_malloc(sizeof(FeatureAbilityDataInfo))); + if (target == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Failed to ace_malloc data"); + return -1; + } + + if (memset_s(target, sizeof(FeatureAbilityDataInfo), 0, sizeof(FeatureAbilityDataInfo)) != 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "MessageSuccessCallback memset_s failed"); + ACE_FREE(target); + return -1; + } + + CopySuccessMessage(origin, target); + if (!JsAsyncWork::DispatchAsyncWork(AsyncSuccessCallback, target)) { + ACE_FREE(target->deviceID); + ACE_FREE(target->bundleName); + ACE_FREE(target->abilityName); + ACE_FREE(target->message); + ACE_FREE(target); } return 0; diff --git a/src/core/modules/presets/feature_ability_module.h b/frameworks/src/core/modules/presets/feature_ability_module.h similarity index 100% rename from src/core/modules/presets/feature_ability_module.h rename to frameworks/src/core/modules/presets/feature_ability_module.h diff --git a/frameworks/src/core/modules/presets/intl_module.cpp b/frameworks/src/core/modules/presets/intl_module.cpp new file mode 100644 index 0000000..40214f0 --- /dev/null +++ b/frameworks/src/core/modules/presets/intl_module.cpp @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "intl_module.h" +#ifdef FEATURE_INTL_MODULE +#include "ace_log.h" +#include "date_time_format_module.h" +#include "global.h" +#include "string.h" +#include "number_format_module.h" +#include "js_fwk_common.h" +namespace OHOS { +namespace ACELite { +void IntlModule::Init() +{ + jerry_value_t globalObj = jerry_get_global_object(); + jerry_value_t baseObj = jerry_create_object(); +#ifdef FEATURE_NUMBER_FORMAT + NumberFormatModule::Init(baseObj); +#endif +#ifdef FEATURE_DATE_FORMAT + DateTimeFormatModule::Init(baseObj); +#endif + JerrySetNamedProperty(globalObj, "Intl", baseObj); + jerry_release_value(globalObj); +} +} // namespace ACELite +} // namespace OHOS +#endif diff --git a/frameworks/src/core/modules/presets/intl_module.h b/frameworks/src/core/modules/presets/intl_module.h new file mode 100644 index 0000000..d0fae5a --- /dev/null +++ b/frameworks/src/core/modules/presets/intl_module.h @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_INTL_MODULE_H +#define OHOS_ACELITE_INTL_MODULE_H +#include "acelite_config.h" +#ifdef FEATURE_INTL_MODULE +#include "js_fwk_common.h" +#include "non_copyable.h" +#include "locale_info.h" +namespace OHOS { +namespace ACELite { +class IntlModule final { +public: + ACE_DISALLOW_COPY(IntlModule); + static IntlModule *GetInstance() + { + static IntlModule intlModule; + return &intlModule; + } + + /** + * @brief: add Intl object to context and register numberformat and dateformat object + * and add format method support + */ + void Init(); + +private: + IntlModule() {} + + ~IntlModule() {} +}; +} +} +#endif // FEATURE_INTL_MODULE + +namespace OHOS { +namespace ACELite { +class IntlControlModule final { +public: + IntlControlModule() = default; + ~IntlControlModule() = default; + + static void Load() + { +#ifdef FEATURE_INTL_MODULE + IntlModule *intlModule = IntlModule::GetInstance(); + intlModule->Init(); +#endif + } +}; +} +} + +#endif // INTLMODULE_H diff --git a/src/core/modules/presets/jstest_module.cpp b/frameworks/src/core/modules/presets/jstest_module.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/jstest_module.cpp rename to frameworks/src/core/modules/presets/jstest_module.cpp diff --git a/src/core/modules/presets/jstest_module.h b/frameworks/src/core/modules/presets/jstest_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/jstest_module.h rename to frameworks/src/core/modules/presets/jstest_module.h diff --git a/src/core/modules/presets/localization_module.cpp b/frameworks/src/core/modules/presets/localization_module.cpp old mode 100755 new mode 100644 similarity index 50% rename from src/core/modules/presets/localization_module.cpp rename to frameworks/src/core/modules/presets/localization_module.cpp index 4e6ec42..585fc18 --- a/src/core/modules/presets/localization_module.cpp +++ b/frameworks/src/core/modules/presets/localization_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -17,7 +17,6 @@ #include "ace_event_error_code.h" #ifdef FEATURE_LOCALIZATION_MODULE #include "ace_log.h" -#include "file.h" #include "js_fwk_common.h" #include @@ -56,10 +55,6 @@ void LocalizationModule::Clear() delete parser_; parser_ = nullptr; } - if (currentList_ != nullptr) { - cJSON_Delete(currentList_); - currentList_ = nullptr; - } } #ifdef LOCALIZATION_PLURAL @@ -71,96 +66,36 @@ jerry_value_t LocalizationModule::GetValueByKey(const jerry_value_t *args, const if (argsNum == 0) { return UNDEFINED; } - char *result = nullptr; LocalizationModule *localization = GetInstance(); + if (localization->parser_ == nullptr) { + localization->parser_ = new CJSONParser(); + if (localization->parser_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "create json parser failed"); + return UNDEFINED; + } + if (!localization->parser_->Init()) { + ACE_ERROR_CODE_PRINT(EXCE_ACE_LOCALIZATION_FAILED, EXCE_ACE_LOCALIZATION_SYSTEM_LANGUAGE_NOT_INITIALIZED); + localization->Clear(); // parser init failed, release the resource of this module + return UNDEFINED; + } + } + // if system language origion info changed, cache new file to psram/ram + CJSONParser::LanguageState change = localization->parser_->ChangeLanguage(); + if ((change == CJSONParser::LanguageState::LANGUAGE_CHANGED) || + (change == CJSONParser::LanguageState::LANGUAGE_FAIL)) { + if (!localization->parser_->CacheFile()) { + HILOG_ERROR(HILOG_MODULE_ACE, "cache file failed"); + } + } char *param = MallocStringOf(args[0]); if (param == nullptr) { return UNDEFINED; } - cJSON *currentItem = localization->GetJSONByKey(param); - if (currentItem == nullptr) { - jerry_value_t paramProp = jerry_create_string(reinterpret_cast(param)); - ace_free(param); - param = nullptr; - return paramProp; - } - jerry_value_t arg = UNDEFINED; - if (argsNum > 1) { - arg = args[1]; - } - if (currentItem->type == cJSON_String) { -#ifdef LOCALIZATION_PLURAL - result = localization->parser_->FillPlaceholder(currentItem->valuestring, arg, argsNum, isPlural); -#else - result = localization->parser_->FillPlaceholder(currentItem->valuestring, arg, argsNum); -#endif // LOCALIZATION_PLURAL - } else if (currentItem->type == cJSON_Object || (currentItem->type == cJSON_Array)) { - char* format = cJSON_Print(currentItem); -#ifdef LOCALIZATION_PLURAL - result = localization->parser_->FillPlaceholder(format, arg, argsNum, isPlural); -#else - result = localization->parser_->FillPlaceholder(format, arg, argsNum); -#endif // LOCALIZATION_PLURAL - if (format != nullptr) { - cJSON_free(format); - format = nullptr; - } - } - if (result != nullptr) { - ace_free(param); - param = nullptr; - } else { - // if currentItem is invalid, return the whole key.e.g.the currrentItem is nullptr - result = param; - } - jerry_value_t resultProp = jerry_create_string(reinterpret_cast(result)); - ACE_FREE(result); - cJSON_Delete(localization->currentList_); - localization->currentList_ = nullptr; + jerry_value_t resultProp = localization->parser_->GetValue(param, args, argsNum); + ace_free(param); + param = nullptr; return resultProp; } - -cJSON *LocalizationModule::GetJSONByKey(const char *key) -{ - char delemeter = '.'; - if (parser_ == nullptr) { - parser_ = new CJSONParser(); - if (parser_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create json parser failed"); - return nullptr; - } - if (!parser_->Init()) { - ACE_ERROR_CODE_PRINT(EXCE_ACE_LOCALIZATION_FAILED, EXCE_ACE_LOCALIZATION_SYSTEM_LANGUAGE_NOT_INITIALIZED); - Clear(); // parser init failed, release the resource of this module - return nullptr; - } - } - - cJSON *curJsonItem = nullptr; - CJSONParser::ListNode *keySplited = nullptr; - // split the key by '.' - uint8_t keyCount = parser_->Split(key, delemeter, keySplited); - uint8_t curKeyIndex = 0; - // get the json object which defined the key - do { - if (curJsonItem == nullptr) { - curKeyIndex = 0; - // read the next json file and assign it to currentList_ - if (!parser_->ChangeJsonFile(currentList_)) { - break; - } - curJsonItem = currentList_; - } - // get the current splited key - char *message = CJSONParser::GetNode(keySplited, keyCount - curKeyIndex); - curJsonItem = cJSON_GetObjectItem(curJsonItem, message); - curKeyIndex++; - } while (!(curKeyIndex == keyCount && (curJsonItem != nullptr))); - CJSONParser::ClearNode(keySplited); - // reset the index of read file - parser_->ResetIndex(); - return curJsonItem; -} } // namespace ACELite } // namespace OHOS #endif // LOCALIZATION_MODULE diff --git a/src/core/modules/presets/localization_module.h b/frameworks/src/core/modules/presets/localization_module.h old mode 100755 new mode 100644 similarity index 94% rename from src/core/modules/presets/localization_module.h rename to frameworks/src/core/modules/presets/localization_module.h index 490a3eb..219534f --- a/src/core/modules/presets/localization_module.h +++ b/frameworks/src/core/modules/presets/localization_module.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -65,14 +65,12 @@ public: #endif private: - LocalizationModule() : parser_(nullptr), currentList_(nullptr) {} + LocalizationModule() : parser_(nullptr) {} ~LocalizationModule() { Clear(); } - cJSON *GetJSONByKey(const char *key); CJSONParser *parser_; - cJSON *currentList_; }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/modules/presets/number_format_module.cpp b/frameworks/src/core/modules/presets/number_format_module.cpp new file mode 100755 index 0000000..35a308a --- /dev/null +++ b/frameworks/src/core/modules/presets/number_format_module.cpp @@ -0,0 +1,233 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "number_format_module.h" +#include "ace_log.h" +#ifdef FEATURE_NUMBER_FORMAT +#include "locale_util.h" +#include "string.h" +#include "key_parser.h" +#include "keys.h" +#include "types.h" +namespace OHOS { +namespace ACELite { +using namespace I18N; +constexpr jerry_object_native_info_t NumberFormatModule::gcCallback; +void NumberFormatModule::Init(jerry_value_t intlHandle) +{ + jerry_value_t constructor = jerry_create_external_function(CreateNumberFormat); + jerry_value_t format = jerry_create_external_function(Format); + jerry_value_t baseObj = jerry_create_object(); + JerrySetNamedProperty(baseObj, "format", format); + JerrySetNamedProperty(constructor, "prototype", baseObj); + JerrySetNamedProperty(intlHandle, "NumberFormat", constructor); + ReleaseJerryValue(constructor, format, baseObj, VA_ARG_END_FLAG); +} + +jerry_value_t NumberFormatModule::CreateNumberFormat(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + if (!jerry_value_is_constructor(func)) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast + ("use new to create NumberFormat")); + } + NumberFormatModule *numModule = new NumberFormatModule(); + if (numModule == nullptr) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("memory is not enough")); + } + char *value = nullptr; + if (argsNum >= 1) { + value = MallocStringOf(args[0]); + } + numModule->localeInfo_ = LocaleUtil::GetLocaleInfo(value); + ACE_FREE(value); + if (numModule->localeInfo_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "get system info failed"); + delete numModule; + numModule = nullptr; + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("get locale info failed")); + } + int status = 0; + numModule->formatter_ = new NumberFormat(*(numModule->localeInfo_), status); + if ((numModule->formatter_ == nullptr) || (status == I18nStatus::IERROR)) { + delete numModule; + numModule = nullptr; + HILOG_ERROR(HILOG_MODULE_ACE, "init resource failed"); + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("init resource failed")); + } + const char *result = nullptr; + const uint8_t maxArgLen = 2; + if (argsNum >= maxArgLen) { + // set the number style + jerry_value_t keys = jerry_get_object_keys(args[1]); + uint8_t size = jerry_get_array_length(keys); + for (uint8_t index = 0; index < size; index++) { + jerry_value_t key = jerry_get_property_by_index(keys, index); + result = SetStyle(*numModule, key, args[1]); + jerry_release_value(key); + } + jerry_release_value(keys); + if (result != nullptr) { + delete numModule; + numModule = nullptr; + return jerry_create_error(JERRY_ERROR_RANGE, reinterpret_cast(result)); + } + } + jerry_set_object_native_pointer(context, numModule, &gcCallback); + return UNDEFINED; +} + +jerry_value_t NumberFormatModule::Format(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + if ((argsNum < 1) || (!jerry_value_is_number(args[0]))) { + HILOG_ERROR(HILOG_MODULE_ACE, "the args num in number format is error"); + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("format invalid value")); + } + double number = jerry_get_number_value(args[0]); + NumberFormatModule *numModule = nullptr; + if ((!jerry_get_object_native_pointer(context, reinterpret_cast(&numModule), &gcCallback)) || + (numModule == nullptr) || (numModule->formatter_ == nullptr)) { + HILOG_ERROR(HILOG_MODULE_ACE, "get the object number formatter failed"); + return UNDEFINED; + } + const char *result = nullptr; + int status = 0; + if (numModule->isUsingGroup_) { + result = numModule->formatter_->Format(number, numModule->formatType_, status).data(); + } else { + result = numModule->formatter_->FormatNoGroup(number, numModule->formatType_, status).data(); + } + if (status == I18nStatus::IERROR) { + HILOG_ERROR(HILOG_MODULE_ACE, "format number failed"); + return UNDEFINED; + } + if (result != nullptr) { + return jerry_create_string(reinterpret_cast(result)); + } + return UNDEFINED; +} + +void NumberFormatModule::DeleteNumberFormat(void *nativePointer) +{ + NumberFormatModule *format = reinterpret_cast(nativePointer); + if (format != nullptr) { + delete format; + format = nullptr; + } +} + +const char *NumberFormatModule::SetStyle(NumberFormatModule &numModel, + const jerry_value_t key, + const jerry_value_t style) +{ + uint16_t styleLen = 0; + char *styleName = MallocStringOf(key, &styleLen); + uint32_t styleNameId = KeyParser::ParseKeyId(styleName, styleLen); + ACE_FREE(styleName); + if (!KeyParser::IsKeyValid(styleNameId)) { + HILOG_ERROR(HILOG_MODULE_ACE, "the style name is invalid"); + return nullptr; + } + jerry_value_t styleValue = jerry_get_property(style, key); + const char *result = nullptr; + switch (styleNameId) { + case K_STYLE: { + if (!numModel.SetNumberStyle(styleValue)) { + result = "the style is invalid"; + } + break; + } + case K_USEGROUP: { + numModel.SetUsingGroup(styleValue); + break; + } + case K_MINIMUMFRACTIONDIGITS: { + int16_t number = IntegerOf(styleValue); + const uint8_t maxMiniFraction = 20; + if ((number < 0) || (number > maxMiniFraction)) { + HILOG_ERROR(HILOG_MODULE_ACE, "the minimumFractionDigits is invalid"); + result = "the minimumFractionDigits is invalid"; + } + if (numModel.formatType_ == NumberFormatType::DECIMAL) { + numModel.formatter_->SetMinDecimalLength(number); + } + break; + } + case K_MAXIMUMFRACTIONDIGITS: { + if (!numModel.SetMaximumFractionDigits(styleValue)) { + result = "the maximumFractionDigits is invalid"; + } + break; + } + default: + break; + } + jerry_release_value(styleValue); + return result; +} + +void NumberFormatModule::SetUsingGroup(jerry_value_t styleValue) +{ + if (!jerry_value_is_boolean(styleValue)) { + HILOG_ERROR(HILOG_MODULE_ACE, "set the useGroup value failed"); + return; + } + isUsingGroup_ = jerry_get_boolean_value(styleValue); +} + +bool NumberFormatModule::SetMaximumFractionDigits(jerry_value_t styleValue) +{ + int16_t number = IntegerOf(styleValue); + const uint8_t maxMaxFraction = 20; + if ((number < 0) || (number > maxMaxFraction)) { + HILOG_ERROR(HILOG_MODULE_ACE, "the maximumFractionDigits is out of range"); + return false; + } + const int16_t defaultMaxmumFractionDigits = 3; + if (number < defaultMaxmumFractionDigits) { + HILOG_WARN(HILOG_MODULE_ACE, "the maximumFractionDigits is too small"); + } else { + if (formatType_ == NumberFormatType::PERCENT) { + // set maxDecimalLength in percent is invalid + HILOG_ERROR(HILOG_MODULE_ACE, "set maximumFractionDigits failed in percent"); + return true; + } + formatter_->SetMaxDecimalLength(number); + } + return true; +} + +bool NumberFormatModule::SetNumberStyle(jerry_value_t styleValue) +{ + char *type = MallocStringOf(styleValue); + if ((type != nullptr) && (!strcmp(type, "percent"))) { + formatType_ = NumberFormatType::PERCENT; + } else if ((type == nullptr) || (!strcmp(type, "decimal"))) { + formatType_ = NumberFormatType::DECIMAL; + } else { + ACE_FREE(type); + return false; + } + ACE_FREE(type); + return true; +} +} +} +#endif diff --git a/frameworks/src/core/modules/presets/number_format_module.h b/frameworks/src/core/modules/presets/number_format_module.h new file mode 100644 index 0000000..d499e3a --- /dev/null +++ b/frameworks/src/core/modules/presets/number_format_module.h @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_NUMBER_FORMAT_MODEL_H +#define OHOS_ACELITE_NUMBER_FORMAT_MODEL_H + +#include "acelite_config.h" +#ifdef FEATURE_NUMBER_FORMAT +#include "list.h" +#include "js_fwk_common.h" +#include "number_format.h" +#include "types.h" +namespace OHOS { +namespace ACELite { +class NumberFormatModule final : public MemoryHeap { +public: + ACE_DISALLOW_COPY(NumberFormatModule); + /** + * @brief register number format method and numberFormat object + */ + static void Init(jerry_value_t intlHandle); + + /** + * @brief delete the date format object + * @param the pointer need to be delete + */ + static void DeleteNumberFormat(void *nativePointer); + + // the handle to release the native value when the js value number format object is not needed. + static constexpr jerry_object_native_info_t gcCallback = {.free_cb = DeleteNumberFormat}; + +private: + NumberFormatModule() : isUsingGroup_(true), + formatType_(I18N::NumberFormatType::DECIMAL), + formatter_(nullptr), + localeInfo_(nullptr) { + } + + ~NumberFormatModule() + { + if (formatter_ != nullptr) { + delete formatter_; + formatter_ = nullptr; + } + if (localeInfo_ != nullptr) { + delete localeInfo_; + localeInfo_ = nullptr; + } + } + static jerry_value_t CreateNumberFormat(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + static jerry_value_t Format(const jerry_value_t func, + const jerry_value_t context, + const jerry_value_t args[], + const jerry_length_t argsNum); + + static const char *SetStyle(NumberFormatModule &numModel, + const jerry_value_t key, + const jerry_value_t styleValue); + + void SetUsingGroup(jerry_value_t styleValue); + + bool SetMaximumFractionDigits(jerry_value_t styleValue); + + bool SetNumberStyle(jerry_value_t styleValue); + + bool isUsingGroup_; + I18N::NumberFormatType formatType_; + I18N::NumberFormat *formatter_; + I18N::LocaleInfo *localeInfo_; +}; +} +} +#endif // FEATURE_NUMBER_FORAMT + +#endif // NUMBER_FORMAT_MODEL_H diff --git a/src/core/modules/presets/preset_module.cpp b/frameworks/src/core/modules/presets/preset_module.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/preset_module.cpp rename to frameworks/src/core/modules/presets/preset_module.cpp diff --git a/src/core/modules/presets/preset_module.h b/frameworks/src/core/modules/presets/preset_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/preset_module.h rename to frameworks/src/core/modules/presets/preset_module.h diff --git a/src/core/modules/presets/profiler_module.cpp b/frameworks/src/core/modules/presets/profiler_module.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/core/modules/presets/profiler_module.cpp rename to frameworks/src/core/modules/presets/profiler_module.cpp index 33a8939..09fc464 --- a/src/core/modules/presets/profiler_module.cpp +++ b/frameworks/src/core/modules/presets/profiler_module.cpp @@ -17,7 +17,7 @@ namespace OHOS { namespace ACELite { /** - * Useage: + * Usage: * profiler.startTracing(5); * xxxx * profiler.stopTracing(); diff --git a/src/core/modules/presets/profiler_module.h b/frameworks/src/core/modules/presets/profiler_module.h similarity index 100% rename from src/core/modules/presets/profiler_module.h rename to frameworks/src/core/modules/presets/profiler_module.h diff --git a/src/core/modules/presets/render_module.cpp b/frameworks/src/core/modules/presets/render_module.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/render_module.cpp rename to frameworks/src/core/modules/presets/render_module.cpp diff --git a/src/core/modules/presets/render_module.h b/frameworks/src/core/modules/presets/render_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/render_module.h rename to frameworks/src/core/modules/presets/render_module.h diff --git a/src/core/modules/presets/require_module.cpp b/frameworks/src/core/modules/presets/require_module.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/require_module.cpp rename to frameworks/src/core/modules/presets/require_module.cpp diff --git a/src/core/modules/presets/require_module.h b/frameworks/src/core/modules/presets/require_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/require_module.h rename to frameworks/src/core/modules/presets/require_module.h diff --git a/frameworks/src/core/modules/presets/test/unittest/BUILD.gn b/frameworks/src/core/modules/presets/test/unittest/BUILD.gn new file mode 100755 index 0000000..a35b3b3 --- /dev/null +++ b/frameworks/src/core/modules/presets/test/unittest/BUILD.gn @@ -0,0 +1,31 @@ +#Copyright (c) 2021 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("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +unittest("js_frameworks_test_date_time") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "common/date_time_module_tdd_test.cpp" ] + deps = ace_test_deps +} + +unittest("js_frameworks_test_number_format") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ "common/number_format_module_tdd_test.cpp" ] + deps = ace_test_deps +} diff --git a/frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.cpp b/frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.cpp new file mode 100755 index 0000000..e762fe4 --- /dev/null +++ b/frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.cpp @@ -0,0 +1,2335 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "date_time_module_tdd_test.h" +#ifdef FEATURE_DATE_FORMAT +#include "global.h" +#include "js_app_context.h" +#include "js_app_environment.h" +namespace OHOS { +namespace ACELite { +void DateTimeModuleTddTest::SetUp() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + if (env == nullptr) { + // should never happen + return; + } + env->InitJsFramework(); +} + +void DateTimeModuleTddTest::TearDown() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + JsAppContext *context = JsAppContext::GetInstance(); + if (env == nullptr || context == nullptr) { + // should never happen + return; + } + context->ReleaseStyles(); + env->Cleanup(); +} + +jerry_value_t DateTimeModuleTddTest::RunJs(const char* js) +{ + const jerry_char_t *jsContent = reinterpret_cast(js); + jerry_length_t len = strlen(js); + jerry_value_t result = jerry_eval(jsContent, len, JERRY_PARSE_NO_OPTS); + return result; +} + +char* DateTimeModuleTddTest::FormatDate(const jerry_value_t dateTime, + const jerry_value_t args[], + const jerry_length_t argsNum) +{ + EXPECT_FALSE(IS_UNDEFINED(dateTime)); + jerry_value_t format = jerryx_get_property_str(dateTime, "format"); + EXPECT_FALSE(IS_UNDEFINED(format)); + jerry_value_t result = CallJSFunction(format, dateTime, args, argsNum); + char* formatRes = MallocStringOf(result); + ReleaseJerryValue(format, result, VA_ARG_END_FLAG); + return formatRes; +} + +/** + * @tc.name: DateTime_Locale_Test001 + * @tc.desc: Test the effective value of locale + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Locale_Test001, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + GLOBAL_ConfigLanguage("en-US"); + + /** + * @tc.steps : step1. set the system locale en-US, and create the + * date time object + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US');"); + + /** + * @tc.steps: step2. set the format time 2020/9/28 + * @tc.expected: step2. the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 9, 4, 5)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3:set the formatter locale zh-CN and create the date time format object + */ + dateTime = RunJs("new Intl.DateTimeFormat('zh-CN')"); + + /** + * @brief tc.steps:step4.get the format attribute and format the date + */ + formatRes = FormatDate(dateTime, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2020/10/28"))); + ACE_FREE(formatRes); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Locale_Test002 + * @tc.desc: Test the effective and invalid value of locale + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Locale_Test002, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + GLOBAL_ConfigLanguage("en-US"); + + /** + * @tc.steps:step1:create the dateTime format object and set the locale info en + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en')"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 + * @tc.expected:step2.the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9,28);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) ||(strcmp(formatRes, "10/28/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTimeFormat object and set the locale info aaaa + */ + dateTime = RunJs("new Intl.DateTimeFormat('aaaa');"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 + * @tc.expected:step4.the format result is 10/28/20 + */ + formatRes = FormatDate(dateTime, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ReleaseJerryValue(args[0], dateTime, VA_ARG_END_FLAG); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour12_Group_Test003 + * @tc.desc: test the hour12 style true, hour style numeric, set different minute and second style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour12_Group_Test003, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTimeFormat object, set the locale info en-US, + * the hour12 style true, the hour style numeric, minute style numeric and + * second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:true, hour:'numeric', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step2.the format result is 2:04:05 PM + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 14, 4, 5);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * the hour12 style true, the hour style numeric, minute style numeric and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:true, hour:'numeric', minute:'numeric', second:'2-digit'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step4.the format result is 2:04:05 PM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the dateTime format object, set the locale info en-US, + * the hour12 style true, the hour style numeric, minute style 2-digit and the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:true, hour:'numeric', minute:'2-digit', second:'numeric'});"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step6.the format result is 2:04:05 PM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step7.create the dateTime format object, set the locale info en-US, + * the hour12 style true, the hour style numeric, minute style 2-digit and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', " + "{hour12:true, hour:'numeric', minute:'2-digit', second:'2-digit'});"); + + /** + * @tc.steps:step8.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step8.the format result is 2:04:05 PM + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour12_Group_Test004 + * @tc.desc: test the hour12 style true, hour style 2-digit, set different minute and second style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour12_Group_Test004, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTimeFormat object, set the locale info en-US, + * the hour12 style true, the hour style 2-digit, minute style numeric and + * second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:true, hour:'2-digit', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step2.the format result is 02:05:04 PM + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 14, 5,4);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "02:05:04 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * the hour12 style true, the hour style 2-digit, minute style numeric and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:true, hour:'2-digit', minute:'numeric', second:'2-digit'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step4.the format result is 02:05:04 PM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "02:05:04 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the dateTime format object, set the locale info en-US, + * the hour12 style true, the hour style 2-digit, minute style 2-digit and the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:true, hour:'2-digit', minute:'2-digit', second:'numeric'});"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step6.the format result is 02:05:04 PM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "02:05:04 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step7.create the dateTime format object, set the locale info en-US, + * the hour12 style true, the hour style numeric, minute style 2-digit and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:true, hour:'2-digit', minute:'2-digit', second:'2-digit'});"); + + /** + * @tc.steps:step8.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step8.the format result is 02:05:04 PM + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "02:05:04 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour12_FALSE_Test005 + * @tc.desc: test the hour12 style true, hour style numeric, set different minute and second style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour12_False_Test_005, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTimeFormat object, set the locale info en-US, + * the hour12 style false, the hour style numeric, minute style numeric and + * second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'numeric', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step2.the format result is 14:05:04 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 14, 5,4);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * the hour12 style false, the hour style numeric, minute style numeric and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'numeric', minute:'numeric', second:'2-digit'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step4.the format result is 14:05:04 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the dateTime format object, set the locale info en-US, + * the hour12 style false, the hour style numeric, minute style 2-digit and the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'numeric', minute:'2-digit', second:'numeric'});"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step6.the format result is 14:05:04 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step7.create the dateTime format object, set the locale info en-US, + * the hour12 style false, the hour style numeric, minute style 2-digit and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'numeric', minute:'2-digit', second:'2-digit'});"); + + /** + * @tc.steps:step8.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step8.the format result is 14:05:04 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour12_False_Test_006 + * @tc.desc: test the hour12 style true, hour style 2-digit, set different minute and second style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour12_False_Test006, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTimeFormat object, set the locale info en-US, + * the hour12 style false, the hour style 2-digit, minute style numeric and + * second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'2-digit', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step2.the format result is 14:05:04 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 14, 5,4);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * the hour12 style false, the hour style 2-digit, minute style numeric and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'2-digit', minute:'numeric', second:'2-digit'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step4.the format result is 14:05:04 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the dateTime format object, set the locale info en-US, + * the hour12 style false, the hour style 2-digit, minute style 2-digit and the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'2-digit', minute:'2-digit', second:'numeric'});"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step6.the format result is 14:05:04 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step7.create the dateTime format object, set the locale info en-US, + * the hour12 style false, the hour style 2-digit, minute style 2-digit and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour12:false, hour:'2-digit', minute:'2-digit', second:'2-digit'});"); + + /** + * @tc.steps:step8.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step8.the format result is 14:05:04 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "14:05:04"))); + ace_free(formatRes); + formatRes = nullptr; + + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour_Minute_Second_Test007 + * @tc.desc: test hour style numeric, set different minute and second style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour_Minute_Second_Test007, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTimeFormat object, set the locale info en-US, + * the hour style numeric, minute style numeric and + * second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour:'numeric', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step2.the format result is 2:04:05 PM + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 14, 4, 5);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * the hour style numeric, minute style numeric and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'numeric', minute:'numeric', second:'2-digit'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step4.the format result is 2:04:05 PM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the dateTime format object, set the locale info en-US, + * the hour12 style false, the hour style numeric, minute style 2-digit and the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'numeric', minute:'2-digit', second:'numeric'});"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step6.the format result is 2:04:05 PM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step7.create the dateTime format object, set the locale info en-US, + * the hour style numeric, minute style 2-digit and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'numeric', minute:'2-digit', second:'2-digit'});"); + + /** + * @tc.steps:step8.get the format attribute and format the date 2020/9/28 14:05:04 + * @tc.expected:step8.the format result is 2:04:05 PM + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2:04:05 PM"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour_Minute_Second_Test_008 + * @tc.desc: hour style 2-digit, set different minute and second style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour_Minute_Second_Test008, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTimeFormat object, set the locale info en-US, + * the hour style 2-digit, minute style numeric and + * second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{hour:'2-digit', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 08:05:04 + * @tc.expected:step2.the format result is 08:05:04 AM + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 8, 5,4);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "08:05:04 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * the hour style 2-digit, minute style numeric and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'2-digit', minute:'numeric', second:'2-digit'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 08:05:04 + * @tc.expected:step4.the format result is 08:05:04 AM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "08:05:04 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the dateTime format object, set the locale info en-US, + * the hour style 2-digit, minute style 2-digit and the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'2-digit', minute:'2-digit', second:'numeric'});"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 08:05:04 + * @tc.expected:step6.the format result is 08:05:04 AM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "08:05:04 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step7.create the dateTime format object, set the locale info en-US, + * the hour style 2-digit, minute style 2-digit and the second style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'2-digit', minute:'2-digit', second:'2-digit'});"); + + /** + * @tc.steps:step8.get the format attribute and format the date 2020/9/28 08:05:04 + * @tc.expected:step8.the format result is 08:05:04 AM + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "08:05:04 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour_Test003 + * @tc.desc: test the different style group about hour and minute + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour_Minute_Test009, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the dateTime format object, set the locale info en-US, + * set the hour style numeric, the minute style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'numeric', minute:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 8:05:04 + * @tc.expected:step2.the format result is 8:05 AM + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 8, 5, 4);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "8:05 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * set the hour style numeric, the minute style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'numeric', minute:'2-digit'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 8:05:04 + * @tc.expected:step4.the format result is 8:05 AM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "8:05 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the dateTime format object, set the locale info en-US, + * set the hour style 2-digit, the minute style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'2-digit', minute:'numeric'});"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 8:05:04 + * @tc.expected:step6.the format result is 8:05 AM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "08:05 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step7.create the dateTime format object, set the locale info en-US, + * set the hour style 2-digit, the minute style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'2-digit', minute:'2-digit'});"); + + /** + * @tc.steps:step8.get the format attribute and format the date 2020/9/28 8:05:04 + * @tc.expected:step8.the format result is 8:05 AM + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "08:05 AM"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Time_Invalid_Test010 + * @tc.desc: test the invalid time group + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Time_Invalid_Test010, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the dateTime format object, set the locale info en-US, + * set the hour style numeric, the second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step2.get the format attribute and format the date 2020/9/28 8:05:04 + * @tc.expected:step2.the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 8, 5, 4);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info en-US, + * set the minute style numeric, the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 8:05:04 + * @tc.expected:step4.the format result is 10/28/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Weekday_Test011 + * @tc.desc: Test the different value of weekday + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Weekday_Test011, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTime format object, set the weekday style 1111 + * and set the locale info en-US + * @tc.expected:step1.create dateTime format object, the error info is the weekday style is out of range + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {weekday:'1111'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + jerry_value_t error = jerry_get_value_from_error(dateTime, true); + char* formatRes = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "EvalError: the weekday style value is out of range"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step2.create the dateTime format object, set the weekday style narrow + * and set the locale info en-US + * @tc.expected:step2.create dateTime format object failed, the error info is the weekday style + * is out range + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {weekday:'narrow'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + error = jerry_get_value_from_error(dateTime, true); + formatRes = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "EvalError: the weekday style value is out of range"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {weekday:'long'});"); + + /** + * @tc.steps:step4.format the date 2020/9/28 + * @tc.expected:step4.the format result is Wednesday + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28);"); + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Wednesday"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Test012 + * @tc.desc: Test the different value of year + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Year_Test012, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the dateTime object, set the year style 2-digit + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'short'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + jerry_value_t error = jerry_get_value_from_error(dateTime, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_TRUE((errorInfo != nullptr) && + (!strcmp(errorInfo, "EvalError: the year style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create date time object, set the locale info zh-CN + * and set the year style 1111 + * @tc.expected:step2. the date time object create failed, the error info is + * "RangeError: the year style is out of range" + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year : 1111});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + error = jerry_get_value_from_error(dateTime, true); + errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the year style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step3.create dateTime format object, set the locale info en-US, + * set the year style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric'});"); + + /** + * @tc.steps:step4.get the format attribute and format the date 2020/9/28 + * @tc.expected:step4.the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28);"); + char* formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(args[0], dateTime, VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Month_Test013 + * @tc.desc: Test the enum value of month + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Month_Test013, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTimeFormat object, set the locale info zh-CN, and + * the month style 1111 + * @tc.expected: + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {month:1111});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + jerry_value_t error = jerry_get_value_from_error(dateTime, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the month style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create the dateTimeFormat object and set the month style narrow + * @tc.expected: step2.create the dateTimeFormat object failed, the error info is + * "RangeError:the month style is out of range" + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {month:'narrow'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + error = jerry_get_value_from_error(dateTime, true); + errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the month style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, and set the locale info zh-CN, + * set the month style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {month:'long'});"); + + /** + * @tc.steps:step4.format the date 2020/9/28 + * @tc.expected:step4.the format result is October + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28);"); + char* formatRes = FormatDate(dateTime, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "October"))); + ReleaseJerryValue(args[0], dateTime, VA_ARG_END_FLAG); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Day_Test014 + * @tc.desc: Test the invalid value of day style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Day_Test014, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTime format object, set the locale info zh-CN and + * the day style 1111 + * @tc.expected:step1.create dateTime object failed, return the error info + * "RangeError: the day style is out of range" + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {day: 11111})"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + jerry_value_t error = jerry_get_value_from_error(dateTime, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the day style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps: step2.create dateTime format object, set the locale info en-US, + * and set the day style long + * @tc.expected: step2.create the dateTime format object failed, the format result + * is "RangeError: the day style is out of range" + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {day:'long'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + error = jerry_get_value_from_error(dateTime, true); + errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the day style value is out of range"))); + ACE_FREE(errorInfo); + + /** + * @tc.steps:step3.create the dateTime format object, and set the locale info zh-CN, + * set the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {day:'numeric'});"); + + /** + * @tc.steps:step4.format the date 2020/9/28 + * @tc.expected:step4.the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28);"); + char* formatRes = FormatDate(dateTime, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ReleaseJerryValue(args[0], dateTime, VA_ARG_END_FLAG); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour_Test015 + * @tc.desc: Test the invalid value of month + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Hour_Test015, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTime format object and set the locale info en-US, + * set the hour style 1111 + * @tc.expected:step1.create dateTime format object failed, the error info is + * the hour style value is out of range + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:1111});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + jerry_value_t error = jerry_get_value_from_error(dateTime, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the hour style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create the dateTime format object failed, and set the locale info en-US, + * the hour style long + * @tc.expected:step2.create dateTime format failed, the error info is the hour style is out of range + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'long'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + error = jerry_get_value_from_error(dateTime, true); + errorInfo = MallocStringOf(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the hour style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, and set the locale info zh-CN, + * set the hour style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {hour:'numeric'});"); + + /** + * @tc.steps:step4.format the date 2020/9/28 8:05:04 + * @tc.expected:step4.the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 8, 5, 4);"); + char* formatRes = FormatDate(dateTime, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ReleaseJerryValue(args[0], dateTime, VA_ARG_END_FLAG); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + + +/** + * @tc.name: DateTime_Minute_Test016 + * @tc.desc: Test the invalid value of minute + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Minute_Test016, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTime format object and set the locale info en-US, + * set the minute style 1111 + * @tc.expected:step1.create dateTime format object failed, the error info is + * the hour style value is out of range + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {minute:1111});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + jerry_value_t error = jerry_get_value_from_error(dateTime, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the minute style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create the dateTime format object failed, and set the locale info en-US, + * the minute style long + * @tc.expected:step2.create dateTime format failed, the error info is the minute style is out of range + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {minute:'long'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + error = jerry_get_value_from_error(dateTime, true); + errorInfo = MallocStringOf(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the minute style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, and set the locale info zh-CN, + * set the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {minute:'numeric'});"); + + /** + * @tc.steps:step4.format the date 2020/9/28 8:05:04 + * @tc.expected:step4.the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 8, 5, 4);"); + char* formatRes = FormatDate(dateTime, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ReleaseJerryValue(args[0], dateTime, VA_ARG_END_FLAG); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Second_Test017 + * @tc.desc: Test the enum and invalid second style + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Second_Test017, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTime format object and set the locale info en-US, + * set the second style 1111 + * @tc.expected:step1.create dateTime format object failed, the error info is + * the second style value is out of range + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {second:1111});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + jerry_value_t error = jerry_get_value_from_error(dateTime, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the second style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create the dateTime format object failed, and set the locale info en-US, + * the hour style long + * @tc.expected:step2.create dateTime format failed, the error info is the hour style is out of range + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {second:'long'});"); + EXPECT_TRUE(jerry_value_is_error(dateTime)); + error = jerry_get_value_from_error(dateTime, true); + errorInfo = MallocStringOf(error); + EXPECT_FALSE((errorInfo == nullptr) || (strcmp(errorInfo, "EvalError: the second style value is out of range"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, and set the locale info en-US, + * set the second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {second:'numeric'});"); + + /** + * @tc.steps:step4.format the date 2020/9/28 9:05:04 + * @tc.expected:step4.the format result is 10/28/20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28, 9, 5, 4);"); + char* formatRes = FormatDate(dateTime, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "10/28/20"))); + ReleaseJerryValue(args[0], dateTime, VA_ARG_END_FLAG); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Hour_Test018 + * @tc.desc: Test the special locale info + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Special_Time_Test018, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create dateTime format object, set the locale info zh-Hans-HK + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('zh-Hans-HK');"); + + /** + * @tc.steps:step2.get the format attribute, and format the date 2020/9/28 + * @tc.expected:step2.the format result is 2020/10/28 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 9, 28);"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "28/10/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the dateTime format object, set the locale info zh-Hant-TW + */ + dateTime = RunJs("new Intl.DateTimeFormat('zh-Hant-TW');"); + + /** + * @tc.steps:step4.get the format attribute, and format the date 2020/9/28 + * @tc.expected:step4.the format result is 2020/10/28 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2020/10/28"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps5.create the dateTime format object, set the locale info zh-Hant-CN + */ + dateTime = RunJs("new Intl.DateTimeFormat('zh-Hant-CN');"); + + /** + * @tc.steps:step6.get the format attribute and format the date 2020/9/28 + * @tc.expected:step6.the format result is 2020/10/28 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "2020/10/28"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test019 + * @tc.desc: Test the different month style when year and day style is numeric + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Year_Month_Day_Test019, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style long, the day style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'long', day:'numeric'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/28 + * @tc.expected: step2. the format result is October 28, 2020 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 28)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "June 28, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style short, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'short', day:'numeric'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/28 + * @tc.expected: step4. the format result is Oct 28, 2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Jun 28, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style numeric, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'numeric', day:'numeric'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/28 + * @tc.expected: step6. the format result is 6/28/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "6/28/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style 2-digit, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'2-digit', day:'numeric'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/28 + * @tc.expected: step8. the format result is 06/28/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "06/28/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test020 + * @tc.desc: Test the different month style when year style is numeric and day style is 2-digit + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Year_Month_Day_Test020, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style long, the day style 2-digit + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'long', day:'2-digit'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is June 04, 2020 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "June 04, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style short, the day style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'short', day:'2-digit'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Jun 04, 2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Jun 04, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style numeric, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'numeric', day:'2-digit'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is 6/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "6/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style 2-digit, the day style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'numeric', month:'2-digit', day:'2-digit'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is 06/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "06/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test021 + * @tc.desc: Test the different month style when year style is 2-digit and the day style is numeric + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Year_Month_Day_Test021, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'long', day:'numeric'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is June 4, 20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "June 4, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style short, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'short', day:'numeric'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Jun 4, 20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Jun 4, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style numeric, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'numeric', day:'numeric'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is 6/4/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "6/4/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style 2-digit, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'2-digit', day:'numeric'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is 06/4/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "06/4/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test022 + * @tc.desc: Test the different month style when year style is 2-digit and the month style is 2-digit + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, DateTime_Year_Month_Day_Test022, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style 2-digit + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'long', day:'2-digit'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is June 04, 20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "June 04, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style short, the day style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'short', day:'2-digit'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Jun 04, 20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Jun 04, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style numeric, the day style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'numeric', day:'2-digit'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is 6/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "6/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style 2-digit, the day style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'2-digit', day:'2-digit'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is 06/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "06/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: Weekday_Year_Month_Day_Test023 + * @tc.desc: Test the different month style when year style is numeric and day style is 2-digit, + * the weekday style is long + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test023, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style long, the day style 2-digit, set the weekday style long + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{year:'numeric', month:'long', day:'2-digit', weekday:'long'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is Thursday, June 04, 2020 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, June 04, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style short, the day style 2-digit, + * set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{year:'numeric', month:'short', day:'2-digit', weekday:'long'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thursday, Jun 04, 2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, Jun 04, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style numeric, the day style 2-digit, + * set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'numeric', month:'numeric', day:'2-digit'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is Thursday, 6/04/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 6/04/2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style 2-digit, the day style 2-digit, + * set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'numeric', month:'2-digit', day:'2-digit'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thursday, 06/04/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 06/04/2020"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: Weekday_Year_Month_Day_Test024 + * @tc.desc: Test the different month style when year style is 2-digit, the day style is numeric, + * and the weekday style long + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test024, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style numeric, + * and set the weekday style long + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'long', day:'numeric'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is Thursday, June 4, 20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, June 4, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style short, the day style numeric, and the weekday style is long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'short', day:'numeric'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thursday, Jun 4, 20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, Jun 4, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style numeric, the day style numeric, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'numeric', day:'numeric'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is Thursday, 6/4/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 6/4/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style 2-digit, the day style numeric, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'2-digit', day:'numeric'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thursday, 06/4/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 06/4/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test022 + * @tc.desc: Test the different month style when year style is 2-digit and the month style is 2-digit, + * and set the weekday style long + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test025, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style 2-digit, + * and set the weekday style long + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'long', day:'2-digit'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is Thursday, June 04, 20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, June 04, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style short, the day style numeric, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'short', day:'2-digit'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thursday, Jun 04, 20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, Jun 04, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style numeric, the day style numeric, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'numeric', day:'2-digit'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/28 + * @tc.expected: step6. the format result is Thursday, 6/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 6/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style 2-digit, the day style numeric, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'2-digit', month:'2-digit', day:'2-digit'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thursday, 06/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 06/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test020 + * @tc.desc: Test the different month style when year style is numeric and day style is 2-digit, + * set the weekday style long + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test026, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style long, the day style numeric, + * and set the weekday style long + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long', year:'numeric', month:'long', day:'numeric'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is Thursday, June 4, 2020 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, June 4, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style short, the day style numeric, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long',year:'numeric', month:'short', day:'numeric'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thursday, Jun 4, 2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, Jun 4, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style numeric, the day style numeric, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long',year:'numeric', month:'numeric', day:'numeric'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is Thursday, 6/4/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 6/4/2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style 2-digit, the day style 2-digit, + * and set the weekday style long + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'long',year:'numeric', month:'2-digit', day:'numeric'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thursday, 06/4/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thursday, 06/4/2020"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test021 + * @tc.desc: Test the different month style when year style is 2-digit and the day style is numeric, + * and set the weekday style long + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test027, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style long, the day style numeric, + * and set the weekday style short + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'long', day:'numeric'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is Thu, June 4, 2020 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, June 4, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style short, the day style numeric, + * and set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'short', day:'numeric'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thu, Jun 4, 2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, Jun 4, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style numeric, the day style numeric, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'numeric', day:'numeric'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/28 + * @tc.expected: step6. the format result is Thu, 6/4/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 6/4/2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style 2-digit, the day style numeric, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'2-digit', day:'numeric'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thu, 06/4/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 06/4/2020"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test022 + * @tc.desc: Test the different month style when year style is 2-digit and the month style is 2-digit + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test028, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style 2-digit + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'long', day:'2-digit'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/28 + * @tc.expected: step2. the format result is October 28, 2020 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, June 04, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style short, the day style 2-digit, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'short', day:'2-digit'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thu, Jun 04, 2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, Jun 04, 2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style numeric, the day style 2-digit, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'numeric', day:'2-digit'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is Thu, 6/04/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 6/04/2020"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style numeric, the month style 2-digit, the day style 2-digit + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'numeric', month:'2-digit', day:'2-digit'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thu, 06/04/2020 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 06/04/2020"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test022 + * @tc.desc: Test the different month style when year style is 2-digit and the month style is 2-digit, + * set the weekday style short + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test029, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style 2-digit, the weekday style short + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'long', day:'numeric'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is Thu, June 4, 20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, June 4, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style short, the day style numeric, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'short', day:'numeric'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thu, Jun 4, 20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, Jun 4, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style numeric, the day style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'numeric', day:'numeric'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is Thu, 6/4/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 6/4/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style 2-digit, the day style numeric, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'2-digit', day:'numeric'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thu, 06/4/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 06/4/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: DateTime_Year_Month_Day_Test022 + * @tc.desc: Test the different month style when year style is 2-digit and the month style is 2-digit + * and set the weekday style short + * @tc.require: AR000EUO7G + */ +HWTEST_F(DateTimeModuleTddTest, Weekday_Year_Month_Day_Test030, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style 2-digit, + * and set the weekday style short + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'long', day:'2-digit'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 + * @tc.expected: step2. the format result is Thu, June 04, 20 + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, June 04, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style short, the day style 2-digit, + * and set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'short', day:'2-digit'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 + * @tc.expected: step4. the format result is Thu, Jun 04, 20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, Jun 04, 20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style numeric, the day style 2-digit, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'numeric', day:'2-digit'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 + * @tc.expected: step6. the format result is Thu, 6/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 6/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style 2-digit, the day style 2-digit, + * set the weekday style short + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US'," + "{weekday:'short', year:'2-digit', month:'2-digit', day:'2-digit'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 + * @tc.expected: step8. the format result is Thu, 06/04/20 + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, 06/04/20"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +/** + * @tc.name: Date_Time_Pattern_Test031 + * @tc.desc: Test different date and time group test + * @tc.require: SR000ERCD4 + */ +HWTEST_F(DateTimeModuleTddTest, Date_Time_Pattern_Test031, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps : step1. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style 2-digit, set weekday style short, + * the hour style numeric, minute style numeric and second style numeric + */ + jerry_value_t dateTime = RunJs("new Intl.DateTimeFormat('en-US', {weekday:'short', year:'2-digit'," + "month:'long', day:'2-digit', hour:'numeric', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps: step2. set the format time 2020/5/4 8:05:04 + * @tc.expected: step2. the format result is Thu, June 04, 20 8:05:04 AM + */ + jerry_value_t args[1]; + args[0] = RunJs("new Date(2020, 5, 4, 8, 5, 4)"); + char* formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, June 04, 20 8:05:04 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step3. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style long, the day style 2-digit, + * hour style numeric and minute style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {weekday:'short', year:'2-digit', month:'long'," + "day:'2-digit', hour:'numeric', minute:'numeric'});"); + + /** + * @tc.steps: step4. set the format time 2020/5/4 8:05:04 + * @tc.expected: step4. the format result is Thu, June 04, 20 8:05 AM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "Thu, June 04, 20 8:05 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step5. create dateTime format object, set the locale info en-US, + * set the year style , the month style numeric, the day style numeric, the hour style numeric, + * the minute style numeric and second style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'long', day:'2-digit'," + "hour:'numeric', minute:'numeric', second:'numeric'});"); + + /** + * @tc.steps: step6. set the format time 2020/5/4 8:05:04 + * @tc.expected: step6. the format result is June 04, 20 8:05:04 AM + */ + formatRes = FormatDate(dateTime, args, 1); + jerry_release_value(dateTime); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "June 04, 20 8:05:04 AM"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps : step7. create dateTime format object, set the locale info en-US, + * set the year style 2-digit, the month style 2-digit, the day style 2-digit, + * hour style numeric and minute style numeric + */ + dateTime = RunJs("new Intl.DateTimeFormat('en-US', {year:'2-digit', month:'2-digit'," + "day:'2-digit', hour:'numeric', minute:'numeric'});"); + + /** + * @tc.steps: step8. set the format time 2020/5/4 8:05:04 + * @tc.expected: step8. the format result is 06/04/20 8:05 AM + */ + formatRes = FormatDate(dateTime, args, 1); + ReleaseJerryValue(dateTime, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "06/04/20 8:05 AM"))); + ace_free(formatRes); + formatRes = nullptr; + TDD_CASE_END(); +} + +void DateTimeModuleTddTest::RunTests() +{ +#ifndef TDD_ASSERTIONS + DateTime_Locale_Test001(); + DateTime_Locale_Test002(); + DateTime_Hour12_Group_Test003(); + DateTime_Hour12_Group_Test004(); + DateTime_Hour12_False_Test_005(); + DateTime_Hour12_False_Test006(); + DateTime_Hour_Minute_Second_Test007(); + DateTime_Hour_Minute_Second_Test008(); + DateTime_Hour_Minute_Test009(); + DateTime_Time_Invalid_Test010(); + DateTime_Weekday_Test011(); + DateTime_Year_Test012(); + DateTime_Month_Test013(); + DateTime_Day_Test014(); + DateTime_Hour_Test015(); + DateTime_Minute_Test016(); + DateTime_Second_Test017(); + DateTime_Special_Time_Test018(); + DateTime_Year_Month_Day_Test019(); + DateTime_Year_Month_Day_Test020(); + DateTime_Year_Month_Day_Test021(); + DateTime_Year_Month_Day_Test022(); + Weekday_Year_Month_Day_Test023(); + Weekday_Year_Month_Day_Test024(); + Weekday_Year_Month_Day_Test025(); + Weekday_Year_Month_Day_Test026(); + Weekday_Year_Month_Day_Test027(); + Weekday_Year_Month_Day_Test028(); + Weekday_Year_Month_Day_Test029(); + Weekday_Year_Month_Day_Test030(); + Date_Time_Pattern_Test031(); +#endif +} +} +} +#endif diff --git a/frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.h b/frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.h new file mode 100755 index 0000000..440aa08 --- /dev/null +++ b/frameworks/src/core/modules/presets/test/unittest/common/date_time_module_tdd_test.h @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef DATE_TIME_MODULE_TDD_TEST_H +#define DATE_TIME_MODULE_TDD_TEST_H +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "acelite_config.h" +#ifdef FEATURE_DATE_FORMAT +#include "test_common.h" +#include "js_fwk_common.h" +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class DateTimeModuleTddTest : public testing::Test { +#else +class DateTimeModuleTddTest { +#endif +public: + void RunTests(); + + void SetUp(); + + void TearDown(); + + void DateTime_Locale_Test001(); + + void DateTime_Locale_Test002(); + + void DateTime_Hour12_Group_Test003(); + + void DateTime_Hour12_Group_Test004(); + + void DateTime_Hour12_False_Test_005(); + + void DateTime_Hour12_False_Test006(); + + void DateTime_Hour_Minute_Second_Test007(); + + void DateTime_Hour_Minute_Second_Test008(); + + void DateTime_Hour_Minute_Test009(); + + void DateTime_Time_Invalid_Test010(); + + void DateTime_Weekday_Test011(); + + void DateTime_Year_Test012(); + + void DateTime_Month_Test013(); + + void DateTime_Day_Test014(); + + void DateTime_Hour_Test015(); + + void DateTime_Minute_Test016(); + + void DateTime_Second_Test017(); + + void DateTime_Special_Time_Test018(); + + void DateTime_Year_Month_Day_Test019(); + + void DateTime_Year_Month_Day_Test020(); + + void DateTime_Year_Month_Day_Test021(); + + void DateTime_Year_Month_Day_Test022(); + + void Weekday_Year_Month_Day_Test023(); + + void Weekday_Year_Month_Day_Test024(); + + void Weekday_Year_Month_Day_Test025(); + + void Weekday_Year_Month_Day_Test026(); + + void Weekday_Year_Month_Day_Test027(); + + void Weekday_Year_Month_Day_Test028(); + + void Weekday_Year_Month_Day_Test029(); + + void Weekday_Year_Month_Day_Test030(); + + void Date_Time_Pattern_Test031(); + + jerry_value_t RunJs(const char* js); + + char* FormatDate(const jerry_value_t dateTime, const jerry_value_t args[], const jerry_length_t argsNum); +}; +} +} +#endif // FEATURE_DATE_FORMAT +#endif // DATE_TIME_MODULE_TDD_TEST_H diff --git a/frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.cpp b/frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.cpp new file mode 100755 index 0000000..eb65e92 --- /dev/null +++ b/frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.cpp @@ -0,0 +1,785 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "number_format_module_tdd_test.h" +#ifdef FEATURE_NUMBER_FORMAT +#include "global.h" +#include "js_app_context.h" +#include "js_app_environment.h" +namespace OHOS { +namespace ACELite { +void NumberFormatModuleTddTest::SetUp() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + if (env == nullptr) { + // should never happen + return; + } + env->InitJsFramework(); +} + +void NumberFormatModuleTddTest::TearDown() +{ + JsAppEnvironment *env = JsAppEnvironment::GetInstance(); + JsAppContext *context = JsAppContext::GetInstance(); + if (env == nullptr || context == nullptr) { + // should never happen + return; + } + context->ReleaseStyles(); + env->Cleanup(); +} + +jerry_value_t NumberFormatModuleTddTest::RunJs(const char* js) +{ + const jerry_char_t *jsContent = reinterpret_cast(js); + jerry_length_t len = strlen(js); + jerry_value_t result = jerry_eval(jsContent, len, JERRY_PARSE_NO_OPTS); + return result; +} + +char* NumberFormatModuleTddTest::FormatNumber(const jerry_value_t numberFormat, + const jerry_value_t *args, + const jerry_length_t argsNum) +{ + if (IS_UNDEFINED(numberFormat)) { + printf("create dateTime failed\n"); + return nullptr; + } + jerry_value_t format = jerryx_get_property_str(numberFormat, "format"); + if (IS_UNDEFINED(format)) { + printf("get the format attribute failed\n"); + jerry_release_value(numberFormat); + return nullptr; + } + jerry_value_t result = CallJSFunction(format, numberFormat, args, argsNum); + char* formatRes = MallocStringOf(result); + ReleaseJerryValue(format, result, VA_ARG_END_FLAG); + return formatRes; +} + +/** + * @tc.name: NumberFormat_Locale_Test001 + * @tc.desc: test the locale info support + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_Locale_Test001, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + GLOBAL_ConfigLanguage("zh-CN"); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-u-nu-hanidec + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-Hans-CN')"); + + /** + * @tc.steps:step2.get the format attribute and format the number 9 + * @tc.expected:step2.the format result is 9 + */ + jerry_value_t args[1]; + int formatNum = 9; + args[0] = jerry_create_number(formatNum); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "9"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the number format object + */ + numberFormat = RunJs("new Intl.NumberFormat();"); + + /** + * @tc.steps:step4.get the format attribute and format the number 9 + * @tc.expected:step4.the format result is 9 + */ + formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "9"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the number format object and set the locale info testaaaa + */ + numberFormat = RunJs("new Intl.NumberFormat('testaaaa');"); + + /** + * @tc.steps:step6.get the format attribute and format the number 9 + * @tc.expected:step6.the format result is 9 + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "9"))); + ReleaseJerryValue(args[0], numberFormat, VA_ARG_END_FLAG); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_Style_Test002 + * @tc.desc: test the enum style value + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_Style_Test002, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @steps:step1.create the number format object, set the locale info zh-CN + * and set the style decimal + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'decimal'});"); + + /** + * @steps:step2.get the format attribute and format the number 0.9 + * @expected:step2.the format result is 0.9 + */ + jerry_value_t args[1]; + const double num = 0.9; + args[0] = jerry_create_number(num); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "0.9"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the numberFormat object, set the locale info zh-CN + * and the style percent + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent'});"); + + /** + * @tc.steps:step4.get the format attribute and format the number 0.9 + * @tc.expected:step4.the format result is 90% + */ + formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "90%"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the numberFormat object, set the locale info zh-CN + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN');"); + + /** + * @tc.steps:step6.get the format attribute and format the number 0.9 + * @tc.expected:step6.the format result is 0.9 + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "0.9"))); + ReleaseJerryValue(numberFormat, args[0], VA_ARG_END_FLAG); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_Style_Test003 + * @tc.desc: test the invalid value of style + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_Style_Test003, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object and set the style percent + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat({style:'percent'});"); + + /** + * @tc.steps:step2.get the format attribute and format the number 0.9 + * @tc.expected:step2.the format result is 0.9 + */ + jerry_value_t args[1]; + double number = 0.9; + args[0] = jerry_create_number(number); + char* formatRes = FormatNumber(numberFormat, args, 1); + ReleaseJerryValue(numberFormat, args[0], VA_ARG_END_FLAG); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "0.9"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the numberFormat object, set the locale info zh-CN + * and the number style testaaaa + * @tc.expected:step3.the format result is "the style is invalid" + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'testaaa'});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + jerry_value_t error = jerry_get_value_from_error(numberFormat, true); + formatRes = MallocStringOf(error); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "RangeError: the style is invalid"))); + jerry_release_value(error); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_Group_Test004 + * @tc.desc: test the enum value in useGroup + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_Group_Test004, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN, + * set the useGroup attribute false + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {useGrouping:false});"); + + /** + * @tc.steps:step2.get the format attribute and format the number 123456 + * @tc.expected:step2.the format result is 123456 + */ + jerry_value_t args[1]; + double num = 123456; + args[0] = jerry_create_number(num); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123456"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the numberFormat object and set the locale info zh-CN + * and set the useGrouping attribute true + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {useGrouping:true});"); + + /** + * @tc.steps:step4.get the format attribute 123456 + * @tc.expected:step4.the format result is 123,456 + */ + formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123,456"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step5.create the numberFormat object and set the locale info zh-CN + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN');"); + + /** + * @tc.steps:step6.get the format attribute and format the number 123456 + * @tc.expected:step6.the format result is 123,456 + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123,456"))); + ReleaseJerryValue(numberFormat, args[0], VA_ARG_END_FLAG); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_Group_Test005 + * @tc.desc: test the invalid value of useGroup + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_Group_Test005, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object and set the + * useGrouping attribute false + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat({useGrouping:false})"); + + /** + * @tc.step2:step2.get the format attribute, and format the number 123456 + * @tc.expected:step2.the format result is 123,456 + */ + jerry_value_t args[1]; + double num = 123456; + args[0] = jerry_create_number(num); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123,456"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the number format object and set the locale info zh-CN + * the useGrouping testaaaa + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {useGrouping:'testaaa'});"); + + /** + * @tc.steps:get the format attribute and format the number 123456 + * @tc.expected: the format result is 123,456 + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123,456"))); + ReleaseJerryValue(numberFormat, args[0], VA_ARG_END_FLAG); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_Group_Test006 + * @tc.desc: test the enum value of useGrouping in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_Group_Test006, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN + * and set the style percent and useGrouping true + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', useGrouping:true});"); + + /** + * @tc.steps:step2.get the format attribute and format the number 123.456 + * @tc.expected:step2.the format result is 12,346% + */ + jerry_value_t args[1]; + const double num = 123.456; + args[0] = jerry_create_number(num); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "12,346%"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the numberFormat object, set the locale info zh-CN + * set the number style percent and the useGrouping false + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', useGrouping:false})"); + /** + * @tc.steps:step4.get the format attribute and format the number 123.456 + * @tc.expected:step4.the format result is 12346% + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "12346%"))); + ReleaseJerryValue(numberFormat, args[0], VA_ARG_END_FLAG); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_Group_Test007 + * @tc.desc: test the invalid value of useGroup in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_Group_Test007, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the style percent + * and set the useGrouping false + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat({style:'percent', useGrouping:false});"); + /** + * @tc.steps:step2.get the format attribute and format the number 123.456 + * @tc.expected:step2.the format result is 123.456 + */ + jerry_value_t args[1]; + const double formatNum = 123.456; + args[0] = jerry_create_number(formatNum); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123.456"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the numberFormat object, set the locale info zh-CN, the percent style + * is percent and the useGrouping is testaaaa + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', useGrouping:'testaaaa'})"); + /** + * @tc.steps:step4.get the format attribute and format the number 123.456 + * @tc.expected:step4.the format result is 12,346% + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "12,346%"))); + ReleaseJerryValue(args[0], numberFormat, VA_ARG_END_FLAG); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MinimumFractionDigit_Test008 + * @tc.desc: test the correct value of minimumFeactionDigits + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MinimumFractionDigit_Test008, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN + * and set the minimumFractionDigits 2 + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {minimumFractionDigits:2});"); + /** + * @tc.steps:step2.get the format attribute and format the number 1.23456 + * @tc.expected:step2.the format result is 1.235 + */ + jerry_value_t args[1]; + const double num = 1.23456; + args[0] = jerry_create_number(num); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "1.235"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the object numberFormat object, set the locale info zh-CN + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {minimumFractionDigits:6});"); + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "1.234560"))); + ACE_FREE(formatRes); + ReleaseJerryValue(numberFormat, args[0], VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MinimumFractionDigit_Test009 + * @tc.desc: test the invalid value of minimumFeactionDigits + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MinimumFractionDigit_Test009, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN, + * set the minimumFractionDigits -1 + * @tc.expected:step2.the format result is "the minimumFractionDigit is invalid" + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {minimumFractionDigits:-1});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + jerry_value_t error = jerry_get_value_from_error(numberFormat, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || + (strcmp(errorInfo, "RangeError: the minimumFractionDigits is invalid"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create the numberFormat object, set the locale info zh-CN + * and set the minimumFractionDigits 21 + * @tc.expected:step2.the format result is "the minimumFractionDigit is invalid" + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {minimumFractionDigits:21});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + error = jerry_get_value_from_error(numberFormat, true); + errorInfo = MallocStringOf(error); + EXPECT_FALSE((errorInfo == nullptr) || + (strcmp(errorInfo, "RangeError: the minimumFractionDigits is invalid"))); + jerry_release_value(error); + ACE_FREE(errorInfo); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MinimumFractionDigit_Test010 + * @tc.desc: test the value of minimumFeactionDigits in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MinimumFractionDigit_Test010, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN + * set the minimumFractionDigits 2, set the style attribute percent + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', minimumFractionDigits:2});"); + + /** + * @tc.steps:step2.get the format attribute and format the number 1.23456 + * @tc.expected:step2.the format result is 123% + */ + jerry_value_t args[1]; + const double num = 1.23456; + args[0] = jerry_create_number(num); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123%"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the numberFormat object, set the style percent and the minimumFractionDigit + * 5 + */ + GLOBAL_ConfigLanguage("zh-CN"); + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', minimumFractionDigit:5});"); + + /** + * @tc.steps:step4.get the format attribute and format the number 1.23456 + * @tc.ecpected:step4.the format result is 123% + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123%"))); + jerry_release_value(numberFormat); + ACE_FREE(formatRes); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MinimumFractionDigit_Test011 + * @tc.desc: test the value of minimumFeactionDigits in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MinimumFractionDigit_Test011, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN, + * and set the style percent and set the minimumFractionDigit -1 + * @tc.expected:step1.numberFormat object create failed, the error info is + * "the minimumFractionDigits is invalid" + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', minimumFractionDigits:-1});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + jerry_value_t error = jerry_get_value_from_error(numberFormat, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_TRUE((errorInfo != nullptr) && + (!strcmp(errorInfo, "RangeError: the minimumFractionDigits is invalid"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create the numberFormat object, set the style percent, set the minimumFractionDigit 21 + * @tc.expected:step2.the numberFormat object create failed, the error info is + * "the minimumFractionDigits is invalid" + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', minimumFractionDigits:21});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + error = jerry_get_value_from_error(numberFormat, true); + errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || + (strcmp(errorInfo, "RangeError: the minimumFractionDigits is invalid"))); + ACE_FREE(errorInfo); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MaxmumFractionDigit_Test012 + * @tc.desc: test the value of maxmumFractionDigits in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MaxmumFractionDigit_Test012, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the number format object, set the locale info zh-CN + * the maxmumFractionDigit 4 + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {maximumFractionDigits:4});"); + + /** + * @tc.steps:step2.get the format attribute and format the number 1.23456 + * @tc.expected:step2.the format result is 1.2346 + */ + jerry_value_t args[1]; + const double num = 1.23456; + args[0] = jerry_create_number(num); + char* formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "1.2346"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create the numberFormat object, set the maxmumFractionDigit 4 + */ + GLOBAL_ConfigLanguage("zh-CN"); + numberFormat = RunJs("new Intl.NumberFormat({maxmumFractionDigit:4});"); + + /** + * @tc.steps: step4.get the format attribute and format the number 1.23456 + * @tc.expected:step4.the format result is 1.23456 + */ + formatRes = FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "1.235"))); + ACE_FREE(formatRes); + ReleaseJerryValue(numberFormat, args[0], VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MaxmumFractionDigit_Test013 + * @tc.desc: test the value of maxmumFractionDigits in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MaxmumFractionDigit_Test013, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN + * the maxmumFractionDigit -1 + * @tc.expected:step1.the numberFormat object create failed, the error info is + * "the maximumFractionDigits is invalid" + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {maximumFractionDigits:-1});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + jerry_value_t error = jerry_get_value_from_error(numberFormat, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || + (strcmp(errorInfo, "RangeError: the maximumFractionDigits is invalid"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.expected:step2.create the numberFormat object, set the locale info zh-CN + * and the maxmumFractionDigit 22 + * @tc.expected:step2.the numberFormat object create failed, the error info is + * "the maximumFractionDigits is invalid" + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {maximumFractionDigits:21});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + error = jerry_get_value_from_error(numberFormat, true); + errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || + (strcmp(errorInfo, "RangeError: the maximumFractionDigits is invalid"))); + ACE_FREE(errorInfo); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MaxmumFractionDigit_Test014 + * @tc.desc: test the value of maxmumFractionDigits in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MaxmumFractionDigit_Test014, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN, + * and set the style percent and maxmumFractionDigit 2 + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', maximumFractionDigits:2});"); + + /** + * @tc.steps:step2.get the format attribute and format the number 1.23456 + * @tc.expected:step2.the format result is 123.46% + */ + jerry_value_t args[1]; + const double number = 1.23456; + args[0] = jerry_create_number(number); + char* formatRes = FormatNumber(numberFormat, args, 1); + jerry_release_value(numberFormat); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123%"))); + ace_free(formatRes); + formatRes = nullptr; + + /** + * @tc.steps:step3.create numberFormat object, set the format style percent, + * the maxmumFractionDigit 5 + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent',maximumFractionDigits:5});"); + /** + * @tc.steps:step4.get the format attribute and format the number 1.23456 + * @tc.expected: the format result is 1.23456 + */ + formatRes =FormatNumber(numberFormat, args, 1); + EXPECT_FALSE((formatRes == nullptr) || (strcmp(formatRes, "123%"))); + ACE_FREE(formatRes); + ReleaseJerryValue(args[0], numberFormat, VA_ARG_END_FLAG); + TDD_CASE_END(); +} + +/** + * @tc.name: NumberFormat_MaxmumFractionDigit_Test015 + * @tc.desc: test the value of maxmumFractionDigits in percent + * @tc.require: AR000EVHAT + */ +HWTEST_F(NumberFormatModuleTddTest, NumberFormat_MaxmumFractionDigit_Test015, TestSize.Level1) +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps:step1.create the numberFormat object, set the locale info zh-CN, + * set the percent style percent and the maxmumFractionDigit 0 + * @tc.expected:step1.create the numberFormat object failed, the error info is + * "the maximumFractionDigit is invalid" + */ + jerry_value_t numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', maximumFractionDigits:-1});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + jerry_value_t error = jerry_get_value_from_error(numberFormat, true); + char* errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || + (strcmp(errorInfo, "RangeError: the maximumFractionDigits is invalid"))); + ace_free(errorInfo); + errorInfo = nullptr; + + /** + * @tc.steps:step2.create the numberFormat object, set the locale info zh-CN, + * and the maxmumFractionDigit 21 + * @tc.expected:step2.the numberFormat object create failed, the error info is + * "the maximumFractionDigits is invalid" + */ + numberFormat = RunJs("new Intl.NumberFormat('zh-CN', {style:'percent', maximumFractionDigits:21});"); + EXPECT_TRUE(jerry_value_is_error(numberFormat)); + error = jerry_get_value_from_error(numberFormat, true); + errorInfo = MallocStringOf(error); + jerry_release_value(error); + EXPECT_FALSE((errorInfo == nullptr) || + (strcmp(errorInfo, "RangeError: the maximumFractionDigits is invalid"))); + ACE_FREE(errorInfo); + TDD_CASE_END(); +} + +void NumberFormatModuleTddTest::RunTests() +{ +#ifndef TDD_ASSERTIONS + NumberFormat_Locale_Test001(); + NumberFormat_Style_Test002(); + NumberFormat_Style_Test003(); + NumberFormat_Group_Test004(); + NumberFormat_Group_Test005(); + NumberFormat_Group_Test006(); + NumberFormat_Group_Test007(); + NumberFormat_MinimumFractionDigit_Test008(); + NumberFormat_MinimumFractionDigit_Test009(); + NumberFormat_MinimumFractionDigit_Test010(); + NumberFormat_MinimumFractionDigit_Test011(); + NumberFormat_MaxmumFractionDigit_Test012(); + NumberFormat_MaxmumFractionDigit_Test013(); + NumberFormat_MaxmumFractionDigit_Test014(); + NumberFormat_MaxmumFractionDigit_Test015(); +#endif +} +} +} +#endif diff --git a/frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.h b/frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.h new file mode 100755 index 0000000..8e25f58 --- /dev/null +++ b/frameworks/src/core/modules/presets/test/unittest/common/number_format_module_tdd_test.h @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef NUMBER_FORMAT_MODULE_TDD_TEST_H +#define NUMBER_FORMAT_MODULE_TDD_TEST_H +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "acelite_config.h" +#ifdef FEATURE_NUMBER_FORMAT +#include "test_common.h" +#include "js_fwk_common.h" +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class NumberFormatModuleTddTest : public testing::Test { +#else +class NumberFormatModuleTddTest { +#endif +public: + NumberFormatModuleTddTest() {} + ~NumberFormatModuleTddTest() {} + void SetUp(); + void TearDown(); + + void RunTests(); + + void NumberFormat_Locale_Test001(); + + void NumberFormat_Style_Test002(); + + void NumberFormat_Style_Test003(); + + void NumberFormat_Group_Test004(); + + void NumberFormat_Group_Test005(); + + void NumberFormat_Group_Test006(); + + void NumberFormat_Group_Test007(); + + void NumberFormat_MinimumFractionDigit_Test008(); + + void NumberFormat_MinimumFractionDigit_Test009(); + + void NumberFormat_MinimumFractionDigit_Test010(); + + void NumberFormat_MinimumFractionDigit_Test011(); + + void NumberFormat_MaxmumFractionDigit_Test012(); + + void NumberFormat_MaxmumFractionDigit_Test013(); + + void NumberFormat_MaxmumFractionDigit_Test014(); + + void NumberFormat_MaxmumFractionDigit_Test015(); + + jerry_value_t RunJs(const char* jsContent); + + char* FormatNumber(const jerry_value_t numberFormat, const jerry_value_t args[], const jerry_length_t argsNum); +}; +} +} + +#endif // FEATURE_NUMBER_FORMAT +#endif // NUMBER_FORMAT_MODULE_TDD_TEST_H diff --git a/src/core/modules/presets/timer_module.cpp b/frameworks/src/core/modules/presets/timer_module.cpp similarity index 77% rename from src/core/modules/presets/timer_module.cpp rename to frameworks/src/core/modules/presets/timer_module.cpp index 508f9d1..5c0eef2 100755 --- a/src/core/modules/presets/timer_module.cpp +++ b/frameworks/src/core/modules/presets/timer_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,14 +15,14 @@ #include "timer_module.h" #ifdef FEATURE_TIMER_MODULE +#include +#include +#include "ace_log.h" +#include "ace_mem_base.h" #ifndef TARGET_SIMULATOR #include "js_async_work.h" #endif // TARGET_SIMULATOR -#include "ace_log.h" -#include "ace_mem_base.h" #include "js_fwk_common.h" -#include -#include #include "nativeapi_timer_task.h" namespace OHOS { @@ -33,11 +33,14 @@ void TimerModule::Init() const char * const clearTimeout = "clearTimeout"; const char * const setInterval = "setInterval"; const char * const clearInterval = "clearInterval"; + initRes_ = InitTimerTask(); + if (initRes_ < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "init timer failed %d", initRes_); + } CreateNamedFunction(setTimeout, SetTimeout); CreateNamedFunction(clearTimeout, ClearTimer); CreateNamedFunction(setInterval, SetInterval); CreateNamedFunction(clearInterval, ClearTimer); - InitTimerTask(); } jerry_value_t TimerModule::CreateTimer(const jerry_value_t func, @@ -46,39 +49,43 @@ jerry_value_t TimerModule::CreateTimer(const jerry_value_t func, const jerry_length_t argsNum, bool repeated) { + if (TimerModule::GetInstance()->GetInitState() < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "start timer failed, timer init failed %d", + TimerModule::GetInstance()->GetInitState()); + return UNDEFINED; + } const uint8_t leastArguments = 2; if ((argsNum < leastArguments) || (GetInstance()->GetTimerList() == nullptr)) { return UNDEFINED; - } else { - TimerList::Arguments *arguments = new TimerList::Arguments(); - if (arguments == nullptr) { + } + TimerList::Arguments *arguments = new TimerList::Arguments(); + if (arguments == nullptr) { + return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("memory error")); + } + arguments->context = context; + jerry_value_t function = args[0]; + arguments->func = jerry_acquire_value(function); + arguments->repeated = repeated; + TimerList* timerList = GetInstance()->GetTimerList(); + if (argsNum > leastArguments) { + uint8_t funcNumber = argsNum - leastArguments; + jerry_value_t *funcArg = + static_cast(ace_malloc(sizeof(jerry_value_t) * (funcNumber))); + if (funcArg == nullptr) { + timerList->ReleaseArguments(arguments); return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("memory error")); } - arguments->context = context; - jerry_value_t function = args[0]; - arguments->func = jerry_acquire_value(function); - arguments->repeated = repeated; - TimerList* timerList = GetInstance()->GetTimerList(); - if (argsNum > leastArguments) { - uint8_t funcNumber = argsNum - leastArguments; - jerry_value_t *funcArg = - static_cast(ace_malloc(sizeof(jerry_value_t) * (funcNumber))); - if (funcArg == nullptr) { - timerList->ReleaseArguments(arguments); - return jerry_create_error(JERRY_ERROR_EVAL, reinterpret_cast("memory error")); - } - for (uint8_t i = 0; i < funcNumber; i++) { - funcArg[i] = jerry_acquire_value(args[i + leastArguments]); - } - arguments->args = funcArg; - arguments->argsNum = funcNumber; + for (uint8_t i = 0; i < funcNumber; i++) { + funcArg[i] = jerry_acquire_value(args[i + leastArguments]); } - jerry_value_t retVal = StartTask(arguments, args[1], repeated); - if (jerry_value_is_undefined(retVal)) { - timerList->ReleaseArguments(arguments); - } - return retVal; + arguments->args = funcArg; + arguments->argsNum = funcNumber; } + jerry_value_t retVal = StartTask(arguments, args[1], repeated); + if (jerry_value_is_undefined(retVal)) { + timerList->ReleaseArguments(arguments); + } + return retVal; } jerry_value_t TimerModule::StartTask(TimerList::Arguments *arguments, jerry_value_t time, bool repeated) @@ -121,6 +128,11 @@ jerry_value_t TimerModule::ClearTimer(const jerry_value_t func, const jerry_value_t *args, const jerry_length_t argsNum) { + if (TimerModule::GetInstance()->GetInitState() < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "stop timer failed, init timer failed %d", + TimerModule::GetInstance()->GetInitState()); + return UNDEFINED; + } if (argsNum == 0) { return UNDEFINED; } @@ -201,8 +213,8 @@ void TimerModule::Execute(void *data) CallJSFunctionAutoRelease(funcArgs->func, funcArgs->context, funcArgs->args, funcArgs->argsNum); } // if timer is once, release the arguments - // check the timer node is release or not - TimerList::TimerNode* currentTimer = timerList->GetTimer(*timerId); + // check the timer node is release or not + TimerList::TimerNode* currentTimer = timerList->GetTimer(*timerId); if ((currentTimer != nullptr) && (!funcArgs->repeated)) { #if defined(__LITEOS__) StopTimerTask(timer->timerId); diff --git a/src/core/modules/presets/timer_module.h b/frameworks/src/core/modules/presets/timer_module.h old mode 100755 new mode 100644 similarity index 96% rename from src/core/modules/presets/timer_module.h rename to frameworks/src/core/modules/presets/timer_module.h index f928f9d..a818593 --- a/src/core/modules/presets/timer_module.h +++ b/frameworks/src/core/modules/presets/timer_module.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -35,6 +35,11 @@ public: void Init() override; + const int GetInitState() + { + return initRes_; + } + void Clear() { if (timerList_ != nullptr) { @@ -50,7 +55,8 @@ private: * @brief Constructor */ TimerModule() : PresetModule(nullptr), - timerList_(nullptr) + timerList_(nullptr), + initRes_(-1) { } @@ -129,6 +135,7 @@ private: static void Execute(void *data); #endif TimerList *timerList_; + int initRes_; }; } // namespace ACELite } // namespace OHOS diff --git a/src/core/modules/presets/version_module.cpp b/frameworks/src/core/modules/presets/version_module.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/version_module.cpp rename to frameworks/src/core/modules/presets/version_module.cpp diff --git a/src/core/modules/presets/version_module.h b/frameworks/src/core/modules/presets/version_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/presets/version_module.h rename to frameworks/src/core/modules/presets/version_module.h diff --git a/src/core/modules/router_module.cpp b/frameworks/src/core/modules/router_module.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/router_module.cpp rename to frameworks/src/core/modules/router_module.cpp diff --git a/src/core/modules/router_module.h b/frameworks/src/core/modules/router_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/router_module.h rename to frameworks/src/core/modules/router_module.h diff --git a/src/core/modules/sample_module.cpp b/frameworks/src/core/modules/sample_module.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/core/modules/sample_module.cpp rename to frameworks/src/core/modules/sample_module.cpp index aa1881e..0eca530 --- a/src/core/modules/sample_module.cpp +++ b/frameworks/src/core/modules/sample_module.cpp @@ -105,6 +105,7 @@ JSIValue SampleModule::TestCallbackWithArgs(const JSIValue thisVal, const JSIVal #ifndef TARGET_SIMULATOR AsyncParams *params = new AsyncParams(); if (params == nullptr) { + JSI::ReleaseValueList(result, callback); return undefValue; } params->result = result; diff --git a/src/core/modules/sample_module.h b/frameworks/src/core/modules/sample_module.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/modules/sample_module.h rename to frameworks/src/core/modules/sample_module.h diff --git a/frameworks/src/core/modules/test/unittest/BUILD.gn b/frameworks/src/core/modules/test/unittest/BUILD.gn new file mode 100755 index 0000000..b43eeff --- /dev/null +++ b/frameworks/src/core/modules/test/unittest/BUILD.gn @@ -0,0 +1,37 @@ +#Copyright (c) 2021 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("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +presets_unittest_root = + "$ace_lite_root/frameworks/src/core/modules/presets/test/unittest" + +unittest("js_frameworks_test_dfx") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/test/moduletest/common/basic_tdd_test.cpp", + "common/dfx_tdd_test.cpp", + ] + deps = ace_test_deps +} + +group("modules_unittest") { + deps = [ + ":js_frameworks_test_dfx", + "$presets_unittest_root:js_frameworks_test_date_time", + "$presets_unittest_root:js_frameworks_test_number_format", + ] +} diff --git a/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp new file mode 100755 index 0000000..d352b12 --- /dev/null +++ b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp @@ -0,0 +1,534 @@ +/* + * Copyright (c) 2021 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. + */ +#include "dfx_tdd_test.h" +#include +#include "js_fwk_common.h" +#include "wrapper/js.h" + +namespace OHOS { +namespace ACELite { +const char * const DfxTddTest::BUNDLE1 + = "(function () {" + " return new ViewModel({" + " render: function (vm) {" + " var _vm = vm || this;" + " return _c('swiper', {" + " attrs : {index : 0,duration : 75}," + " staticClass : ['container'], " + " on : {'change' : _vm.swiperChange}} , [" + " _c('stack', {" + " staticClass : ['container']} , [" + " _c('text', {" + " attrs : {value : function() {return _vm.textValue}}," + " staticClass : ['pm25-name']," + " staticStyle : {color : 16711680}," + " on : {'click' : _vm.click1}" + " })" + " ])" + " ]);" + " }," + " styleSheet: {" + " classSelectors: {" + " 'pm25-value': {" + " textAlign: 'center'," + " fontSize: 38," + " color: 15794175," + " height: 454," + " width: 454," + " top: 235" + " }," + " 'pm25-name': {" + " textAlign: 'center'," + " color: 10667170," + " width: 454," + " height: 50," + " top: 285" + " }" + " }" + " }," + " data: {textValue: 'Hello World'}," + " onInit: function onInit() {}," + " onShow: function onShow() {}," + " openDetail: function openDetail() {}," + " click3: function click3() {" + " var sum = num + 1;" + " this.textValue = 'Hello Ace';" + " }," + " click2: function click2() {" + " this.click3();" + " }," + " click1: function click1() {" + " this.click2();" + " }" + " });" + "})();"; + +const char * const DfxTddTest::BUNDLE2 + = "(function () {" + " return new ViewModel({" + " render: function (vm) {" + " var _vm = vm || this;" + " return _c('swiper', {" + " attrs : {index : 0,duration : 75}," + " staticClass : ['container'], " + " on : {'change' : _vm.swiperChange}} , [" + " _c('stack', {" + " staticClass : ['container']} , [" + " _c('text', {" + " attrs : {value : function() {return _vm.textValue}}," + " staticClass : ['pm25-name']," + " staticStyle : {color : 16711680}" + " })" + " ])" + " ]);" + " }," + " styleSheet: {" + " classSelectors: {" + " 'pm25-value': {" + " textAlign: 'center'," + " fontSize: 38," + " color: 15794175," + " height: 454," + " width: 454," + " top: 235" + " }," + " 'pm25-name': {" + " textAlign: 'center'," + " color: 10667170," + " width: 454," + " height: 50," + " top: 285" + " }" + " }" + " }," + " data: {textValue: 'Hello World'}," + " onInit: function onInit() {}," + " onShow: function onShow() {}," + " openDetail: function openDetail() {}," + " click3: function click3() {" + " this.click4();" + " this.textValue = 'Hello Ace';" + " }," + " click2: function click2() {" + " this.click3();" + " }," + " click1: function click1() {" + " this.click2();" + " }" + " });" + "})();"; + +const char * const DfxTddTest::BUNDLE3 + = "(function () {" + " return new ViewModel({" + " render: function (vm) {" + " var _vm = vm || this;" + " return _c('swiper', {" + " attrs : {index : 0,duration : 75}," + " staticClass : ['container'], " + " on : {'change' : _vm.swiperChange}} , [" + " _c('stack', {" + " staticClass : ['container']} , [" + " _c('text', {" + " attrs : {value : function() {return _vm.textValue}}," + " staticClass : ['pm25-name']," + " staticStyle : {color : 16711680}" + " })" + " ])" + " ]);" + " }," + " styleSheet: {" + " classSelectors: {" + " 'pm25-value': {" + " textAlign: 'center'," + " fontSize: 38," + " color: 15794175," + " height: 454," + " width: 454," + " top: 235" + " }," + " 'pm25-name': {" + " textAlign: 'center'," + " color: 10667170," + " width: 454," + " height: 50," + " top: 285" + " }" + " }" + " }," + " data: {textValue: 'Hello World'}," + " onInit: function onInit() {}," + " onShow: function onShow() {}," + " openDetail: function openDetail() {}," + " click3: function click3() {" + " this.textValue = 'Hello Ace';" + " console.log('Hello Ace.');" + " }," + " click2: function click2() {" + " this.click3();" + " }," + " click1: function click1() {" + " this.click2();" + " }" + " });" + "})();"; + +const char * const DfxTddTest::BUNDLE4 + = "(function () {" + " return new ViewModel({" + " render: function (vm) {" + " var _vm = vm || this;" + " return _c('swiper', {" + " attrs : {index : 0,duration : 75}," + " staticClass : ['container'], " + " on : {'change' : _vm.swiperChange}} , [" + " _c('stack', {" + " staticClass : ['container']} , [" + " _c('text', {" + " attrs : {value : function() {return _vm.textValue}}," + " staticClass : ['pm25-name']," + " staticStyle : {color : 16711680}" + " })" + " ])" + " ]);" + " }," + " styleSheet: {" + " classSelectors: {" + " 'pm25-value': {" + " textAlign: 'center'," + " fontSize: 38," + " color: 15794175," + " height: 454," + " width: 454," + " top: 235" + " }," + " 'pm25-name': {" + " textAlign: 'center'," + " color: 10667170," + " width: 454," + " height: 50," + " top: 285" + " }" + " }" + " }," + " data: {textValue: 'Hello World'}," + " onInit: function onInit() {}," + " onShow: function onShow() {}," + " openDetail: function openDetail() {}," + " click32: function click32() {" + " this,click33();" + " }," + " click31: function click31() {" + " this.click32();" + " }," + " click30: function click30() {" + " this.click31();" + " }," + " click29: function click29() {" + " this,click30();" + " }," + " click28: function click28() {" + " this.click29();" + " }," + " click27: function click27() {" + " this.click28();" + " }," + " click26: function click26() {" + " this,click27();" + " }," + " click25: function click25() {" + " this.click26();" + " }," + " click24: function click24() {" + " this,click25();" + " }," + " click23: function click23() {" + " this.click24();" + " }," + " click22: function click22() {" + " this.click23();" + " }," + " click21: function click21() {" + " this,click22();" + " }," + " click20: function click20() {" + " this.click21();" + " }," + " click19: function click19() {" + " this.click20();" + " }," + " click18: function click18() {" + " this,click19();" + " }," + " click17: function click17() {" + " this.click18();" + " }," + " click16: function click16() {" + " this.click17();" + " }," + " click15: function click15() {" + " this,click16();" + " }," + " click14: function click14() {" + " this.click15();" + " }," + " click13: function click13() {" + " this.click14();" + " }," + " click12: function click12() {" + " this,click13();" + " }," + " click11: function click11() {" + " this.click12();" + " }," + " click10: function click10() {" + " this.click11();" + " }," + " click9: function click9() {" + " this,click10();" + " }," + " click8: function click8() {" + " this.click9();" + " }," + " click7: function click7() {" + " this.click8();" + " }," + " click6: function click6() {" + " this,click7();" + " }," + " click5: function click5() {" + " this.click6();" + " }," + " click4: function click4() {" + " this.click5();" + " }," + " click3: function click3() {" + " this,click4();" + " }," + " click2: function click2() {" + " this.click3();" + " }," + " click1: function click1() {" + " this.click2();" + " }" + " });" + "})();"; + +const char * const DfxTddTest::FUNC_NAME = "click1"; + +void DfxTddTest::DfxTest001() +{ + TDD_CASE_BEGIN(); + JSValue page = CreatePage(BUNDLE1, strlen(BUNDLE1)); + JSValue ret = JSObject::Call(page, FUNC_NAME); + if (!jerry_value_is_error(ret)) { + TDD_CASE_END(); + DestroyPage(page); + return; + } + + // trace out error information if the result contains error + jerry_value_t errValue = jerry_get_value_from_error(ret, false); + jerry_value_t errStrVal = jerry_value_to_string(errValue); + jerry_release_value(errValue); + jerry_size_t errStrSize = jerry_get_utf8_string_size(errStrVal); + jerry_char_t *errStrBuffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (errStrSize + 1))); + if (errStrBuffer == nullptr) { + jerry_release_value(errStrVal); + TDD_CASE_END(); + DestroyPage(page); + return; + } + jerry_size_t stringEnd = jerry_string_to_utf8_char_buffer(errStrVal, errStrBuffer, errStrSize); + errStrBuffer[stringEnd] = '\0'; + EXPECT_STREQ(reinterpret_cast(errStrBuffer), "ReferenceError: num is not defined"); + ace_free(errStrBuffer); + errStrBuffer = nullptr; + jerry_release_value(errStrVal); + + JSValue value = JSObject::Get(page, "textValue"); + char *valueStr = JSString::Value(value); + if (valueStr != nullptr) { + EXPECT_STREQ(valueStr, "Hello World"); + ace_free(valueStr); + valueStr = nullptr; + } + jerry_release_value(value); + TDD_CASE_END(); + DestroyPage(page); +} + +void DfxTddTest::DfxTest002() +{ + TDD_CASE_BEGIN(); + JSValue page = CreatePage(BUNDLE2, strlen(BUNDLE2)); + JSValue errorValue = JSObject::Call(page, FUNC_NAME); + if (!jerry_value_is_error(errorValue)) { + TDD_CASE_END(); + DestroyPage(page); + return; + } + const uint16_t stackMsgMaxLength = 256; + const uint8_t exceptLength = 3; + const char *stack = "stack"; + jerry_value_t stackStr = jerry_create_string((const jerry_char_t *) stack); + jerry_value_t errorVal = jerry_get_value_from_error(errorValue, false); + jerry_value_t backtraceVal = jerry_get_property(errorVal, stackStr); + ReleaseJerryValue(stackStr, errorVal, VA_ARG_END_FLAG); + if (jerry_value_is_error(backtraceVal) || !(jerry_value_is_array(backtraceVal))) { + TDD_CASE_END(); + DestroyPage(page); + jerry_release_value(backtraceVal); + return; + } + uint32_t length = jerry_get_array_length(backtraceVal); + EXPECT_EQ(length, exceptLength); + jerry_char_t *errStrBuffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (stackMsgMaxLength))); + if (errStrBuffer == nullptr) { + jerry_release_value(backtraceVal); + TDD_CASE_END(); + DestroyPage(page); + return; + } + jerry_value_t itemVal = jerry_get_property_by_index(backtraceVal, 0); + jerry_size_t strSize = 0; + if (!jerry_value_is_error(itemVal) && jerry_value_is_string(itemVal)) { + strSize = jerry_get_utf8_string_size(itemVal); + } + jerry_size_t stringEnd = jerry_string_to_utf8_char_buffer(itemVal, errStrBuffer, strSize); + errStrBuffer[stringEnd] = '\0'; + EXPECT_STREQ(reinterpret_cast(errStrBuffer), "click3(), "); + ace_free(errStrBuffer); + errStrBuffer = nullptr; + JSValue value = JSObject::Get(page, "textValue"); + char *valueStr = JSString::Value(value); + if (valueStr != nullptr) { + EXPECT_STREQ(valueStr, "Hello World"); + ace_free(valueStr); + valueStr = nullptr; + } + ReleaseJerryValue(itemVal, backtraceVal, value, VA_ARG_END_FLAG); + TDD_CASE_END(); + DestroyPage(page); +} + +void DfxTddTest::DfxTest003() +{ + TDD_CASE_BEGIN(); + JSValue page = CreatePage(BUNDLE3, strlen(BUNDLE3)); + JSValue ret = JSObject::Call(page, FUNC_NAME); + if (jerry_value_is_error(ret)) { + TDD_CASE_END(); + DestroyPage(page); + return; + } + JSValue value = JSObject::Get(page, "textValue"); + char *valueStr = JSString::Value(value); + if (valueStr != nullptr) { + EXPECT_STREQ(valueStr, "Hello Ace"); + ace_free(valueStr); + valueStr = nullptr; + } + jerry_release_value(value); + TDD_CASE_END(); + DestroyPage(page); +} + +void DfxTddTest::DfxTest004() +{ + TDD_CASE_BEGIN(); + JSValue page = CreatePage(BUNDLE4, strlen(BUNDLE4)); + JSValue ret = JSObject::Call(page, FUNC_NAME); + if (jerry_value_is_error(ret)) { + TDD_CASE_END(); + DestroyPage(page); + return; + } + const uint8_t exceptLength = 32; + const char *stack = "stack"; + + jerry_value_t stackStr = jerry_create_string((const jerry_char_t *) stack); + jerry_value_t errorVal = jerry_get_value_from_error(ret, false); + + jerry_value_t backtraceVal = jerry_get_property(errorVal, stackStr); + jerry_release_value(stackStr); + jerry_release_value(errorVal); + + if (jerry_value_is_error(backtraceVal) || !(jerry_value_is_array(backtraceVal))) { + TDD_CASE_END(); + DestroyPage(page); + jerry_release_value(backtraceVal); + return; + } + + uint32_t length = jerry_get_array_length(backtraceVal); + EXPECT_EQ(length, exceptLength); + TDD_CASE_END(); + jerry_release_value(backtraceVal); + DestroyPage(page); +} + + +void DfxTddTest::RunTests() +{ + DfxTest001(); + DfxTest002(); + DfxTest003(); + DfxTest004(); +} + +#ifdef TDD_ASSERTIONS +/* * + * @tc.name: DfxTest001 + * @tc.desc: Verify error code. + * @tc.require: AR000F3PDP + */ +HWTEST_F(DfxTddTest, DfxTest001, TestSize.Level1) +{ + DfxTddTest::DfxTest001(); +} + +/* * + * @tc.name: DfxTest002 + * @tc.desc: Verify error message. + * @tc.require: AR000F3PDP + */ +HWTEST_F(DfxTddTest, DfxTest002, TestSize.Level1) +{ + DfxTddTest::DfxTest002(); +} + +/* * + * @tc.name: DfxTest003 + * @tc.desc: Verify normal process. + * @tc.require: AR000F3PDP + */ +HWTEST_F(DfxTddTest, DfxTest003, TestSize.Level1) +{ + DfxTddTest::DfxTest003(); +} + +/* * + * @tc.name: DfxTest004 + * @tc.desc: Verify pressure test. + * @tc.require: AR000F3PDP + */ +HWTEST_F(DfxTddTest, DfxTest004, TestSize.Level1) +{ + DfxTddTest::DfxTest004(); +} +#endif // TDD_ASSERTIONS +} +} // namespace ACELite diff --git a/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h new file mode 100755 index 0000000..3476522 --- /dev/null +++ b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_DFX_H +#define OHOS_ACELITE_TEST_DFX_H + +#include "basic_tdd_test.h" + +namespace OHOS { +namespace ACELite { +class DfxTddTest : public BasicTddTest { +public: + DfxTddTest() : BasicTddTest() {} + ~DfxTddTest() override {} + + void DfxTest001(); + void DfxTest002(); + void DfxTest003(); + void DfxTest004(); + void RunTests(); +private: + static const char * const BUNDLE1; + static const char * const BUNDLE2; + static const char * const BUNDLE3; + static const char * const BUNDLE4; + static const char * const FUNC_NAME; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_TEST_DFX_H diff --git a/src/core/resource/video_muted_image_res.cpp b/frameworks/src/core/resource/video_muted_image_res.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/resource/video_muted_image_res.cpp rename to frameworks/src/core/resource/video_muted_image_res.cpp diff --git a/src/core/resource/video_play_image_res.cpp b/frameworks/src/core/resource/video_play_image_res.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/resource/video_play_image_res.cpp rename to frameworks/src/core/resource/video_play_image_res.cpp diff --git a/src/core/router/js_page_state.cpp b/frameworks/src/core/router/js_page_state.cpp old mode 100755 new mode 100644 similarity index 98% rename from src/core/router/js_page_state.cpp rename to frameworks/src/core/router/js_page_state.cpp index de9cf49..6d4831e --- a/src/core/router/js_page_state.cpp +++ b/frameworks/src/core/router/js_page_state.cpp @@ -84,7 +84,7 @@ void PageBackgroundState::Handle(StateMachine &sm) void PageDestroyState::Handle(StateMachine &sm) { int currState = sm.GetCurrentState(); - // any normal state can jump to destory state + // any normal state can jump to destroy state if ((currState >= INIT_STATE) || (FatalHandler::GetInstance().IsFatalErrorHitted())) { HILOG_INFO(HILOG_MODULE_ACE, "current state(%d) -> destroy state", currState); ACE_EVENT_PRINT(MT_ACE_RELEASE_HISTORY_PAGE, 0); diff --git a/src/core/router/js_page_state.h b/frameworks/src/core/router/js_page_state.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/router/js_page_state.h rename to frameworks/src/core/router/js_page_state.h diff --git a/src/core/router/js_page_state_machine.cpp b/frameworks/src/core/router/js_page_state_machine.cpp similarity index 92% rename from src/core/router/js_page_state_machine.cpp rename to frameworks/src/core/router/js_page_state_machine.cpp index 24a78f1..119a8f6 100755 --- a/src/core/router/js_page_state_machine.cpp +++ b/frameworks/src/core/router/js_page_state_machine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -12,21 +12,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_page_state_machine.h" #include "ace_log.h" #include "component.h" -#include "js_async_work.h" -#include "js_page_state.h" -#include "module_manager.h" -#include "root_view.h" -#if ENABLED(SECURE_C_FUNCTION) -#include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) #include "directive/descriptor_utils.h" #include "fatal_handler.h" #include "js_app_environment.h" +#include "js_async_work.h" +#include "js_page_state.h" #include "js_profiler.h" #include "jsi.h" +#include "lazy_load_manager.h" +#include "mem_proc.h" +#include "module_manager.h" +#include "root_view.h" +#include "securec.h" namespace OHOS { namespace ACELite { @@ -40,8 +41,8 @@ StateMachine::StateMachine() appRootPath_ = nullptr; appContext_ = nullptr; uri_ = nullptr; + rootComponent_ = nullptr; viewModel_ = UNDEFINED; - nativeElement_ = UNDEFINED; object_ = UNDEFINED; hasParams_ = false; isEntireHidden_ = false; @@ -60,6 +61,7 @@ StateMachine::~StateMachine() for (int i = 0; i < PAGE_STATE_SIZE; i++) { if (stateMap_[i] != nullptr) { delete stateMap_[i]; + stateMap_[i] = nullptr; } } if (uri_ != nullptr) { @@ -125,13 +127,9 @@ int StateMachine::GenerateJsPagePath(const char * const uri) } else { err = strcpy_s(jsPagePath_, len, uri); } - err += strcat_s(jsPagePath_, len, sourceFileSuffix); - if (err != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "use secure function errro(%d)", err); - ace_free(jsPagePath_); - jsPagePath_ = nullptr; - return ERROR_SECURE_USE; - } + JS_PAGE_RETURN_IF_ERROR(err, jsPagePath_); + err = strcat_s(jsPagePath_, len, sourceFileSuffix); + JS_PAGE_RETURN_IF_ERROR(err, jsPagePath_); return SUCCESS; } @@ -307,11 +305,23 @@ static void ForceGC(void *data) void StateMachine::RenderPage() { START_TRACING(RENDER); - nativeElement_ = appContext_->Render(viewModel_); + // if not in init state, reset all watchers of previous page at first + LazyLoadManager* lazy = const_cast(appContext_->GetLazyLoadManager()); + if (lazy->GetState() != LazyLoadState::INIT) { + lazy->ResetWatchers(); + } + // Note: do not release the returned value by Render function, it will be released by component + jerry_value_t element = appContext_->Render(viewModel_); + + // mark lazy load te task + if (lazy->GetLazyWatcher() != nullptr) { + lazy->SetState(LazyLoadState::READY); + } + rootComponent_ = ComponentUtils::GetComponentFromBindingObject(element); // append scroll layer to the outermost view scrollLayer_ = new ScrollLayer(); if (scrollLayer_ != nullptr) { - scrollLayer_->AppendScrollLayer(nativeElement_); + scrollLayer_->AppendScrollLayer(rootComponent_); } Component::HandlerAnimations(); // trigger an async full GC after completing the heavy work, which will @@ -320,18 +330,19 @@ void StateMachine::RenderPage() STOP_TRACING(); } -jerry_value_t StateMachine::ShowPage() const +void StateMachine::ShowPage() const { if (isEntireHidden_) { HILOG_WARN(HILOG_MODULE_ACE, "showpage: the whole application already in background, do not operate rootview"); - return nativeElement_; + return; } START_TRACING(ADD_TO_ROOT_VIEW); if (scrollLayer_ != nullptr) { scrollLayer_->Show(); } STOP_TRACING(); - return nativeElement_; + SYS_MEMORY_TRACING(); + JERRY_MEMORY_TRACING(); } void StateMachine::HidePage() const @@ -398,13 +409,14 @@ void StateMachine::ReleaseHistoryPageResource() // remove all native views and release components styles. if (appContext_ != nullptr) { appContext_->ReleaseStyles(); - if (!isEntireHidden_) { - // if the whole application is in background, avoid operating the rootview - appContext_->RemoveAllView(); - } + appContext_->ReleaseLazyLoadManager(); } // release scroll layer object. if (scrollLayer_ != nullptr) { + if (!isEntireHidden_) { + // if the whole application is in background, avoid operating the rootview + scrollLayer_->DetachFromRootView(); + } delete (scrollLayer_); scrollLayer_ = nullptr; } @@ -412,7 +424,8 @@ void StateMachine::ReleaseHistoryPageResource() // recycled by it, do not repeat the recycling if (!FatalHandler::GetInstance().IsFatalErrorHandleDone()) { // release all native views and their binding js objects - DescriptorUtils::ReleaseDescriptorOrElement(nativeElement_); + ComponentUtils::ReleaseComponents(rootComponent_); + rootComponent_ = nullptr; } ReleaseRootObject(); diff --git a/src/core/router/js_page_state_machine.h b/frameworks/src/core/router/js_page_state_machine.h old mode 100755 new mode 100644 similarity index 77% rename from src/core/router/js_page_state_machine.h rename to frameworks/src/core/router/js_page_state_machine.h index 2b2e3d1..64a27a3 --- a/src/core/router/js_page_state_machine.h +++ b/frameworks/src/core/router/js_page_state_machine.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,10 +16,21 @@ #ifndef OHOS_ACELITE_JS_PAGE_STATE_MACHINE_H #define OHOS_ACELITE_JS_PAGE_STATE_MACHINE_H +#include "component.h" #include "js_app_context.h" #include "non_copyable.h" #include "scroll_layer.h" +#define JS_PAGE_RETURN_IF_ERROR(error, pagePath) \ + do { \ + if (error != 0) { \ + HILOG_ERROR(HILOG_MODULE_ACE, "use secure function error(%d)", error); \ + ace_free(pagePath); \ + pagePath = nullptr; \ + return ERROR_SECURE_USE; \ + } \ + } while (0) + namespace OHOS { namespace ACELite { enum { @@ -59,7 +70,7 @@ public: } void EvalPage(); void RenderPage(); - jerry_value_t ShowPage() const; + void ShowPage() const; void HidePage() const; void SetCurrentState(int8_t newState); void InvokePageLifeCycleCallback(const char * const name) const; @@ -78,9 +89,9 @@ private: char *jsPagePath_; char *appRootPath_; char *uri_; + Component *rootComponent_; JsAppContext *appContext_; jerry_value_t viewModel_; // the object evaled from user JS code - jerry_value_t nativeElement_; // the object returned from render function jerry_value_t object_; // object transferred from one page to another page bool hasParams_; // the flag representation for whether having params of object_ bool isEntireHidden_; // representing if the whole app is in background diff --git a/src/core/router/js_router.cpp b/frameworks/src/core/router/js_router.cpp similarity index 95% rename from src/core/router/js_router.cpp rename to frameworks/src/core/router/js_router.cpp index 762e1a5..ae48675 100755 --- a/src/core/router/js_router.cpp +++ b/frameworks/src/core/router/js_router.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -19,7 +19,7 @@ #ifdef OHOS_ACELITE_PRODUCT_WATCH #include "dft_impl.h" #endif -#include "js_async_work.h" +#include "async_task_manager.h" #include "js_page_state_machine.h" #include "js_profiler.h" @@ -59,7 +59,7 @@ jerry_value_t Router::Replace(jerry_value_t object, bool async) // dispatch the new page rendering to the async handling as the current context of // router.replace need to be released, which need to return out from the scope if (async) { - if (!JsAsyncWork::DispatchAsyncWork(ReplaceAsync, this)) { + if (DISPATCH_FAILURE == AsyncTaskManager::GetInstance().Dispatch(ReplaceAsync, this)) { // request replacing failed, no chance to do it, release the new state machine HILOG_ERROR(HILOG_MODULE_ACE, "dispatch replacing request failed"); delete newSm_; diff --git a/src/core/router/js_router.h b/frameworks/src/core/router/js_router.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/router/js_router.h rename to frameworks/src/core/router/js_router.h diff --git a/src/core/stylemgr/app_style.cpp b/frameworks/src/core/stylemgr/app_style.cpp old mode 100755 new mode 100644 similarity index 95% rename from src/core/stylemgr/app_style.cpp rename to frameworks/src/core/stylemgr/app_style.cpp index 0a74e32..c491031 --- a/src/core/stylemgr/app_style.cpp +++ b/frameworks/src/core/stylemgr/app_style.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -15,15 +15,13 @@ #include "stylemgr/app_style.h" #include "ace_log.h" -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) namespace OHOS { namespace ACELite { void AppStyle::SetStyleName(const char * const name, size_t nameLen) { - if ((name == nullptr) || (strlen(name) == 0) || (nameLen <= 0) || (nameLen >= NAME_LENGTH_MAX)) { + if ((nameLen <= 0) || (nameLen >= NAME_LENGTH_MAX) || (name == nullptr) || (strlen(name) == 0)) { return; } styleName_ = static_cast(ace_malloc(sizeof(char) * (nameLen + 1))); @@ -232,6 +230,7 @@ jerry_value_t AppStyle::ConcatJerryString(jerry_value_t strA, jerry_value_t strB char *strtokB = stringB; if (strstr(stringA, pixelUnit)) { strtokA = strtok_s(stringA, pixelUnit, &next); + next = nullptr; } if (strstr(stringB, pixelUnit)) { strtokB = strtok_s(stringB, pixelUnit, &next); @@ -287,8 +286,7 @@ jerry_value_t AppStyle::ConcatJerryString(jerry_value_t strA, jerry_value_t strB stringA = nullptr; ace_free(stringB); stringB = nullptr; - ace_free(newStr); - newStr = nullptr; + ACE_FREE(newStr); return propValue; } @@ -299,14 +297,13 @@ AppStyle *AppStyle::GenerateFromJS(jerry_value_t styleKey, jerry_value_t styleVa if (styleNameBuffer == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "convert style name to char failed, will be dropped\n"); return nullptr; - } else { - strLen = strlen(styleNameBuffer); - if (strLen == 0 || (strLen >= UINT16_MAX)) { - HILOG_ERROR(HILOG_MODULE_ACE, "style name length is 0 or max, will be dropped\n"); - ace_free(styleNameBuffer); - styleNameBuffer = nullptr; - return nullptr; - } + } + strLen = strlen(styleNameBuffer); + if (strLen == 0 || (strLen >= UINT16_MAX)) { + HILOG_ERROR(HILOG_MODULE_ACE, "style name length is 0 or max, will be dropped\n"); + ace_free(styleNameBuffer); + styleNameBuffer = nullptr; + return nullptr; } AppStyle *newStyle = new AppStyle(); diff --git a/src/core/stylemgr/app_style.h b/frameworks/src/core/stylemgr/app_style.h old mode 100755 new mode 100644 similarity index 96% rename from src/core/stylemgr/app_style.h rename to frameworks/src/core/stylemgr/app_style.h index 2795da4..ecf34c9 --- a/src/core/stylemgr/app_style.h +++ b/frameworks/src/core/stylemgr/app_style.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,10 +16,8 @@ #define OHOS_ACELITE_APP_STYLE_H #include "non_copyable.h" -#include "stylemgr/app_style_item.h" -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) +#include "stylemgr/app_style_item.h" namespace OHOS { namespace ACELite { diff --git a/src/core/stylemgr/app_style_item.cpp b/frameworks/src/core/stylemgr/app_style_item.cpp old mode 100755 new mode 100644 similarity index 86% rename from src/core/stylemgr/app_style_item.cpp rename to frameworks/src/core/stylemgr/app_style_item.cpp index 5556369..455b405 --- a/src/core/stylemgr/app_style_item.cpp +++ b/frameworks/src/core/stylemgr/app_style_item.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,6 +16,7 @@ #include "stylemgr/app_style_item.h" #include "ace_log.h" #include "keys.h" +#include "number_parser.h" namespace OHOS { namespace ACELite { @@ -73,7 +74,7 @@ bool AppStyleItem::UpdateNumValToStr() const uint8_t len = 11; // max size of int32_t char strVal[len] = { 0 }; if (sprintf_s(strVal, len, "%d", numVal) < 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "style item tranform num to string fail"); + HILOG_ERROR(HILOG_MODULE_ACE, "style item transform num to string fail"); return false; } SetStringValue((const char *)strVal); @@ -88,14 +89,15 @@ AppStyleItem *AppStyleItem::GenerateFromJSValue(jerry_value_t stylePropName, jer if (keyNameBuffer == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "convert style prop name to char failed, will be dropped"); return nullptr; - } else { - if (strLen == 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "style prop name length is 0, will be dropped"); - ace_free(keyNameBuffer); - keyNameBuffer = nullptr; - return nullptr; - } } + + if (strLen == 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "style prop name length is 0, will be dropped"); + ace_free(keyNameBuffer); + keyNameBuffer = nullptr; + return nullptr; + } + uint8_t pseudoType_ = EstimatePseudoClassType(static_cast(keyNameBuffer), &strLen); AppStyleItem *styleItem = CreateStyleItem(KeyParser::ParseKeyId((const char *)keyNameBuffer, strLen), stylePropValue, pseudoType_); @@ -126,17 +128,22 @@ AppStyleItem *AppStyleItem::CreateStyleItem(uint16_t keyId, const jerry_value_t } else if (jerry_value_is_boolean(stylePropValue)) { newStyleItem->SetBoolValue(jerry_get_boolean_value(stylePropValue)); } else { - strValueBuffer = MallocStringOf(stylePropValue); + uint16_t strLength = 0; + strValueBuffer = MallocStringOf(stylePropValue, &strLength); if (strValueBuffer == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "convert style value to char failed, will be dropped"); delete newStyleItem; newStyleItem = nullptr; return nullptr; + } + float percentValue = 0; + if (NumberParser::ParsePercentValue(strValueBuffer, strLength, percentValue)) { + newStyleItem->SetPercentValue(percentValue); } else { newStyleItem->SetStringValue((const char *)strValueBuffer); - ace_free(strValueBuffer); - strValueBuffer = nullptr; } + ace_free(strValueBuffer); + strValueBuffer = nullptr; } return newStyleItem; @@ -173,6 +180,9 @@ AppStyleItem *AppStyleItem::CopyFrom(const AppStyleItem *from) case STYLE_PROP_VALUE_TYPE_FLOATING: styleItem->SetFloatingValue(from->GetFloatingValue()); break; + case STYLE_PROP_VALUE_TYPE_PERCENT: + styleItem->SetPercentValue(from->GetPercentValue()); + break; default: break; } diff --git a/src/core/stylemgr/app_style_item.h b/frameworks/src/core/stylemgr/app_style_item.h old mode 100755 new mode 100644 similarity index 80% rename from src/core/stylemgr/app_style_item.h rename to frameworks/src/core/stylemgr/app_style_item.h index 3828487..5862e6c --- a/src/core/stylemgr/app_style_item.h +++ b/frameworks/src/core/stylemgr/app_style_item.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -22,9 +22,7 @@ #include "js_fwk_common.h" #include "key_parser.h" #include "non_copyable.h" -#if ENABLED(SECURE_C_FUNCTION) #include "securec.h" -#endif // ENABLED(SECURE_C_FUNCTION) namespace OHOS { namespace ACELite { @@ -32,16 +30,18 @@ constexpr char PSEUDO_CLASS_TYPE_ACTIVE[] = ":active"; constexpr char PSEUDO_CLASS_TYPE_CHECKED[] = ":checked"; enum { - STYLE_PROP_VALUE_TYPE_UNKOWN = 0x00, + STYLE_PROP_VALUE_TYPE_UNKNOWN = 0x00, STYLE_PROP_VALUE_TYPE_STRING = 0x01, STYLE_PROP_VALUE_TYPE_NUMBER = 0x02, STYLE_PROP_VALUE_TYPE_BOOL = 0x03, STYLE_PROP_VALUE_TYPE_FLOATING = 0x04, + STYLE_PROP_VALUE_TYPE_PERCENT = 0x05, }; union StyleValue { double floating; int32_t number; + float percent; char *string; bool boolean; }; @@ -50,11 +50,31 @@ union StyleValue { * pseudo class support */ enum { - PSEUDO_CLASS_ACTIVE = 0x00, // :active - PSEUDO_CLASS_CHECKED = 0x01, // :checked - PSEUDO_CLASS_UNKNOWN = 0xFF // please add new type above + PSEUDO_CLASS_UNKNOWN = 0x00, // please add new type above + PSEUDO_CLASS_ACTIVE = 0x01, // :active + PSEUDO_CLASS_CHECKED = 0x02 // :checked }; +/** + * style flag + * former part for odd, latter part for even + */ +typedef struct U8Bits : public MemoryHeap { + bool standardOdd_ : 1; + bool pseudoActiveOdd_ : 1; + bool pseudoCheckedOdd_ : 1; + bool pseudoUnknownOdd_ : 1; + bool standardEven_ : 1; + bool pseudoActiveEven_ : 1; + bool pseudoCheckedEven_ : 1; + bool pseudoUnknownEven_ : 1; +} U8BitsType; + +typedef union StyleFlag { + U8BitsType u8Bits; + uint8_t u8Byte; +} StyleFlagType; + class AppStyleItem final : public MemoryHeap { public: ACE_DISALLOW_COPY_AND_MOVE(AppStyleItem); @@ -63,7 +83,7 @@ public: next_(nullptr), styleValue_({ 0.0 }), propNameId_(0), - valueType_(STYLE_PROP_VALUE_TYPE_UNKOWN), + valueType_(STYLE_PROP_VALUE_TYPE_UNKNOWN), pseudoClassType_(PSEUDO_CLASS_UNKNOWN) { } @@ -110,6 +130,11 @@ public: return (valueType_ != STYLE_PROP_VALUE_TYPE_FLOATING) ? false : styleValue_.floating; } + float GetPercentValue() const + { + return (valueType_ != STYLE_PROP_VALUE_TYPE_PERCENT) ? 0 : styleValue_.percent; + } + const AppStyleItem *GetNext() const { return next_; @@ -156,7 +181,7 @@ public: * @param[in] keyLength: the target style name length * @param[out] keyLength: the new style name length * - * @return unkown or the corrensponding pseudo class type + * @return unknown or the corrensponding pseudo class type */ static uint8_t EstimatePseudoClassType(const char * const styleKey, uint16_t *keyLength); @@ -179,6 +204,12 @@ private: styleValue_.floating = value; } + void SetPercentValue(float value) + { + valueType_ = STYLE_PROP_VALUE_TYPE_PERCENT; + styleValue_.percent = value; + } + void SetStringValue(const char * const value); AppStyleItem *pre_; diff --git a/src/core/stylemgr/app_style_list.cpp b/frameworks/src/core/stylemgr/app_style_list.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/stylemgr/app_style_list.cpp rename to frameworks/src/core/stylemgr/app_style_list.cpp diff --git a/src/core/stylemgr/app_style_list.h b/frameworks/src/core/stylemgr/app_style_list.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/stylemgr/app_style_list.h rename to frameworks/src/core/stylemgr/app_style_list.h diff --git a/src/core/stylemgr/app_style_manager.cpp b/frameworks/src/core/stylemgr/app_style_manager.cpp similarity index 55% rename from src/core/stylemgr/app_style_manager.cpp rename to frameworks/src/core/stylemgr/app_style_manager.cpp index c7a6ef1..1f1e42c 100755 --- a/src/core/stylemgr/app_style_manager.cpp +++ b/frameworks/src/core/stylemgr/app_style_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,6 +16,7 @@ #include "stylemgr/app_style_manager.h" #include "ace_log.h" #include "component.h" +#include "js_app_context.h" namespace OHOS { namespace ACELite { @@ -23,8 +24,10 @@ const char * const AppStyleManager::ID = "id"; const char * const AppStyleManager::ATTR_STATIC_STYLE = "staticStyle"; const char * const AppStyleManager::ATTR_DYNAMIC_STYLE = "dynamicStyle"; const char * const AppStyleManager::ATTR_STATIC_CLASS = "staticClass"; -AppStyleManager::AppStyleManager() : styleSheet_(nullptr), combinedStyle_(nullptr) +AppStyleManager::AppStyleManager() : styleSheet_(nullptr), flags_(nullptr) { + const uint8_t divisor = 2; + flagsLen_ = (KEYWORDS_MAX & 1) ? (KEYWORDS_MAX / divisor) + 1 : (KEYWORDS_MAX / divisor); // prepare jerry string value in advance to less the overhead idStrValue_ = jerry_create_string(reinterpret_cast(ID)); attrsStrValue_ = jerry_create_string(reinterpret_cast(ATTR_ATTRS)); @@ -35,12 +38,7 @@ AppStyleManager::AppStyleManager() : styleSheet_(nullptr), combinedStyle_(nullpt AppStyleManager::~AppStyleManager() { - if (combinedStyle_ != nullptr) { - combinedStyle_->Reset(); - delete combinedStyle_; - combinedStyle_ = nullptr; - } - + ACE_FREE(flags_); if (styleSheet_ != nullptr) { styleSheet_->Reset(); delete styleSheet_; @@ -50,34 +48,46 @@ AppStyleManager::~AppStyleManager() VA_ARG_END_FLAG); } -const AppStyle *AppStyleManager::GetCombinedStyle() const +void AppStyleManager::Prepare() { - return combinedStyle_; -} - -const AppStyleItem *AppStyleManager::GetCombinedStyleItem(const char * const name) const -{ - if (combinedStyle_ != nullptr) { - return combinedStyle_->GetStyleItemByName(name); + if (flags_ != nullptr) { + return; + } + if (flagsLen_ == 0) { + return; } - return nullptr; -} -void AppStyleManager::ResetCombinedStyle() -{ - // do not free the combinedStyle_ object, just reset the content of it, - // that will slow down the next combining action for next component, - // it will be freed in ~AppStyleManager after the app exits - if (combinedStyle_ != nullptr) { - combinedStyle_->Reset(); + flags_ = static_cast(ace_malloc(flagsLen_ * sizeof(StyleFlag))); + if (flags_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc flags data buffer failed"); } } -const AppStyleSheet *AppStyleManager::GetStyleSheet() const +const AppStyleSheet *AppStyleManager::GetStyleSheet() { return styleSheet_; } +void AppStyleManager::ApplyComponentStyles(const jerry_value_t options, Component& curr) +{ + ResetFlags(); + HandleStaticStyle(options, curr); + HandleDynamicStyle(options, curr); + HandleIDSelectors(options, curr); + HandleClassSelectors(options, curr); +} + +void AppStyleManager::ResetFlags() +{ + if (flags_ == nullptr) { + return; + } + + for (uint16_t i = 0; i < flagsLen_; i++) { + flags_[i].u8Byte = 0; + } +} + void AppStyleManager::InitStyleSheet(jerry_value_t jsStyleSheetObj) { if (jerry_value_is_undefined(jsStyleSheetObj) || jerry_value_is_error(jsStyleSheetObj)) { @@ -93,27 +103,6 @@ void AppStyleManager::InitStyleSheet(jerry_value_t jsStyleSheetObj) } } -// { attrs: { x: '0', y: '0' }, staticClass: 'divStyle', staticStyle: {display: 'flex', width: 454, height: 454} } -void AppStyleManager::CombineStylesForCurrentTag(const jerry_value_t options, Component ¤tComponent) -{ - // reset first - ResetCombinedStyle(); - - if (jerry_value_is_undefined(options)) { - HILOG_WARN(HILOG_MODULE_ACE, "combine styles for current tag failed"); - return; - } - - // handle static styles - HandleInlineStyles(options, currentComponent); - - // handle id selector - HandleIDSelectors(options); - - // handle class selector - HandleClassSelectors(options); -} - // return value must be released by caller jerry_value_t AppStyleManager::GetStyleObjFromOptions(jerry_value_t options, const jerry_value_t name) { @@ -146,15 +135,17 @@ jerry_value_t AppStyleManager::GetStyleObjFromOptions(jerry_value_t options, con return value; } -void AppStyleManager::HandleInlineStyles(const jerry_value_t options, Component ¤tComponent) +void AppStyleManager::MarkStandardFlag(uint16_t styleItemNameId) { - // handle static inline styles - HandleStaticStyle(options); - // handle dynamic inline styles - HandleDynamicStyle(options, currentComponent); + uint16_t index = styleItemNameId >> 1; + if (styleItemNameId & 1) { + flags_[index].u8Bits.standardEven_ = 1; + } else { + flags_[index].u8Bits.standardOdd_ = 1; + } } -void AppStyleManager::HandleStaticStyle(const jerry_value_t options) +void AppStyleManager::HandleStaticStyle(const jerry_value_t options, Component &curr) { jerry_value_t staticStyleValue = GetStyleObjFromOptions(options, staticStyleStrValue_); if (jerry_value_is_undefined(staticStyleValue)) { @@ -166,13 +157,19 @@ void AppStyleManager::HandleStaticStyle(const jerry_value_t options) for (uint32_t index = 0; index < propKeySize; index++) { jerry_value_t propKey = jerry_get_property_by_index(propKeys, index); jerry_value_t propValue = jerry_get_property(staticStyleValue, propKey); - CombineStyleItem(propKey, propValue); + AppStyleItem *newStyleItem = AppStyleItem::GenerateFromJSValue(propKey, propValue); + if (newStyleItem != nullptr) { + curr.ApplyStyle(newStyleItem); + MarkStandardFlag(newStyleItem->GetPropNameId()); + delete newStyleItem; + newStyleItem = nullptr; + } ReleaseJerryValue(propKey, propValue, VA_ARG_END_FLAG); } ReleaseJerryValue(propKeys, staticStyleValue, VA_ARG_END_FLAG); } -void AppStyleManager::HandleDynamicStyle(const jerry_value_t options, Component ¤tComponent) +void AppStyleManager::HandleDynamicStyle(const jerry_value_t options, Component &curr) { jerry_value_t dynamicStyleValue = GetStyleObjFromOptions(options, dynamicStyleStrValue_); if (jerry_value_is_undefined(dynamicStyleValue)) { @@ -186,9 +183,22 @@ void AppStyleManager::HandleDynamicStyle(const jerry_value_t options, Component jerry_value_t propValue = jerry_get_property(dynamicStyleValue, propKey); // parse expression and new watcher for it if (jerry_value_is_function(propValue)) { - jerry_value_t expressionValue = currentComponent.ParseExpression(propKey, propValue); +#ifdef FEATURE_LAZY_LOADING_MODULE + jerry_value_t expressionValue = CallJSFunction(propValue, curr.GetNativeElement(), nullptr, 0); + JsAppContext *context = JsAppContext::GetInstance(); + LazyLoadManager *lazyLoadManager = const_cast(context->GetLazyLoadManager()); + lazyLoadManager->AddLazyLoadWatcher(curr.GetNativeElement(), propKey, propValue); +#else + jerry_value_t expressionValue = curr.AddWatcherItem(propKey, propValue); +#endif // the expression's calculating result should be used, not the function value itself - CombineStyleItem(propKey, expressionValue); + AppStyleItem *newStyleItem = AppStyleItem::GenerateFromJSValue(propKey, expressionValue); + if (newStyleItem != nullptr) { + curr.ApplyStyle(newStyleItem); + MarkStandardFlag(newStyleItem->GetPropNameId()); + delete newStyleItem; + newStyleItem = nullptr; + } if (expressionValue != propValue) { // generally, ParseExpression() will calculate the expression function's value and return // the result back, so it's need to be released @@ -200,9 +210,9 @@ void AppStyleManager::HandleDynamicStyle(const jerry_value_t options, Component ReleaseJerryValue(propKeys, dynamicStyleValue, VA_ARG_END_FLAG); } -void AppStyleManager::HandleSingleSelector(const jerry_value_t prop, const jerry_value_t type) +void AppStyleManager::HandleSingleSelector(const jerry_value_t prop, const jerry_value_t type, Component &curr) { - if (jerry_value_is_undefined(prop) || jerry_value_is_undefined(type)) { + if ((styleSheet_ == nullptr) || (jerry_value_is_undefined(prop)) || (jerry_value_is_undefined(type))) { return; } @@ -211,28 +221,35 @@ void AppStyleManager::HandleSingleSelector(const jerry_value_t prop, const jerry if (valueBuffer == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "convert id value to char failed, will be dropped"); return; - } else { - if (strLen == 0) { - ace_free(valueBuffer); - valueBuffer = nullptr; - return; - } } - AppStyle *style = nullptr; - if (type == idStrValue_ && styleSheet_ != nullptr) { - style = styleSheet_->GetStyleFromIDSelectors(valueBuffer); - } else if (type == staticClassStrValue_ && styleSheet_ != nullptr) { - style = styleSheet_->GetStyleFromClassSelectors(valueBuffer); - } else { - HILOG_WARN(HILOG_MODULE_ACE, "not supported yet"); - } + do { + // malloc successfully but length is not correct, give up + if (strLen == 0) { + break; + } + + AppStyle *style = nullptr; + if (type == idStrValue_) { + style = styleSheet_->GetStyleFromIDSelectors(valueBuffer); + } else if (type == staticClassStrValue_) { + style = styleSheet_->GetStyleFromClassSelectors(valueBuffer); + } else { + HILOG_WARN(HILOG_MODULE_ACE, "not supported yet"); + } + if (style == nullptr) { + // malloc failed or not supported + break; + } + ApplySingleStyle(*style, curr); + } while (0); + + // free value buffer ace_free(valueBuffer); valueBuffer = nullptr; - CombineStyle(style); } -void AppStyleManager::HandleSelectors(const jerry_value_t options, const jerry_value_t type) +void AppStyleManager::HandleSelectors(const jerry_value_t options, const jerry_value_t type, Component &curr) { if (styleSheet_ == nullptr) { return; @@ -245,7 +262,7 @@ void AppStyleManager::HandleSelectors(const jerry_value_t options, const jerry_v if (!jerry_value_is_array(propValue)) { // if is not array, just handle it - HandleSingleSelector(propValue, type); + HandleSingleSelector(propValue, type, curr); } else { // support array uint32_t propCount = jerry_get_array_length(propValue); @@ -253,7 +270,7 @@ void AppStyleManager::HandleSelectors(const jerry_value_t options, const jerry_v // do reverse traversal to ensure style override correctly while (propCount > 0) { jerry_value_t property = jerry_get_property_by_index(propValue, (propCount - 1)); - HandleSingleSelector(property, type); + HandleSingleSelector(property, type, curr); jerry_release_value(property); propCount--; } @@ -264,63 +281,80 @@ void AppStyleManager::HandleSelectors(const jerry_value_t options, const jerry_v jerry_release_value(propValue); } -void AppStyleManager::HandleIDSelectors(const jerry_value_t options) +void AppStyleManager::HandleIDSelectors(const jerry_value_t options, Component &curr) { - HandleSelectors(options, idStrValue_); + HandleSelectors(options, idStrValue_, curr); } -void AppStyleManager::HandleClassSelectors(const jerry_value_t options) +void AppStyleManager::HandleClassSelectors(const jerry_value_t options, Component &curr) { - HandleSelectors(options, staticClassStrValue_); + HandleSelectors(options, staticClassStrValue_, curr); } -void AppStyleManager::CombineStyle(AppStyle *appStyle) +bool AppStyleManager::isStandardExist(uint16_t styleItemNameId) { - if (appStyle == nullptr) { - return; + uint16_t index = styleItemNameId >> 1; + if (styleItemNameId & 1) { + return flags_[index].u8Bits.standardEven_; } - // go through id style's all items, add it to combinedStyle_ if it's not in it - const AppStyleItem *styleItem = appStyle->GetFirst(); - while (styleItem != nullptr) { - if (combinedStyle_) { - uint16_t styleItemNameId = styleItem->GetPropNameId(); - // if it's already in combined style, skip, as it's lower priority - const AppStyleItem *exitCombinedStyleItem = combinedStyle_->GetStyleItemByNameId(styleItemNameId); - if ((exitCombinedStyleItem == nullptr) || - (exitCombinedStyleItem->GetPseudoClassType() != styleItem->GetPseudoClassType())) { - AppStyleItem *newItem = AppStyleItem::CopyFrom(styleItem); - AppendToCombinedStyle(newItem); - } - styleItem = styleItem->GetNext(); + return flags_[index].u8Bits.standardOdd_; +} + +bool AppStyleManager::isPseudoExist(uint16_t styleItemNameId, uint16_t type) +{ + uint16_t index = styleItemNameId >> 1; + if (styleItemNameId & 1) { + if (type == PSEUDO_CLASS_ACTIVE) { + return flags_[index].u8Bits.pseudoActiveEven_; + } + return flags_[index].u8Bits.pseudoCheckedEven_; + } + if (type == PSEUDO_CLASS_ACTIVE) { + return flags_[index].u8Bits.pseudoActiveOdd_; + } + return flags_[index].u8Bits.pseudoCheckedOdd_; +} + +void AppStyleManager::MarkPseudoFlag(uint16_t styleItemNameId, uint16_t type) +{ + uint16_t index = styleItemNameId >> 1; + if (styleItemNameId & 1) { + if (type == PSEUDO_CLASS_ACTIVE) { + flags_[index].u8Bits.pseudoActiveEven_ = 1; } else { - /* if combinedStyle_ is null, add all items directly */ - while (styleItem != nullptr) { - AppStyleItem *newItem = AppStyleItem::CopyFrom(styleItem); - AppendToCombinedStyle(newItem); - styleItem = styleItem->GetNext(); - } + flags_[index].u8Bits.pseudoCheckedEven_ = 1; + } + } else { + if (type == PSEUDO_CLASS_ACTIVE) { + flags_[index].u8Bits.pseudoActiveOdd_ = 1; + } else { + flags_[index].u8Bits.pseudoCheckedOdd_ = 1; } } } -void AppStyleManager::CombineStyleItem(jerry_value_t stylePropName, jerry_value_t stylePropValue) +void AppStyleManager::ApplySingleStyle(AppStyle &appStyle, Component &curr) { - AppStyleItem *newStyleItem = AppStyleItem::GenerateFromJSValue(stylePropName, stylePropValue); - AppendToCombinedStyle(newStyleItem); -} - -void AppStyleManager::AppendToCombinedStyle(AppStyleItem *newStyleItem) -{ - if (newStyleItem == nullptr) { - return; + // go through id style's all items, apply it to component + const AppStyleItem *styleItem = appStyle.GetFirst(); + while (styleItem != nullptr) { + uint16_t styleItemNameId = styleItem->GetPropNameId(); + uint8_t pseudoClassType = styleItem->GetPseudoClassType(); + // inline style not exists and pseudo class type is normal, set normal style + if (pseudoClassType == 0 && !isStandardExist(styleItemNameId)) { + MarkStandardFlag(styleItemNameId); + curr.ApplyStyle(styleItem); + styleItem = styleItem->GetNext(); + continue; + } + // pseudo class type exists and no other same pseudo style has been applied, set pseudo class style + if (pseudoClassType != 0 && !isPseudoExist(styleItemNameId, pseudoClassType)) { + MarkPseudoFlag(styleItemNameId, pseudoClassType); + curr.ApplyStyle(styleItem); + } + styleItem = styleItem->GetNext(); } - - if (combinedStyle_ == nullptr) { - combinedStyle_ = new AppStyle(); - } - - combinedStyle_->AddStyleItem(newStyleItem); } } // namespace ACELite } // namespace OHOS diff --git a/src/core/stylemgr/app_style_manager.h b/frameworks/src/core/stylemgr/app_style_manager.h old mode 100755 new mode 100644 similarity index 64% rename from src/core/stylemgr/app_style_manager.h rename to frameworks/src/core/stylemgr/app_style_manager.h index 596afb0..57bc44e --- a/src/core/stylemgr/app_style_manager.h +++ b/frameworks/src/core/stylemgr/app_style_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,6 +16,7 @@ #ifndef OHOS_ACELITE_APP_STYLE_MANAGER_H #define OHOS_ACELITE_APP_STYLE_MANAGER_H +#include "keys.h" #include "non_copyable.h" #include "stylemgr/app_style.h" #include "stylemgr/app_style_sheet.h" @@ -30,33 +31,34 @@ public: ~AppStyleManager(); void InitStyleSheet(jerry_value_t jsStyleSheetObj); - // combine id/static class/static styles for current tag from arguments of createElement function - void CombineStylesForCurrentTag(const jerry_value_t options, Component& currentComponent); - const AppStyle* GetCombinedStyle() const; - const AppStyleItem* GetCombinedStyleItem(const char * const name) const; - void ResetCombinedStyle(); - const AppStyleSheet* GetStyleSheet() const; + const AppStyleSheet* GetStyleSheet(); + void ApplyComponentStyles(const jerry_value_t options, Component& curr); + void Prepare(); + bool isStandardExist(uint16_t styleItemNameId); + bool isPseudoExist(uint16_t styleItemNameId, uint16_t type); private: - void HandleInlineStyles(const jerry_value_t options, Component& currentComponent); - void HandleStaticStyle(const jerry_value_t options); - void HandleDynamicStyle(const jerry_value_t options, Component& currentComponent); - void HandleIDSelectors(const jerry_value_t options); - void HandleClassSelectors(const jerry_value_t options); - void HandleSelectors(const jerry_value_t options, const jerry_value_t type); - void HandleSingleSelector(const jerry_value_t selectorValue, const jerry_value_t type); - void CombineStyleItem(jerry_value_t stylePropName, jerry_value_t stylePropValue); - void AppendToCombinedStyle(AppStyleItem* newStyle); - void CombineStyle(AppStyle* appStyle); + void ApplySingleStyle(AppStyle &appStyle, Component &curr); jerry_value_t GetStyleObjFromOptions(jerry_value_t options, const jerry_value_t name); + void HandleStaticStyle(const jerry_value_t options, Component& curr); + void HandleDynamicStyle(const jerry_value_t options, Component& curr); + void HandleIDSelectors(const jerry_value_t options, Component &curr); + void HandleClassSelectors(const jerry_value_t options, Component &curr); + void HandleSelectors(const jerry_value_t options, const jerry_value_t type, Component &curr); + void HandleSingleSelector(const jerry_value_t selectorValue, const jerry_value_t type, Component &curr); + void ResetFlags(); + void MarkStandardFlag(uint16_t styleItemNameId); + void MarkPseudoFlag(uint16_t styleItemNameId, uint16_t type); AppStyleSheet* styleSheet_; - AppStyle* combinedStyle_; // record the combined styles for current tag + // prepare jerry string value in advance to speed up jerry_value_t idStrValue_; jerry_value_t attrsStrValue_; jerry_value_t dynamicStyleStrValue_; jerry_value_t staticStyleStrValue_; jerry_value_t staticClassStrValue_; + StyleFlag* flags_; + uint16_t flagsLen_; static const char * const ID; static const char * const ATTR_STATIC_STYLE; static const char * const ATTR_DYNAMIC_STYLE; diff --git a/src/core/stylemgr/app_style_sheet.cpp b/frameworks/src/core/stylemgr/app_style_sheet.cpp old mode 100755 new mode 100644 similarity index 97% rename from src/core/stylemgr/app_style_sheet.cpp rename to frameworks/src/core/stylemgr/app_style_sheet.cpp index 4ce2eb4..878fbeb --- a/src/core/stylemgr/app_style_sheet.cpp +++ b/frameworks/src/core/stylemgr/app_style_sheet.cpp @@ -86,6 +86,10 @@ void AppStyleSheet::InitSelectors(AppStyleList** selectorsList, jerry_value_t se if ((*selectorsList) == nullptr) { (*selectorsList) = new AppStyleList(); + if ((*selectorsList) == nullptr) { + // malloc failed + return; + } } jerry_value_t styleKeys = jerry_get_object_keys(selectorsObj); diff --git a/src/core/stylemgr/app_style_sheet.h b/frameworks/src/core/stylemgr/app_style_sheet.h old mode 100755 new mode 100644 similarity index 97% rename from src/core/stylemgr/app_style_sheet.h rename to frameworks/src/core/stylemgr/app_style_sheet.h index 51032d9..e92ce1f --- a/src/core/stylemgr/app_style_sheet.h +++ b/frameworks/src/core/stylemgr/app_style_sheet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -36,12 +36,12 @@ public: AppStyle* GetStyleFromClassSelectors(const char * const name) const; AppStyle* GetStyleFromKeyFramesSelectors(const char * const name) const; AppStyle* GetStyleFromSelectors(AppStyleList* selectors, const char * const name) const; - -private: - void InitSelectors(AppStyleList** selectorsList, jerry_value_t selectorsObj, bool isKeyFrames); AppStyleList* idSelectors_; AppStyleList* classSelectors_; AppStyleList* keyFrameSelectors_; + +private: + void InitSelectors(AppStyleList** selectorsList, jerry_value_t selectorsObj, bool isKeyFrames); }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/stylemgr/test/unittest/BUILD.gn b/frameworks/src/core/stylemgr/test/unittest/BUILD.gn new file mode 100755 index 0000000..7cbfa2d --- /dev/null +++ b/frameworks/src/core/stylemgr/test/unittest/BUILD.gn @@ -0,0 +1,31 @@ +#Copyright (c) 2021 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("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +unittest("js_frameworks_test_stylemgr") { + output_extension = "bin" + output_dir = test_output_root + configs = [ "$ace_lite_root/test:test_common_config" ] + sources = [ + "$ace_lite_root/frameworks/src/core/components/test/unittest/common/root_component_mock.cpp", + "$ace_lite_root/test/moduletest/common/base_test.cpp", + "common/stylemgr_tdd_test.cpp", + ] + deps = ace_test_deps +} + +group("stylemgr_unittest") { + deps = [ ":js_frameworks_test_stylemgr" ] +} diff --git a/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.cpp b/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.cpp new file mode 100755 index 0000000..aacc13b --- /dev/null +++ b/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.cpp @@ -0,0 +1,1079 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "stylemgr_tdd_test.h" +#include +#include "component.h" +#include "div_component.h" +#include "js_ability.h" +#include "js_debugger_config.h" +#include "stylemgr/app_style_manager.h" +#include "stylemgr/app_style_sheet.h" + +namespace OHOS { +namespace ACELite { +StyleMgrTddTest::StyleMgrTddTest() +{} + +void StyleMgrTddTest::SetUp() +{ + Debugger::GetInstance().SetupJSContext(); + jerry_init(JERRY_INIT_EMPTY); + if (g_testStyleMgr == nullptr) { + g_testStyleMgr = new AppStyleManager(); + g_testStyleMgr->Prepare(); + } + rootComponentMock_.PrepareRootContainer(); +} + +void StyleMgrTddTest::TearDown() +{ + if (g_testStyleMgr != nullptr) { + delete g_testStyleMgr; + g_testStyleMgr = nullptr; + } + jerry_cleanup(); + Debugger::GetInstance().ReleaseJSContext(); +} + +void StyleMgrTddTest::TestCaseB(const char* name) const +{ + g_assertRecord = 0; + g_currentTestCaseName = const_cast(name); +} + +void StyleMgrTddTest::JudeTestCaseResult() const +{ + if (g_assertRecord > 0) { + printf("[Test Case] [%s] FAILED \n", g_currentTestCaseName); + } else { + printf("[Test Case] [%s] PASSED \n", g_currentTestCaseName); + } +} + +void StyleMgrTddTest::ReleaseTestResources(const jerry_value_t* values, + uint8_t valueCount, + Component** components, + uint8_t componentCount) const +{ + // release JS values + if ((values != nullptr) && (valueCount != 0)) { + for (int i = 0; i < valueCount; i++) { + jerry_release_value(values[i]); + } + } + + // release component instances + if ((components != nullptr) && (componentCount != 0)) { + for (int i = 0; ((i < componentCount) && (components[i] != nullptr)); i++) { + components[i]->Release(); + delete components[i]; + components[i] = nullptr; + } + } +} + +/** + * prepare valid style sheet with given selectors and key value paire + */ +JSValue StyleMgrTddTest::PrepareStyleSheet(const char* selectors, + const char* selectorName, + const char* propName, + uint16_t propValue) const +{ + if ((selectors == nullptr) || (strlen(selectors) == 0) || (selectorName == nullptr) || + (strlen(selectorName) == 0) || (propName == nullptr) || (strlen(propName) == 0)) { + return jerry_create_undefined(); + } + + /** + * create one style sheet + */ + JSValue styleSheet = jerry_create_object(); + + /** + * create id selector object and set it to style sheet + */ + JSValue idSelectorKey = jerry_create_string(reinterpret_cast(selectors)); + JSValue idSelectors = jerry_create_object(); + jerry_release_value(jerry_set_property(styleSheet, idSelectorKey, idSelectors)); + jerry_release_value(idSelectorKey); + + /** + * create one id selector + */ + JSValue sampleSelectorKey = jerry_create_string(reinterpret_cast(selectorName)); + JSValue sampleSelector = jerry_create_object(); + jerry_release_value(jerry_set_property(idSelectors, sampleSelectorKey, sampleSelector)); + jerry_release_value(sampleSelectorKey); + + /** + * add height key value into sample + */ + JSValue heightKey = jerry_create_string(reinterpret_cast(propName)); + JSValue heightValue = jerry_create_number(propValue); + jerry_release_value(jerry_set_property(sampleSelector, heightKey, heightValue)); + jerry_release_value(heightKey); + + return styleSheet; +} + +JSValue StyleMgrTddTest::PrepareStyleSheetWithKeyValues(const char* selector, + JSValue selectorObj, + const char* selectorName, + const uint8_t itemCount, + char* keys[], + const uint16_t values[]) const +{ + if ((itemCount == 0) || (selectorName == nullptr) || (strlen(selectorName) == 0) || + (keys == nullptr) || (values == nullptr)) { + return jerry_create_undefined(); + } + + /** + * create one style sheet + */ + JSValue styleSheet = jerry_create_object(); + + /** + * create selector object and set it to style sheet + */ + JSValue selectorObjectTarget = jerry_create_object(); + JSValue selectorKey = jerry_create_string(reinterpret_cast(selector)); + jerry_release_value(jerry_set_property(styleSheet, selectorKey, selectorObjectTarget)); + jerry_release_value(selectorKey); + + /** + * set selector into style sheet object + */ + JSValue selectorNameValue = jerry_create_string(reinterpret_cast(selectorName)); + jerry_release_value(jerry_set_property(selectorObjectTarget, selectorNameValue, selectorObj)); + jerry_release_value(selectorNameValue); + + /** + * add value into selector + */ + for (uint8_t i = 0; i < itemCount; i++) { + JSValue widthValue = jerry_create_number(values[i]); + JSValue keyNameValue = jerry_create_string(reinterpret_cast(keys[i])); + jerry_release_value(jerry_set_property(selectorObj, keyNameValue, widthValue)); + jerry_release_value(keyNameValue); + } + + return styleSheet; +} + +/** + * prepare valid style option + */ +JSValue StyleMgrTddTest::PrepareStyleOption(const char* styleType, const char* propName, uint16_t propValue) const +{ + if ((styleType == nullptr) || (strlen(styleType) == 0) || (propName == nullptr) || (strlen(propName) == 0)) { + return jerry_create_undefined(); + } + + /** + * create one style sheet + */ + JSValue styleOption = jerry_create_object(); + + /** + * create style object + */ + JSValue styleTypeKey = jerry_create_string(reinterpret_cast(styleType)); + JSValue styleObj = jerry_create_object(); + jerry_release_value(jerry_set_property(styleOption, styleTypeKey, styleObj)); + jerry_release_value(styleTypeKey); + + /** + * add height key value into style + */ + JSValue propKey = jerry_create_string(reinterpret_cast(propName)); + JSValue propValueObj = jerry_create_number(propValue); + jerry_release_value(jerry_set_property(styleObj, propKey, propValueObj)); + jerry_release_value(propKey); + + return styleOption; +} + +/** + * prepare valid attr option + */ +JSValue StyleMgrTddTest::PrepareAttrOption(const char* propName, const char* propValue) const +{ + if ((propName == nullptr) || (strlen(propName) == 0)) { + return jerry_create_undefined(); + } + + /** + * create one style sheet + */ + JSValue option = jerry_create_object(); + + /** + * create style object + */ + JSValue attrsKey = jerry_create_string(reinterpret_cast("attrs")); + JSValue attrsObj = jerry_create_object(); + jerry_release_value(jerry_set_property(option, attrsKey, attrsObj)); + jerry_release_value(attrsKey); + + /** + * add height key value into style + */ + JSValue propKey = jerry_create_string(reinterpret_cast(propName)); + JSValue propValueObj = jerry_create_string(reinterpret_cast(propValue)); + jerry_release_value(jerry_set_property(attrsObj, propKey, propValueObj)); + jerry_release_value(propKey); + + return option; +} + +void StyleMgrTddTest::AddValueToAttrOption(jerry_value_t attrOption, const char* propName, const char* propValue) const +{ + if ((propName == nullptr) || (strlen(propName) == 0)) { + return; + } + + JSValue attrsKey = jerry_create_string(reinterpret_cast("attrs")); + JSValue attrsObj = jerry_create_object(); + jerry_release_value(jerry_set_property(attrOption, attrsKey, attrsObj)); + jerry_release_value(attrsKey); + /** + * add height key value into style + */ + JSValue propKey = jerry_create_string(reinterpret_cast(propName)); + JSValue propValueObj = jerry_create_string(reinterpret_cast(propValue)); + jerry_release_value(jerry_set_property(attrsObj, propKey, propValueObj)); + jerry_release_value(propKey); +} + +void StyleMgrTddTest::AddStrValueToOption(jerry_value_t option, const char* propName, const char* propValue) const +{ + if ((propName == nullptr) || (strlen(propName) == 0)) { + return; + } + + /** + * add height key value into style + */ + JSValue propKey = jerry_create_string(reinterpret_cast(propName)); + JSValue propValueObj = jerry_create_string(reinterpret_cast(propValue)); + jerry_release_value(jerry_set_property(option, propKey, propValueObj)); + jerry_release_value(propKey); +} + +void StyleMgrTddTest::ACELiteStyleManagerInlineStyle001() +{ + TestCaseB("ACELiteStyleManagerInlineStyle001"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. create undefine for style sheet object + */ + JSValue undefined = jerry_create_undefined(); + + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(undefined); + + /** + * @tc.steps: step4. check if the style sheet object is generated + */ + EXPECT_TRUE(g_testStyleMgr->GetStyleSheet() == nullptr); + + /** + * @tc.steps: step4. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerInlineStyle002() +{ + TestCaseB("ACELiteStyleManagerInlineStyle002"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. create undefine for style sheet object + */ + JSValue styleSheet = jerry_create_object(); + + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheet); + + /** + * @tc.steps: step4. check if the style sheet object is generated, style sheet instance will be created out + */ + EXPECT_FALSE(g_testStyleMgr->GetStyleSheet() == nullptr); + + /** + * @tc.steps: step5. release style sheet object + */ + jerry_release_value(styleSheet); + + /** + * @tc.steps: step6. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerInlineStyle003() +{ + TestCaseB("ACELiteStyleManagerInlineStyle003"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet + */ + constexpr char id[] = "idSelectors"; + constexpr char *sample = "sample"; + constexpr char heightKey[] = "height"; + constexpr int32_t heightValue = 50; + JSValue styleSheetObj = PrepareStyleSheet(id, sample, heightKey, heightValue); + + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheetObj); + + /** + * @tc.steps: step4. check the result + */ + AppStyleSheet* styleSheet = const_cast(g_testStyleMgr->GetStyleSheet()); + if (styleSheet == nullptr) { + jerry_release_value(styleSheetObj); + TDD_CASE_END(); + return; + } + EXPECT_FALSE(styleSheet == nullptr); + + AppStyle* sampleSelector = styleSheet->GetStyleFromIDSelectors(sample); + if (sampleSelector == nullptr) { + jerry_release_value(styleSheetObj); + TDD_CASE_END(); + return; + } + EXPECT_FALSE(sampleSelector == nullptr); + + AppStyleItem* sampleSelectorItem = const_cast(sampleSelector->GetFirst()); + if (sampleSelectorItem == nullptr) { + jerry_release_value(styleSheetObj); + TDD_CASE_END(); + return; + } + EXPECT_FALSE(sampleSelectorItem == nullptr); + + EXPECT_EQ(sampleSelectorItem->GetNumValue(), heightValue); + + /** + * @tc.steps: step5. release the style sheet JS object + */ + jerry_release_value(styleSheetObj); + + /** + * @tc.steps: step6. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerInlineStyle004() +{ + TestCaseB("ACELiteStyleManagerInlineStyle004"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + constexpr char classSelector[] = "classSelectors"; + constexpr char *sample = "sampleClass"; + constexpr char widthKey[] = "width"; + constexpr int32_t widthValue = 200; + JSValue styleSheetObj = PrepareStyleSheet(classSelector, sample, widthKey, widthValue); + + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheetObj); + + /** + * @tc.steps: step4. check the result + */ + AppStyleSheet* styleSheet = const_cast(g_testStyleMgr->GetStyleSheet()); + if (styleSheet == nullptr) { + jerry_release_value(styleSheetObj); + TDD_CASE_END(); + return; + } + EXPECT_FALSE(styleSheet == nullptr); + + AppStyle* sampleSelector = styleSheet->GetStyleFromClassSelectors(sample); + if (sampleSelector == nullptr) { + jerry_release_value(styleSheetObj); + TDD_CASE_END(); + return; + } + EXPECT_FALSE(sampleSelector == nullptr); + + AppStyleItem* sampleSelectorItem = const_cast(sampleSelector->GetFirst()); + if (sampleSelectorItem == nullptr) { + jerry_release_value(styleSheetObj); + TDD_CASE_END(); + return; + } + EXPECT_FALSE(sampleSelectorItem == nullptr); + + EXPECT_EQ(sampleSelectorItem->GetNumValue(), widthValue); + + /** + * @tc.steps: step5. release the style sheet JS object + */ + jerry_release_value(styleSheetObj); + + /** + * @tc.steps: step6. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerInlineStyle005() +{ + TestCaseB("ACELiteStyleManagerInlineStyle005"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + constexpr char classSelector[] = "classSelectors"; + // give an very long selector name + constexpr char sample[] = "sampleClassSelectorWithVeryLongNameOverSixtyFourCharatersWhichIsTooLong"; + constexpr char widthKey[] = "width"; + constexpr int32_t widthValue = 200; + JSValue styleSheetObj = PrepareStyleSheet(classSelector, sample, widthKey, widthValue); + + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheetObj); + + /** + * @tc.steps: step4. check the result + */ + AppStyleSheet* styleSheet = const_cast(g_testStyleMgr->GetStyleSheet()); + if (styleSheet == nullptr) { + jerry_release_value(styleSheetObj); + TDD_CASE_END(); + return; + } + EXPECT_FALSE(styleSheet == nullptr); + + /** + * @tc.steps: step5. release the style sheet JS object + */ + jerry_release_value(styleSheetObj); + + /** + * @tc.steps: step6. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerIDSelector001() +{ + TestCaseB("ACELiteStyleManagerIDSelector001"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + DivComponent* divComponent = new DivComponent(UNDEFINED, UNDEFINED, g_testStyleMgr); + + /** + * @tc.steps: step3. check the result + */ + EXPECT_TRUE(g_testStyleMgr->GetStyleSheet() == nullptr); + + divComponent->Release(); + delete divComponent; + divComponent = nullptr; + + /** + * @tc.steps: step4. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerIDSelector002() +{ + TestCaseB("ACELiteStyleManagerIDSelector002"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + constexpr char styleType[] = "staticStyle"; + constexpr char widthKey[] = "width"; + constexpr int32_t widthValue = 200; + jerry_value_t styleOption = PrepareStyleOption(styleType, widthKey, widthValue); + DivComponent* divComponent = new DivComponent(styleOption, UNDEFINED, g_testStyleMgr); + divComponent->Render(); + /** + * @tc.steps: step3. check the result + */ + EXPECT_TRUE(g_testStyleMgr->GetStyleSheet() == nullptr); + + /** + * @tc.steps: step4. check the result + */ + jerry_release_value(styleOption); + divComponent->Release(); + delete divComponent; + divComponent = nullptr; + + /** + * @tc.steps: step5. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerIDSelector003() +{ + TestCaseB("ACELiteStyleManagerIDSelector003"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + constexpr char idKey[] = "id"; + constexpr char idValue[] = "test"; + jerry_value_t styleOption = PrepareAttrOption(idKey, idValue); + DivComponent* divComponent = new DivComponent(styleOption, UNDEFINED, g_testStyleMgr); + divComponent->Render(); + + /** + * @tc.steps: step3. check the result, no style sheet, so no one will be added into combined style + */ + EXPECT_TRUE(g_testStyleMgr->GetStyleSheet() == nullptr); + + /** + * @tc.steps: step4. check the result + */ + jerry_release_value(styleOption); + divComponent->Release(); + delete divComponent; + divComponent = nullptr; + + /** + * @tc.steps: step5. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerIDSelector004() +{ + TestCaseB("ACELiteStyleManagerIDSelector004"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + constexpr char classSelector[] = "classSelectors"; + constexpr char sample[] = "sample"; + constexpr char widthKey[] = "width"; + constexpr int32_t widthValue = 200; + JSValue styleSheetObj = PrepareStyleSheet(classSelector, sample, widthKey, widthValue); + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheetObj); + + /** + * @tc.steps: step4. prepare valid style sheet with class selector + */ + constexpr char styleType[] = "staticStyle"; + constexpr char heightKey[] = "height"; + constexpr int32_t heightValue = 100; + jerry_value_t option = PrepareStyleOption(styleType, heightKey, heightValue); + + AddValueToAttrOption(option, "staticClass", "sample"); + DivComponent* divComponent = new DivComponent(option, UNDEFINED, g_testStyleMgr); + + const uint8_t valueCount = 2; + const jerry_value_t jsValues[valueCount] = {option, styleSheetObj}; + const uint8_t componentCount = 1; + Component* components[1] = {divComponent}; + + /** + * @tc.steps: step5. check the result, no style sheet, so no one will be added into combined style + */ + EXPECT_FALSE(g_testStyleMgr->GetStyleSheet() == nullptr); + if (g_testStyleMgr->GetStyleSheet() == nullptr) { + ReleaseTestResources(jsValues, valueCount, components, componentCount); + TDD_CASE_END(); + return; + } + + /** + * @tc.steps: step6. release test resources + */ + ReleaseTestResources(jsValues, valueCount, components, componentCount); + + /** + * @tc.steps: step7. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerIDSelector005() +{ + TestCaseB("ACELiteStyleManagerIDSelector005"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + constexpr char styleType[] = "staticStyle"; + constexpr char widthKey2[] = "width"; + constexpr int32_t widthValue2 = 100; + jerry_value_t styleOption = PrepareStyleOption(styleType, widthKey2, widthValue2); + DivComponent* divComponent = new DivComponent(styleOption, UNDEFINED, g_testStyleMgr); + + constexpr char classSelector[] = "classSelectors"; + constexpr char sample[] = "sample"; + constexpr char widthKey[] = "width"; + constexpr int32_t widthValue = 500; + JSValue styleSheetObj = PrepareStyleSheet(classSelector, sample, widthKey, widthValue); + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheetObj); + rootComponentMock_.RenderComponent(*divComponent); + + /** + * @tc.steps: step4. prepare valid style sheet with class selector + */ + Component* component = reinterpret_cast(divComponent); + UIViewGroup* uiView = reinterpret_cast(component->GetComponentRootView()); + + const uint8_t jsValueCount = 2; + const jerry_value_t jerryValues[jsValueCount] = {styleOption, styleSheetObj}; + const uint8_t componentNumber = 1; + Component* componentInstances[1] = {divComponent}; + + /** + * @tc.steps: step5. check the result, no style sheet, so no one will be added into combined style + */ + AppStyleSheet* appStyleSheet = const_cast(g_testStyleMgr->GetStyleSheet()); + EXPECT_FALSE(appStyleSheet == nullptr); + if (appStyleSheet == nullptr) { + ReleaseTestResources(jerryValues, jsValueCount, componentInstances, componentNumber); + TDD_CASE_END(); + return; + } + + uint16_t width = uiView->GetWidth(); + EXPECT_EQ(width, widthValue2); + + /** + * @tc.steps: step6. release test resources + */ + ReleaseTestResources(jerryValues, jsValueCount, componentInstances, componentNumber); + + /** + * @tc.steps: step7. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerClassSelector001() +{ + TestCaseB("ACELiteStyleManagerClassSelector001"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + DivComponent* divComponent = new DivComponent(UNDEFINED, UNDEFINED, g_testStyleMgr); + divComponent->Render(); + + /** + * @tc.steps: step5. check the result, no style sheet, so no one will be added into combined style + */ + EXPECT_TRUE(const_cast(g_testStyleMgr->GetStyleSheet()) == nullptr); + + divComponent->Release(); + delete divComponent; + divComponent = nullptr; + + /** + * @tc.steps: step4. clean up test environment + */ + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerClassSelector002() +{ + TestCaseB("ACELiteStyleManagerClassSelector002"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style + */ + constexpr int32_t heightValue = 100; + constexpr char heightKey[] = "height"; + constexpr char styleType[] = "staticStyle"; + jerry_value_t styleOption = PrepareStyleOption(styleType, heightKey, heightValue); + DivComponent* divComponent = new DivComponent(styleOption, UNDEFINED, g_testStyleMgr); + divComponent->Render(); + + /** + * @tc.steps: step3. check the result + */ + const AppStyleSheet* appStyleSheet = const_cast(g_testStyleMgr->GetStyleSheet()); + EXPECT_TRUE(appStyleSheet == nullptr); + + /** + * @tc.steps: step4. clean up test environment + */ + jerry_release_value(styleOption); + divComponent->Release(); + delete divComponent; + divComponent = nullptr; + TDD_CASE_END(); +} + +void StyleMgrTddTest::ACELiteStyleManagerClassSelector003() +{ + TestCaseB("ACELiteStyleManagerClassSelector003"); + /** + * @tc.steps: step1. init test environment + */ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step2. prepare valid style sheet with class selector + */ + constexpr char classSelector[] = "classSelectors"; + constexpr char sample[] = "sample"; + constexpr char widthKey[] = "width"; + constexpr int32_t widthValue = 200; + JSValue styleSheetObj = PrepareStyleSheet(classSelector, sample, widthKey, widthValue); + /** + * @tc.steps: step3. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheetObj); + + /** + * @tc.steps: step4. prepare valid style sheet with class selector + */ + constexpr char styleType[] = "staticStyle"; + constexpr char widthKey2[] = "width"; + constexpr int32_t widthValue2 = 100; + jerry_value_t styleOption = PrepareStyleOption(styleType, widthKey2, widthValue2); + DivComponent* divComponent = new DivComponent(styleOption, UNDEFINED, g_testStyleMgr); + rootComponentMock_.RenderComponent(*divComponent); + + const uint8_t jsCount = 2; + const jerry_value_t jsObjects[jsCount] = {styleOption, styleSheetObj}; + const uint8_t divNumber = 1; + Component* divComponents[1] = {divComponent}; + + /** + * @tc.steps: step5. check the result, no style sheet, so no one will be added into combined style + */ + Component* component = reinterpret_cast(divComponent); + UIViewGroup* uiView = reinterpret_cast(component->GetComponentRootView()); + AppStyleSheet* appStyleSheet = const_cast(g_testStyleMgr->GetStyleSheet()); + EXPECT_FALSE(appStyleSheet == nullptr); + if (appStyleSheet == nullptr) { + ReleaseTestResources(jsObjects, jsCount, divComponents, divNumber); + TDD_CASE_END(); + return; + } + + uint16_t width = uiView->GetWidth(); + EXPECT_EQ(width, widthValue2); + + /** + * @tc.steps: step6. release test resources + */ + ReleaseTestResources(jsObjects, jsCount, divComponents, divNumber); + + /** + * @tc.steps: step7. clean up test environment + */ + TDD_CASE_END(); +} + +JSValue StyleMgrTddTest::PreparePesudoObjects(uint16_t value) const +{ + constexpr char classSelector[] = "classSelectors"; + constexpr char sample[] = "sample"; + constexpr int32_t activeWidthValue = 300; + JSValue classSelectorObj = jerry_create_object(); + const uint8_t itemCount = 2; + char* keys[itemCount]; + uint16_t const values[itemCount] = {value, activeWidthValue}; + keys[0] = const_cast("width"); + keys[1] = const_cast("width:active"); + JSValue styleSheetObj = + PrepareStyleSheetWithKeyValues(classSelector, classSelectorObj, sample, itemCount, keys, values); + return styleSheetObj; +} + +void StyleMgrTddTest::ACELiteStyleManagerCSSPesudo001() +{ + TDD_CASE_BEGIN(); + + /** + * @tc.steps: step1. prepare pesudo class items + */ + constexpr uint16_t widthValue = 200; + JSValue styleSheetObj = PreparePesudoObjects(widthValue); + + /** + * @tc.steps: step2. trigger style sheet initialization + */ + g_testStyleMgr->InitStyleSheet(styleSheetObj); + + /** + * @tc.steps: step3. prepare valid style sheet with class selector + */ + constexpr uint16_t heightValue = 50; + jerry_value_t option = PrepareStyleOption("staticStyle", "height", heightValue); + AddStrValueToOption(option, "staticClass", "sample"); + DivComponent* divComponent = new DivComponent(option, UNDEFINED, g_testStyleMgr); + rootComponentMock_.RenderComponent(*divComponent); + const uint8_t jsObjCount = 2; + const jerry_value_t jsObjs[jsObjCount] = {option, styleSheetObj}; + const uint8_t divComponentNumber = 1; + Component* divComponentInstances[1] = {divComponent}; + + /** + * @tc.steps: step4. check the result, no style sheet, so no one will be added into combined style + */ + uint16_t index = KeyParser::ParseKeyId("width"); + EXPECT_TRUE(g_testStyleMgr->isPseudoExist(index, 0x01)); + Component* component = reinterpret_cast(divComponent); + UIViewGroup* uiView = reinterpret_cast(component->GetComponentRootView()); + if (uiView != nullptr) { + EXPECT_EQ(uiView->GetWidth(), widthValue); + EXPECT_EQ(uiView->GetHeight(), heightValue); + } + + ReleaseTestResources(jsObjs, jsObjCount, divComponentInstances, divComponentNumber); + TDD_CASE_END(); +} + +void StyleMgrTddTest::RunTests() +{ + ACELiteStyleManagerInlineStyle001(); + ACELiteStyleManagerInlineStyle002(); + ACELiteStyleManagerInlineStyle003(); + ACELiteStyleManagerInlineStyle004(); + ACELiteStyleManagerInlineStyle005(); + ACELiteStyleManagerIDSelector001(); + ACELiteStyleManagerIDSelector002(); + ACELiteStyleManagerIDSelector003(); + ACELiteStyleManagerIDSelector004(); + ACELiteStyleManagerIDSelector005(); + ACELiteStyleManagerClassSelector001(); + ACELiteStyleManagerClassSelector002(); + ACELiteStyleManagerClassSelector003(); + ACELiteStyleManagerCSSPesudo001(); +} + +#ifdef TDD_ASSERTIONS +/** + * @tc.name: ACELiteStyleManagerInlineStyle001 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEEQ + */ +HWTEST_F(StyleMgrTddTest, InlineStyle001, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerInlineStyle001(); +} + +/** + * @tc.name: ACELiteStyleManagerInlineStyle002 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEEQ + */ +HWTEST_F(StyleMgrTddTest, InlineStyle002, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerInlineStyle002(); +} + +/** + * @tc.name: ACELiteStyleManagerInlineStyle003 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEEQ + */ +HWTEST_F(StyleMgrTddTest, InlineStyle003, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerInlineStyle003(); +} + +/** + * @tc.name: ACELiteStyleManagerInlineStyle004 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEEQ + */ +HWTEST_F(StyleMgrTddTest, InlineStyle004, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerInlineStyle004(); +} + +/** + * @tc.name: ACELiteStyleManagerInlineStyle005 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEEQ + */ +HWTEST_F(StyleMgrTddTest, InlineStyle005, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerInlineStyle005(); +} + +/** + * @tc.name: ACELiteStyleManagerIDSelector001 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEER + */ +HWTEST_F(StyleMgrTddTest, IDSelector001, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerIDSelector001(); +} + +/** + * @tc.name: ACELiteStyleManagerIDSelector002 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEER + */ +HWTEST_F(StyleMgrTddTest, IDSelector002, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerIDSelector002(); +} + +/** + * @tc.name: ACELiteStyleManagerIDSelector003 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEER + */ +HWTEST_F(StyleMgrTddTest, IDSelector003, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerIDSelector003(); +} + +/** + * @tc.name: ACELiteStyleManagerIDSelector004 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEER + */ +HWTEST_F(StyleMgrTddTest, IDSelector004, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerIDSelector004(); +} + +/** + * @tc.name: ACELiteStyleManagerIDSelector005 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEER + */ +HWTEST_F(StyleMgrTddTest, IDSelector005, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerIDSelector005(); +} + +/** + * @tc.name: ACELiteStyleManagerClassSelector001 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEES + */ +HWTEST_F(StyleMgrTddTest, ClassSelector001, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerClassSelector001(); +} + +/** + * @tc.name: ACELiteStyleManagerClassSelector002 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEES + */ +HWTEST_F(StyleMgrTddTest, ClassSelector002, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerClassSelector002(); +} + +/** + * @tc.name: ACELiteStyleManagerClassSelector003 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000DSEES + */ +HWTEST_F(StyleMgrTddTest, ClassSelector003, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerClassSelector003(); +} + +/** + * @tc.name: ACELiteStyleManagerCSSPesudo001 + * @tc.desc: Verify the style sheet initialization. + * @tc.require: AR000E2TCI + */ +HWTEST_F(StyleMgrTddTest, CSSPesudo001, TestSize.Level1) +{ + StyleMgrTddTest::ACELiteStyleManagerCSSPesudo001(); +} +#endif +} // ACELite +} // OHOS + diff --git a/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h b/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h new file mode 100755 index 0000000..06c76a4 --- /dev/null +++ b/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2021 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. + */ +#ifndef ACELITE_STYLEMGR_TDD_TEST_H +#define ACELITE_STYLEMGR_TDD_TEST_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "acelite_config.h" +#include "component_factory.h" +#include "root_component_mock.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +static char* g_currentTestCaseName = nullptr; +static uint8_t g_assertRecord = 0; +static AppStyleManager* g_testStyleMgr = nullptr; +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class StyleMgrTddTest : public testing::Test { +#else +class StyleMgrTddTest { +#endif +public: + StyleMgrTddTest(); + ~StyleMgrTddTest(){}; + void SetUp(); + void TearDown(); + void TestCaseB(const char* name) const; + void JudeTestCaseResult() const; + void ReleaseTestResources(const jerry_value_t* values, + uint8_t valueCount, + Component** components, + uint8_t componentCount) const; + JSValue PrepareStyleSheet(const char* selectors, + const char* selectorName, + const char* propName, + uint16_t propValue) const; + JSValue PrepareStyleSheetWithKeyValues(const char* selector, + JSValue selectorObj, + const char* selectorName, + const uint8_t itemCount, + char* keys[], + const uint16_t values[]) const; + JSValue PreparePesudoObjects(uint16_t value) const; + + JSValue PrepareStyleOption(const char* styleType, const char* propName, uint16_t propValue) const; + JSValue PrepareAttrOption(const char* propName, const char* propValue) const; + void AddValueToAttrOption(jerry_value_t attrOption, const char* propName, const char* propValue) const; + void AddStrValueToOption(jerry_value_t option, const char* propName, const char* propValue) const; + + void ACELiteStyleManagerInlineStyle001(); + void ACELiteStyleManagerInlineStyle002(); + void ACELiteStyleManagerInlineStyle003(); + void ACELiteStyleManagerInlineStyle004(); + void ACELiteStyleManagerInlineStyle005(); + void ACELiteStyleManagerIDSelector001(); + void ACELiteStyleManagerIDSelector002(); + void ACELiteStyleManagerIDSelector003(); + void ACELiteStyleManagerIDSelector004(); + void ACELiteStyleManagerIDSelector005(); + void ACELiteStyleManagerClassSelector001(); + void ACELiteStyleManagerClassSelector002(); + void ACELiteStyleManagerClassSelector003(); + void ACELiteStyleManagerCSSPesudo001(); + void RunTests(); + +private: + RootComponentMock rootComponentMock_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // ACELITE_STYLEMGR_TDD_TEST_H diff --git a/src/core/wrapper/js.cpp b/frameworks/src/core/wrapper/js.cpp similarity index 74% rename from src/core/wrapper/js.cpp rename to frameworks/src/core/wrapper/js.cpp index 40c66b9..2b66558 100755 --- a/src/core/wrapper/js.cpp +++ b/frameworks/src/core/wrapper/js.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -13,9 +13,10 @@ * limitations under the License. */ +#include "wrapper/js.h" #include "ace_mem_base.h" #include "acelite_config.h" -#include "wrapper/js.h" +#include "js_fwk_common.h" namespace OHOS { namespace ACELite { @@ -26,7 +27,7 @@ void JSRelease(JSValue value) JSValue JSString::Create(const char * const value) { - return jerry_create_string(reinterpret_cast(value)); + return jerry_create_string(reinterpret_cast(value)); } bool JSString::Is(JSValue target) @@ -34,7 +35,7 @@ bool JSString::Is(JSValue target) return jerry_value_is_string(target); } -char* JSString::Value(JSValue value) +char *JSString::Value(JSValue value) { if (jerry_value_is_undefined(value)) { return nullptr; @@ -56,7 +57,7 @@ char* JSString::Value(JSValue value) if (size == 0) { jerry_release_value(target); // return empty char instead of nullptr, so caller can free safely - char* emptyStr = static_cast(ace_malloc(sizeof(char))); + char *emptyStr = static_cast(ace_malloc(sizeof(char))); if (emptyStr == nullptr) { return nullptr; } @@ -67,7 +68,7 @@ char* JSString::Value(JSValue value) jerry_release_value(target); return nullptr; } - jerry_char_t* buffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (size + 1))); + jerry_char_t *buffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (size + 1))); if (buffer == nullptr) { jerry_release_value(target); return nullptr; @@ -92,7 +93,7 @@ JSValue JSFunction::Create(JSHandler handler) JSValue JSFunction::Call(JSValue func, JSValue context, JSValue args[], JSSize size) { - return jerry_call_function(func, context, args, size); + return CallJSFunction(func, context, args, size); } bool JSFunction::Is(JSValue target) @@ -105,6 +106,16 @@ JSValue JSObject::Create() return jerry_create_object(); } +JSValue JSObject::Keys(JSValue target) +{ + return jerry_get_object_keys(target); +} + +JSValue JSObject::Get(JSValue target, JSValue key) +{ + return jerry_get_property(target, key); +} + JSValue JSObject::Get(JSValue target, const char * const prop) { JSValue key = JSString::Create(prop); @@ -113,6 +124,20 @@ JSValue JSObject::Get(JSValue target, const char * const prop) return value; } +char *JSObject::GetString(JSValue target, const char * const prop) +{ + JSValue value = JSObject::Get(target, prop); + char *content = JSString::Value(value); + JSRelease(value); + return content; +} +double JSObject::GetNumber(JSValue target, const char * const prop) +{ + JSValue value = JSObject::Get(target, prop); + double number = JSNumber::Value(value); + JSRelease(value); + return number; +} void JSObject::Set(JSValue target, const char * const prop, JSValue value) { JSValue key = JSString::Create(prop); @@ -120,6 +145,27 @@ void JSObject::Set(JSValue target, const char * const prop, JSValue value) JSRelease(key); } +void JSObject::SetString(JSValue target, const char * const prop, const char * const value) +{ + JSValue attr = JSString::Create(value); + JSObject::Set(target, prop, attr); + JSRelease(attr); +} + +void JSObject::SetNumber(JSValue target, const char * const prop, const double value) +{ + JSValue attr = JSNumber::Create(value); + JSObject::Set(target, prop, attr); + JSRelease(attr); +} + +void JSObject::SetBoolean(JSValue target, const char * const prop, const bool value) +{ + JSValue attr = JSBoolean::Create(value); + JSObject::Set(target, prop, attr); + JSRelease(attr); +} + void JSObject::Set(JSValue target, const char * const prop, JSHandler handler) { JSValue func = JSFunction::Create(handler); @@ -135,12 +181,12 @@ bool JSObject::Del(JSValue target, const char * const prop) return result; } -bool JSObject::GetNativePointer(JSValue target, void** nativePointer) +bool JSObject::GetNativePointer(JSValue target, void **nativePointer) { return jerry_get_object_native_pointer(target, nativePointer, nullptr); } -void JSObject::SetNativePointer(JSValue target, void* nativePointer) +void JSObject::SetNativePointer(JSValue target, void *nativePointer) { return jerry_set_object_native_pointer(target, nativePointer, nullptr); } @@ -188,6 +234,12 @@ void JSGlobal::Set(const char * const prop, JSValue value) JSRelease(global); } +void JSGlobal::Del(const char * const props) +{ + JSValue global = JSGlobal::Get(); + JSObject::Del(global, props); + JSRelease(global); +} JSValue JSGlobal::Call(const char * const prop, JSValue args[], JSSize size) { JSValue global = JSGlobal::Get(); @@ -255,6 +307,13 @@ JSValue JSArray::Get(JSValue array, uint32_t index) return jerry_get_property_by_index(array, index); } +char *JSArray::GetString(JSValue array, uint32_t index) +{ + JSValue value = JSArray::Get(array, index); + char *content = JSString::Value(value); + JSRelease(value); + return content; +} JSValue JSArray::Map(JSValue array, JSValue func) { JSValue args[1] = {func}; @@ -266,5 +325,13 @@ void JSArray::Push(JSValue array, JSValue element) JSValue args[1] = {element}; JSRelease(JSObject::Call(array, "push", args, 1)); } +bool JSArray::Is(JSValue target) +{ + return jerry_value_is_array(target); +} +bool JSError::Is(JSValue target) +{ + return jerry_value_is_error(target); +} } // namespace ACELite } // namespace OHOS diff --git a/src/core/wrapper/js.h b/frameworks/src/core/wrapper/js.h similarity index 75% rename from src/core/wrapper/js.h rename to frameworks/src/core/wrapper/js.h index 832c2c8..0532978 100755 --- a/src/core/wrapper/js.h +++ b/frameworks/src/core/wrapper/js.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -32,7 +32,7 @@ class JSString final : public MemoryHeap { public: static JSValue Create(const char * const value); static bool Is(JSValue target); - static char* Value(JSValue value); + static char *Value(JSValue value); }; class JSFunction final : public MemoryHeap { @@ -45,16 +45,24 @@ public: class JSObject final : public MemoryHeap { public: static JSValue Create(); + static JSValue Keys(JSValue target); + static JSValue Get(JSValue target, JSValue key); static JSValue Get(JSValue target, const char * const prop); + static char *GetString(JSValue target, const char * const prop); + static double GetNumber(JSValue target, const char * const prop); static void Set(JSValue target, const char * const prop, JSValue value); + static void SetString(JSValue target, const char * const prop, const char * const value); + static void SetNumber(JSValue target, const char * const prop, const double value); + static void SetBoolean(JSValue target, const char * const prop, const bool value); static void Set(JSValue target, const char * const prop, JSHandler handler); static bool Del(JSValue target, const char * const prop); static JSValue Call(JSValue target, const char * const prop, JSValue args[], JSSize size); static JSValue Call(JSValue target, const char * const prop); - static bool GetNativePointer(JSValue target, void** nativePointer); - static void SetNativePointer(JSValue target, void* nativePointer); + static bool GetNativePointer(JSValue target, void **nativePointer); + static void SetNativePointer(JSValue target, void *nativePointer); static bool DelNativePointer(JSValue target); static bool Is(JSValue target); + static bool Has(JSValue target, const char *name); }; class JSGlobal final : public MemoryHeap { @@ -62,6 +70,7 @@ public: static JSValue Get(); static JSValue Get(const char * const prop); static void Set(const char * const prop, JSValue value); + static void Del(const char * const props); static JSValue Call(const char * const prop, JSValue args[], JSSize size); static JSValue Call(const char * const prop); }; @@ -91,8 +100,14 @@ public: static JSValue Create(uint32_t size); static uint32_t Length(const JSValue array); static JSValue Get(JSValue array, uint32_t index); + static char *GetString(JSValue array, uint32_t index); static JSValue Map(JSValue array, JSValue func); static void Push(JSValue array, JSValue element); + static bool Is(JSValue target); +}; +class JSError final : public MemoryHeap { +public: + static bool Is(JSValue target); }; } // namespace ACELite } // namespace OHOS diff --git a/targets/default/acelite_config.h b/frameworks/targets/default/acelite_config.h old mode 100755 new mode 100644 similarity index 100% rename from targets/default/acelite_config.h rename to frameworks/targets/default/acelite_config.h diff --git a/frameworks/targets/linux/acelite_config.h b/frameworks/targets/linux/acelite_config.h new file mode 100755 index 0000000..34f3c0a --- /dev/null +++ b/frameworks/targets/linux/acelite_config.h @@ -0,0 +1,137 @@ +/* + * Copyright (c) 2020-2021 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. + */ + +#ifndef OHOS_ACELITE_CONFIG_H +#define OHOS_ACELITE_CONFIG_H + +/** + * ================================================================================================ + * hi3516_linux config for hmf + * ================================================================================================ + */ +#define OHOS_ACELITE_LINUX // NOTE: DO NOT use this macro directly + +/** + * Compile all test entry for hmf + */ +#ifdef FEATURE_TEST_IMPLEMENTATION +#error "must keep the global configuration unique" +#else +#define FEATURE_TEST_IMPLEMENTATION +#endif + +/** + * use hi log interface to trace out + */ +#ifdef FEATURE_ACELITE_HI_LOG_PRINTF +#error "must keep the global configuration unique" +#else +#define FEATURE_ACELITE_HI_LOG_PRINTF +#endif + +/** + * append no blank color to rootview for easy using, delete this after the mouse showing is optimized + */ +#ifdef FEATURE_ROOTVIEW_CUSTOM_BACKGROUND_COLOR +#error "must keep the global configuration unique" +#else +#define FEATURE_ROOTVIEW_CUSTOM_BACKGROUND_COLOR +#endif + +/** + * js system capabillity switch + */ +#ifdef FEATURE_ACELITE_SYSTEM_CAPABILITY +#error "must keep the system capability unique" +#else +#define FEATURE_ACELITE_SYSTEM_CAPABILITY +#endif + +/** + * js profiler switch + */ +#ifdef FEATURE_ACELITE_JS_PROFILER +#error "must keep the global configuration unique" +#else +#define FEATURE_ACELITE_JS_PROFILER +#endif + +/** + * support audio API for JS + */ +#define FEATURE_MODULE_AUDIO + +/** + * switch for cipher module + */ +#define ENABLE_MODULE_CIPHER + +/** + * support storage and file API for JS + */ +#define FEATURE_MODULE_STORAGE + +/** + * support device API for JS + */ +#define FEATURE_MODULE_DEVICE + +/** + * timer module + */ +#define FEATURE_TIMER_MODULE + +/** + * support lite ace dfx module + */ +#define FEATURE_ACELITE_DFX_MODULE + +#define FEATURE_ACELITE_LITE_DFX_MODULE + +/** + * enable Canvas component Feature API on ipcamera real devices + */ +#define FEATURE_COMPONENT_CANVAS + +#define FEATURE_LOCALIZATION_MODULE + +#ifdef FEATURE_COMPONENT_CAMERA +#error "must keep the global configuration unique" +#else +#define FEATURE_COMPONENT_CAMERA +#endif + +#ifdef FEATURE_COMPONENT_VIDEO +#error "must keep the global configuration unique" +#else +#define FEATURE_COMPONENT_VIDEO +#endif + +#define FEATURE_UPDATE_VIDEO_PROGRESS_ASYNC + +#ifdef FEATURE_MODULE_DIALOG +#error "must keep the global configuration unique" +#else +#define FEATURE_MODULE_DIALOG +#endif + +#define DEFAULT_PROFILER_MSG_PATH "/user/data/" + +#define PROFILER_ENABLE_FLAG_FILE "/user/data/profiler_enable" + +#define RUNTIME_MODE_FILE_PATH "/user/data/jsparser_enable" + +#endif // OHOS_ACELITE_CONFIG_H + diff --git a/targets/liteos_a/acelite_config.h b/frameworks/targets/liteos_a/acelite_config.h similarity index 79% rename from targets/liteos_a/acelite_config.h rename to frameworks/targets/liteos_a/acelite_config.h index 93b7863..138e17e 100755 --- a/targets/liteos_a/acelite_config.h +++ b/frameworks/targets/liteos_a/acelite_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -50,6 +50,15 @@ #define FEATURE_ROOTVIEW_CUSTOM_BACKGROUND_COLOR #endif +/** + * js system capabillity switch + */ +#ifdef FEATURE_ACELITE_SYSTEM_CAPABILITY +#error "must keep the system capability unique" +#else +#define FEATURE_ACELITE_SYSTEM_CAPABILITY +#endif + /** * js profiler switch */ @@ -84,6 +93,11 @@ */ #define FEATURE_TIMER_MODULE +/** + * date time module + */ +#define FEATURE_DATE_FORMAT + /** * support lite ace dfx module */ @@ -96,18 +110,42 @@ */ #define FEATURE_COMPONENT_CANVAS +#define FEATURE_LOCALIZATION_MODULE + #ifdef FEATURE_COMPONENT_CAMERA #error "must keep the global configuration unique" #else #define FEATURE_COMPONENT_CAMERA #endif +#ifdef FEATURE_COMPONENT_QRCODE +#error "must keep the global configuration unique" +#else +#define FEATURE_COMPONENT_QRCODE +#endif + #ifdef FEATURE_COMPONENT_VIDEO #error "must keep the global configuration unique" #else #define FEATURE_COMPONENT_VIDEO #endif +#ifdef FEATURE_MODULE_DIALOG +#error "must keep the global configuration unique" +#else +#define FEATURE_MODULE_DIALOG +#endif + +/** + * support intl module + */ +#define FEATURE_INTL_MODULE + +/** + * supoort number format module + */ +#define FEATURE_NUMBER_FORMAT + #define FEATURE_UPDATE_VIDEO_PROGRESS_ASYNC #define DEFAULT_PROFILER_MSG_PATH "/storage/user/data/" diff --git a/targets/liteos_m/acelite_config.h b/frameworks/targets/liteos_m/acelite_config.h similarity index 69% rename from targets/liteos_m/acelite_config.h rename to frameworks/targets/liteos_m/acelite_config.h index a15ef50..b620e3a 100755 --- a/targets/liteos_m/acelite_config.h +++ b/frameworks/targets/liteos_m/acelite_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -16,6 +16,9 @@ #ifndef OHOS_ACELITE_CONFIG_H #define OHOS_ACELITE_CONFIG_H +// some features depend on the low layer configuration +#include "graphic_config.h" + /** * ================================================================================================ * config for wearable @@ -26,20 +29,30 @@ */ #define OHOS_ACELITE_PRODUCT_WATCH +// delete this after jerry porting is ready +#define JERRY_PORTING_DEPENDENCY + +/** + * enable Canvas component Feature API on ipcamera real devices + */ +#define FEATURE_COMPONENT_CANVAS + +/** + * enable QRcode component + */ +#define FEATURE_COMPONENT_QRCODE + /** * support terminate() API from JS */ #define FEATURE_TERMINATE_ABILITY -/** - * support storage and file API for JS - */ -#define FEATURE_MODULE_STORAGE - +#ifdef ACELITE_DEPENDENCY_IS_READY /** * enable FeatureAbility API */ #define FEATURE_FEATURE_ABILITY_MODULE +#endif // ACELITE_DEPENDENCY_IS_READY /** * enable timer JS API @@ -51,21 +64,6 @@ */ #define FEATURE_LOCALIZATION_MODULE -/** - * support sensor API for JS - */ -#define FEATURE_MODULE_SENSOR - -/** - * support device API for JS - */ -#define FEATURE_MODULE_DEVICE - -/** - * support geo location API for JS - */ -#define FEATURE_MODULE_GEO - /** * support mc ace log module trace */ @@ -103,12 +101,19 @@ #define CONSOLE_LOG_LINE_MAX_LENGTH (96) #endif +#ifdef ACELITE_DEPENDENCY_IS_READY /** * support mc ace dfx module */ #define FEATURE_ACELITE_DFX_MODULE -#define FEATURE_ACELITE_MC_DFX_MODULE +#define FEATURE_ACELITE_LITE_DFX_MODULE +#endif + +/** + * support mc lazy loading + */ +#define FEATURE_LAZY_LOADING_MODULE /** * support fatal error handling on device which not support process @@ -117,6 +122,23 @@ #define FEATURE_FATAL_ERROR_HANDLING #endif +/** + * support intl module + */ +#define FEATURE_INTL_MODULE + +/** + * supoort number format module + */ +#define FEATURE_NUMBER_FORMAT + +/** + * date time module + */ +#define FEATURE_DATE_FORMAT + +#define JS_ENGINE_STATIC_MULTI_CONTEXTS_ENABLED + /** * support js profiler */ @@ -128,4 +150,14 @@ #define RUNTIME_MODE_FILE_PATH "user/data/jsparser_enable" +/** + * Rotation API feature + */ +#if (defined(ENABLE_ROTATE_INPUT) && (ENABLE_ROTATE_INPUT == 1)) +// low layer supports +#ifndef FEATURE_ROTATION_API +#define FEATURE_ROTATION_API +#endif +#endif // (defined(ENABLE_ROTATE_INPUT) && (ENABLE_ROTATE_INPUT == 1)) + #endif // OHOS_ACELITE_CONFIG_H diff --git a/targets/platform_adapter.cpp b/frameworks/targets/platform_adapter.cpp old mode 100755 new mode 100644 similarity index 87% rename from targets/platform_adapter.cpp rename to frameworks/targets/platform_adapter.cpp index 6731c9a..3ba0e69 --- a/targets/platform_adapter.cpp +++ b/frameworks/targets/platform_adapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -22,6 +22,7 @@ #include "ace_log.h" #include "ace_version.h" #include "js_fwk_common.h" +#include "product_adapter.h" namespace OHOS { namespace ACELite { @@ -47,19 +48,16 @@ void SetEngineSnapshotMode(bool &mode) void SetEngineSnapshotModeManually(bool &mode) { #ifndef TARGET_SIMULATOR - // if not startting debugger, on real device, give a chance to use JS mode manually + // if not starting debugger, on real device, give a chance to use JS mode manually mode = !(IsFileExisted(RUNTIME_MODE_FILE_PATH)); #endif // TARGET_SIMULATOR } -#ifdef FEATURE_TERMINATE_ABILITY -extern "C" int TerminateAbility(uint16_t token); -#endif void Terminate(uint16_t token) { #ifndef TARGET_SIMULATOR // no AMS support on PC simulator #ifdef FEATURE_TERMINATE_ABILITY - (void)TerminateAbility(token); + ProductAdapter::SendTerminatingRequest(token, false); #else AceAbility::TerminateSelf(); #endif diff --git a/targets/platform_adapter.h b/frameworks/targets/platform_adapter.h old mode 100755 new mode 100644 similarity index 100% rename from targets/platform_adapter.h rename to frameworks/targets/platform_adapter.h diff --git a/frameworks/targets/simulator/BUILD.gn b/frameworks/targets/simulator/BUILD.gn new file mode 100755 index 0000000..999963e --- /dev/null +++ b/frameworks/targets/simulator/BUILD.gn @@ -0,0 +1,70 @@ +#Copyright (c) 2021 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("//build/lite/config/subsystem/aafwk/config.gni") +import("//build/ohos.gni") +import("//foundation/ace/ace_engine_lite/ace_lite.gni") + +declare_args() { + LOSCFG_TEST_JS_BUILD = false +} + +config("ace_lite_config") { + include_dirs = ace_lite_include_dirs_simulator + include_dirs += ace_lite_include_dirs + include_dirs += + [ "//foundation/ace/ace_engine_lite/frameworks/targets/simulator" ] +} + +ohos_static_library("ace_lite") { + public_configs = [ ":ace_lite_config" ] + sources = ace_lite_sources + sources += [ "//foundation/ace/ace_engine_lite/frameworks/src/core/modules/presets/feature_ability_module.cpp" ] + sources -= [ + "//foundation/ace/ace_engine_lite/frameworks/src/core/async/js_async_work.cpp", + "//foundation/ace/ace_engine_lite/frameworks/src/core/async/message_queue_utils.cpp", + "//foundation/ace/ace_engine_lite/frameworks/src/core/context/ace_ability.cpp", + ] + cflags_cc = [ + "-Wno-error", + "-D_INC_STRING_S", + "-D_INC_WCHAR_S", + "-D_SECIMP=//", + "-D_STDIO_S_DEFINED", + "-D_INC_STDIO_S", + "-D_INC_STDLIB_S", + "-D_INC_MEMORY_S", + ] + deps = [ + "//base/global/resmgr_lite/frameworks/resmgr_lite:global_resmgr_simulator", + "//foundation/graphic/ui/huawei_proprietary/tools/ide:graphic_lite", + "//third_party/bounds_checking_function:libsec_static", + "//third_party/jerryscript:libjerryscript", + ] + defines = [ + "TARGET_SIMULATOR", + "JS_ENGINE_EXTERNAL_CONTEXT", + "SCREENSIZE_SPECIFIED", + ] + if (is_debug == "debug") { + defines += [ "JS_PROFILER=1" ] + } else { + defines += [ "JS_PROFILER=0" ] + } + if (LOSCFG_TEST_JS_BUILD) { + defines += [ "JSFWK_TEST" ] + } + if (enable_ohos_appexecfwk_feature_ability == true) { + defines += [ "ABILITY_WINDOW_SUPPORT" ] + } +} diff --git a/targets/simulator/acelite_config.h b/frameworks/targets/simulator/acelite_config.h similarity index 83% rename from targets/simulator/acelite_config.h rename to frameworks/targets/simulator/acelite_config.h index b226c41..3dea3e2 100755 --- a/targets/simulator/acelite_config.h +++ b/frameworks/targets/simulator/acelite_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * Copyright (c) 2020-2021 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 @@ -92,6 +92,8 @@ */ #define FEATURE_LOCALIZATION_MODULE +#define CHANGE_START_PAGE + /** * module require test */ @@ -113,8 +115,24 @@ */ #define FEATURE_COMPONENT_CANVAS +#ifdef FEATURE_COMPONENT_QRCODE +#error "must keep the global configuration unique" +#else +#define FEATURE_COMPONENT_QRCODE +#endif + +#ifdef _WIN32 +// support memory analysis, only on win +#define SIMULATOR_MEMORY_ANALYSIS +#endif + #ifdef _WIN32 #define PROFILER_ENABLE_FLAG_FILE "..\\profiler_enable" +#ifdef SIMULATOR_MEMORY_ANALYSIS +#define MEM_PROC_ENABLE_FLAG_FILE "..\\memproc_enable" +#define MEM_LOG_FILE_PATH "..\\mem.txt" +#define MEM_BACK_UP_LOG_FILE_PREFIX "..\\" +#endif // SIMULATOR_MEMORY_ANALYSIS #else // path format is different on linux or apple with windows #define PROFILER_ENABLE_FLAG_FILE "~/profiler_enable" diff --git a/tools/profiler/README.md b/frameworks/tools/profiler/README.md old mode 100755 new mode 100644 similarity index 100% rename from tools/profiler/README.md rename to frameworks/tools/profiler/README.md diff --git a/tools/profiler/js_profiler.py b/frameworks/tools/profiler/js_profiler.py old mode 100755 new mode 100644 similarity index 97% rename from tools/profiler/js_profiler.py rename to frameworks/tools/profiler/js_profiler.py index e07bba6..cd87993 --- a/tools/profiler/js_profiler.py +++ b/frameworks/tools/profiler/js_profiler.py @@ -1,5 +1,6 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2020 Huawei Device Co., Ltd. +# Copyright (c) 2020-2021 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 diff --git a/tools/profiler/js_profiler_config.py b/frameworks/tools/profiler/js_profiler_config.py old mode 100755 new mode 100644 similarity index 98% rename from tools/profiler/js_profiler_config.py rename to frameworks/tools/profiler/js_profiler_config.py index ac7e904..5c5f3a3 --- a/tools/profiler/js_profiler_config.py +++ b/frameworks/tools/profiler/js_profiler_config.py @@ -1,5 +1,6 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2020 Huawei Device Co., Ltd. +# Copyright (c) 2020-2021 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 diff --git a/tools/snapshot/framework2char.py b/frameworks/tools/snapshot/framework2char.py similarity index 88% rename from tools/snapshot/framework2char.py rename to frameworks/tools/snapshot/framework2char.py index 761766d..d3430ef 100644 --- a/tools/snapshot/framework2char.py +++ b/frameworks/tools/snapshot/framework2char.py @@ -1,5 +1,6 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2020 Huawei Device Co., Ltd. +# Copyright (c) 2020-2021 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 @@ -55,7 +56,8 @@ def output_copyright(output): def output_check_notes(output): - output.write("// AUTO GENERATED, PLEASE DO NOT EDIT DIRECTLY\n\n") + output.write("// AUTO GENERATED, PLEASE DO NOT EDIT DIRECTLY\n") + output.write("#include \n\n") output.write("#ifndef ACELITE_FRAMEWORK_RAW_BUFFER\n") output.write("#error THIS FILE CAN ONLY BE INCLUDED BY RAW BUFFER CPP\n") output.write("#endif\n\n") @@ -71,7 +73,7 @@ def convert_bc(): "#ifndef OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER\n") output.write( "#define OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER\n") - output.write("const char g_frameworkBCBuffer[] =\n{\n ") + output.write("const uint8_t g_frameworkBCBuffer[] =\n{\n ") index = 1 max_count = len(byte_code_buffer) for data in byte_code_buffer: @@ -86,7 +88,8 @@ def convert_bc(): if index % 16 == 0: output.write("\n ") else: - output.write(final_hex_string + '\n') + output_final_string = '%s\n' % final_hex_string + output.write(output_final_string) index = index + 1 output.write("};\n") output.write("#endif") @@ -129,25 +132,25 @@ def convert_js(): def usage(): print(" > use default input path: python framework2char.py") print(" > use specific input path: " - "python framework2char.py -b xxx/framework.min.bc -j xxx/framework.min.js") + "python framework2char.py -b framework.min.bc -j framework.min.js") print(" > -b : the input snapshot file") print(" > -j : the input javascript file") if __name__ == '__main__': - opts, args = getopt.getopt( + options, arguments = getopt.getopt( sys.argv[1:], '-h-b-j:', ['help', 'bc=', 'js=']) - for o, a in opts: - if o in ("-h", "--help"): + for option, value in options: + if option in ("-h", "--help"): usage() sys.exit() - if o in ("-b", "--bc"): - FRAMEWORK_SNAPSHOT_FILE_PATH = a - if o in ("-j", "--js"): - FRAMEWORK_JS_FILE_PATH = a + if option in ("-b", "--bc"): + FRAMEWORK_SNAPSHOT_FILE_PATH = value + if option in ("-j", "--js"): + FRAMEWORK_JS_FILE_PATH = value if (os.path.exists(os.path.abspath(FRAMEWORK_SNAPSHOT_FILE_PATH)) and os.path.exists(os.path.abspath(FRAMEWORK_JS_FILE_PATH))): convert_js() convert_bc() else: - print("[Error]: framwork.min.bc and framework.min.js must be prepared") + print("[Error]: framework.min.bc/.js must be prepared") diff --git a/tools/snapshot/jerry_bin/ReadMe.md b/frameworks/tools/snapshot/jerry_bin/ReadMe.md similarity index 100% rename from tools/snapshot/jerry_bin/ReadMe.md rename to frameworks/tools/snapshot/jerry_bin/ReadMe.md diff --git a/tools/snapshot/jerry_bin/build_jerry.bat b/frameworks/tools/snapshot/jerry_bin/build_jerry.bat similarity index 100% rename from tools/snapshot/jerry_bin/build_jerry.bat rename to frameworks/tools/snapshot/jerry_bin/build_jerry.bat diff --git a/tools/snapshot/jerry_bin/build_jerry.sh b/frameworks/tools/snapshot/jerry_bin/build_jerry.sh similarity index 94% rename from tools/snapshot/jerry_bin/build_jerry.sh rename to frameworks/tools/snapshot/jerry_bin/build_jerry.sh index 407c803..b30ba1b 100755 --- a/tools/snapshot/jerry_bin/build_jerry.sh +++ b/frameworks/tools/snapshot/jerry_bin/build_jerry.sh @@ -1,5 +1,5 @@ -#!/bin/sh -#Copyright (c) 2020 Huawei Device Co., Ltd. +#!/bin/bash +#Copyright (c) 2020-2021 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 @@ -11,6 +11,7 @@ #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. +set -e # step 1: clone jerryscript repo git clone git@gitee.com:openharmony/third_party_jerryscript.git jerryscript diff --git a/interfaces/innerkits/builtin/async/js_async_work.h b/interfaces/innerkits/builtin/async/js_async_work.h new file mode 100644 index 0000000..71b4465 --- /dev/null +++ b/interfaces/innerkits/builtin/async/js_async_work.h @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2020 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. + */ + +#ifndef OHOS_ACELITE_JS_ASYNC_WORK_H +#define OHOS_ACELITE_JS_ASYNC_WORK_H + +#include "message_queue_utils.h" +#include "memory_heap.h" + +namespace OHOS { +namespace ACELite { +/** + * Function pointer type used for async work. + * Note: this type is deprecated, use AsyncHandler alternatively + */ +typedef void (*AsyncWorkHandler)(void* data); + +/** + * Function pointer type used for async work. + */ +typedef void (*AsyncHandler)(void* data, int8_t statusCode); + +struct AsyncWork : public MemoryHeap { + AsyncWorkHandler workHandler; + AsyncHandler handler; + void* data; + AsyncWork() : workHandler(nullptr), handler(nullptr), data(nullptr) {} + AsyncWork(const AsyncWork &) = delete; + AsyncWork &operator=(const AsyncWork &) = delete; + AsyncWork(AsyncWork &&) = delete; + AsyncWork &operator=(AsyncWork &&) = delete; +}; + +/** + * @class JsASyncWork + * + * @brief JsAsyncWork is used to send asynchronous tasks to the system for execution + * + * @see MemoryHeap + */ +class JsAsyncWork final : public MemoryHeap { +public: + JsAsyncWork(const JsAsyncWork &) = delete; + JsAsyncWork &operator=(const JsAsyncWork &) = delete; + JsAsyncWork(JsAsyncWork &&) = delete; + JsAsyncWork &operator=(JsAsyncWork &&) = delete; + ~JsAsyncWork() {} + + /** + * @brief Set the queue handler of the app main queue + * + * @param [in] handler: QueueHandler object to set + */ + static void SetAppQueueHandler(const QueueHandler handler); + + /** + * @brief Create an async work from given parameters, and dispatch it to main app task handler + * + * @param [in] workHandler: the entry handler of the async work + * @param [in] data: pointer to the data the async work needed + * @return true: operation succeed + * false: operation failed + * Note: this function is deprecated, use the other one alternatively + */ + static bool DispatchAsyncWork(AsyncWorkHandler workHandler, void *data); + + /** + * @brief Create an async work from given parameters, and dispatch it to main app task handler + * + * @param[in] handler: the entry handler of the async work + * @param[in] data: pointer to the data the async work needed + * @return true: operation succeed + * false: operation failed + */ + static bool DispatchAsyncWork(AsyncHandler handler, void *data); + + /** + * @brief Common new message dispatching method. + * + * @param [in] msgId: the new message ID + * @param [in] data: pointer to the data + * @return true: operation succeed + * false: operation failed + */ + static bool DispatchToLoop(AbilityMsgId msgId, void *data); + + /** + * @brief Execute the given async work + * + * @param [in] asyncWork: reference to the async work to be executed + */ + static void ExecuteAsyncWork(AsyncWork *&asyncWork, int8_t statusCode = ERR_OK); + + // Error code used for async work processing + static const int8_t ERR_OK = 0; + static const int8_t ERR_FAIL = -1; + +private: + static bool DispatchAsyncWorkInner(AsyncWorkHandler workHandler, AsyncHandler handler, void *data); + static QueueHandler appQueuehandler_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_JS_ASYNC_WORK_H diff --git a/interfaces/innerkits/builtin/async/message_queue_utils.h b/interfaces/innerkits/builtin/async/message_queue_utils.h new file mode 100644 index 0000000..f7fdd3c --- /dev/null +++ b/interfaces/innerkits/builtin/async/message_queue_utils.h @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2020 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. + */ +#ifndef OHOS_ACELITE_MESSAGE_QUEUE_UTILS_H +#define OHOS_ACELITE_MESSAGE_QUEUE_UTILS_H + +#include + +#include "memory_heap.h" + +namespace OHOS { +namespace ACELite { +/** + * Message queue handler which identify one queue entity + */ +typedef void* QueueHandler; + +/** + * Successful message queue operation + */ +#ifndef MSGQ_OK +#define MSGQ_OK 0 +#endif + +/** + * Failed message queue operation + */ +#ifndef MSGQ_FAIL +#define MSGQ_FAIL -1 +#endif + +/** + * Wait forever timeout value + */ +#ifndef WAIT_FOREVER +#ifdef osWaitForever +#define WAIT_FOREVER osWaitForever +#else +#define WAIT_FOREVER 0xFFFFFFFFU +#endif // osWaitForever +#endif // WAIT_FOREVER + +/** + * No wait timeout value + */ +#ifndef NO_WAIT +#ifdef osNoWait +#define NO_WAIT osNoWait +#else +#define NO_WAIT 0x0U +#endif // osNoWait +#endif // NO_WAIT + +/** + * @enum AbilityMsgId + * + * @brief Values that represent ability message states + */ +enum AbilityMsgId { + UNKNOWN, + START_ABILITY, + ACTIVE, + NEW_DATA, + BACKGROUND, + DESTORY, + BACKPRESSED, + ASYNCWORK, + TE_EVENT, + MSG_ID_MAX, +}; + +struct AbilityInnerMsg { + AbilityMsgId msgId; + uint16_t token; + const char *bundleName; + const char *path; + void *data; + uint16_t dataLength; + AbilityInnerMsg() : msgId(UNKNOWN), token(0), bundleName(nullptr), path(nullptr), data(nullptr), dataLength(0) {} +}; + +/** + * @class MessageQueueUtils + * + * @brief A queue utility to handle messages + * + * @see MemoryHeap + */ +class MessageQueueUtils : public MemoryHeap { +public: + MessageQueueUtils(const MessageQueueUtils &) = delete; + MessageQueueUtils &operator=(const MessageQueueUtils &) = delete; + MessageQueueUtils(MessageQueueUtils &&) = delete; + MessageQueueUtils &operator=(MessageQueueUtils &&) = delete; + ~MessageQueueUtils() {} + + /** + * @brief Create a Message Queue entity + * + * @param [in] capacity: maximum number of messages in queue + * @param [in] msgSize: message size in bytes + * @return handler of the queue created + */ + static QueueHandler CreateMessageQueue(uint32_t capacity, uint32_t msgSize); + + /** + * @brief Delete a Message Queue entity + * + * @param [in] handler: the handler of the target queue + * @return MSGQ_OK: success + * MSGQ_FAIL: fail + */ + static int8_t DeleteMessageQueue(QueueHandler handler); + + /** + * @brief Put a message into the given queue or timeout if the queue is full + * + * @param [in] handler: the handler of the target queue + * @param [in] msgPtr: pointer to buffer for message to put into the queue + * @param [in] timeOut: the time to wait when the queue is full + * @return MSGQ_OK: success + * MSGQ_FAIL: fail + */ + static int8_t PutMessage(QueueHandler handler, const void *msgPtr, uint32_t timeOut); + + /** + * @brief Get a message from the given queue or timeout if the queue is empty + * + * @param [in] handler: the handler of the target queue + * @param [in] msgPtr: pointer to buffer for message to get from the queue + * @param [in] timeOut: the time to wait when the queue is empty + * @return MSGQ_OK: success + * MSGQ_FAIL: fail + */ + static int8_t GetMessage(QueueHandler handler, void *msgPtr, uint32_t timeOut); +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_MESSAGE_QUEUE_UTILS_H diff --git a/interfaces/innerkits/builtin/base/ace_mem_base.h b/interfaces/innerkits/builtin/base/ace_mem_base.h new file mode 100644 index 0000000..493120c --- /dev/null +++ b/interfaces/innerkits/builtin/base/ace_mem_base.h @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2020-2021 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. + */ + +#ifndef OHOS_ACELITE_ACE_MEM_BASE_H +#define OHOS_ACELITE_ACE_MEM_BASE_H + +#include +#include + +namespace OHOS { +namespace ACELite { +/** + * @brief The ACEMemHooks struct saving the memory allocating hooks used for ACE + */ +struct ACEMemHooks { + void *(*malloc_func)(size_t sz); + void (*free_func)(void *ptr); + void *(*calloc_func)(size_t num, size_t size); +}; + +/** + * @brief InitMemHooks Set the memory hooks used in whole JS framework, malloc and free + * must be given and must not be null. the initialization should be called at the very begin + * of system start-up, and only can be called once. + * + * @param [in] hooks: malloc, free and calloc function pointer + */ +void InitMemHooks(const ACEMemHooks &hooks); + +/** + * @brief InitCacheBuf config the cache buffer used for ACE, for example: PSRAM buffer + * @param bufAddress the start address of the buffer + * @param bufSize the whole length of the buffer, count in bytes + */ +void InitCacheBuf(uintptr_t bufAddress, size_t bufSize); + +/** + * @brief Allocate the required memory space and return a pointer to it + * + * @param [in] size: size of memory block,in bytes + * + * @return a pointer to the allocated memory block.if the request fails,return NULL + */ +void *ace_malloc(size_t size); + +/** + * @brief Allocate the required memory space and return a pointer to it + * + * @param [in] num: number of elements to be allocated + * @param [in] size: size of memory block,in bytes + * + * @return a pointer to the allocated memory block.if the request fails,return NULL + */ +void *ace_calloc(size_t num, size_t size); + +/** + * @brief Free the memory space allocated by malloc(),calloc() or realloc() + * + * @param [in] ptr: pointer points to a memory block to be freed + */ +void ace_free(void *ptr); +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_ACE_MEM_BASE_H diff --git a/interfaces/innerkits/builtin/base/memory_heap.h b/interfaces/innerkits/builtin/base/memory_heap.h new file mode 100644 index 0000000..019be9d --- /dev/null +++ b/interfaces/innerkits/builtin/base/memory_heap.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2020 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. + */ + +#ifndef OHOS_ACELITE_MEMORY_HEAP_H +#define OHOS_ACELITE_MEMORY_HEAP_H +#include +#include + +#include "ace_mem_base.h" + +namespace OHOS { +namespace ACELite { +class MemoryHeap { +public: + /** + * @brief Override new operator + * @param [in] size: malloc size. + */ + void *operator new(size_t size); + + /** + * @brief Override new[] operator + * @param [in] size: malloc size. + */ + void *operator new[](size_t size); + + /** + * @brief Override delete operator + * @param [in] p: pointer to be deleted. + */ + void operator delete(void *p); + + /** + * @brief Override delete[] operator + * @param [in] p: pointer to be deleted. + */ + void operator delete[](void *p); +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_MEMORY_HEAP_H diff --git a/interfaces/innerkits/builtin/jsi/jsi.h b/interfaces/innerkits/builtin/jsi/jsi.h new file mode 100755 index 0000000..676e460 --- /dev/null +++ b/interfaces/innerkits/builtin/jsi/jsi.h @@ -0,0 +1,709 @@ +/* + * Copyright (c) 2020 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. + */ + +#ifndef OHOS_ACELITE_JSI_H +#define OHOS_ACELITE_JSI_H + +#include + +#include "jsi_types.h" +#include "memory_heap.h" + +/** + * Enable JS TypedArray type support. + */ +#ifndef JS_FWK_TYPEDARRAY +#define JS_FWK_TYPEDARRAY 1 +#endif + +/** + * Disable JS Symbol value support. + */ +#ifndef JS_FWK_SYMBOL +#define JS_FWK_SYMBOL 0 +#endif + +namespace OHOS { +namespace ACELite { +/** + * @brief End flag used in ReleaseValueList(JSIValue value, ...). + */ +static const JSIValue ARGS_END = (JSIValue)(uintptr_t)-1; + +/** + * @brief Function pointer type used to create function callback. + * + * @param [in] thisVal: the this value provided for the function call + * @param [in] args: the function arguments, array of JavaScript values + * @param [in] argsNum: the number of arguments + */ +typedef JSIValue (*JSIFunctionHandler)(const JSIValue thisVal, const JSIValue *args, uint8_t argsNum); + +/** + * @brief Description of JerryScript heap memory status. + */ +struct JSHeapStatus : public MemoryHeap { + size_t totalBytes; // heap total size + size_t allocBytes; // currently allocated bytes + size_t peakAllocBytes; // peak allocated bytes + + JSHeapStatus(const JSHeapStatus &) = delete; + JSHeapStatus &operator=(const JSHeapStatus &) = delete; + JSHeapStatus(JSHeapStatus &&) = delete; + JSHeapStatus &operator=(JSHeapStatus &&) = delete; + JSHeapStatus() : totalBytes(0), allocBytes(0), peakAllocBytes(0) {} +}; + +/** + * @brief Struct definition for JS property descriptor + */ +struct JSPropertyDescriptor : public MemoryHeap { + JSIFunctionHandler setter; // access function for setting value + JSIFunctionHandler getter; // access function for getting value + + JSPropertyDescriptor() : setter(nullptr), getter(nullptr) {} +}; + +/** + * @brief JavaScriptInterface for adapatation to javascript engines. + */ +class JSI final : public MemoryHeap { +public: + /** + * @brief Get the global javascript object. + * + * @return the global object acquired + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue GetGlobalObject(); + + /** + * @brief Create a javascript object. + * + * @return the object created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateObject(); + + /** + * @brief Set property to given javascript object. + * + * @param [in] object: host object to set + * @param [in] key: key of the property to set + * @param [in] value: value of the property to set + */ + static void SetProperty(JSIValue object, JSIValue key, JSIValue value); + + /** + * @brief Set property to javascript object with given name. + * + * @param [in] object: host object to set + * @param [in] propName: name of the property to set + * @param [in] value: value of the property to set + */ + static void SetNamedProperty(JSIValue object, const char * const propName, JSIValue value); + + /** + * @brief Set number property to javascript object with given name. + * + * @param [in] object: host object to set + * @param [in] propName: name of the number property to set + * @param [in] value: number value of the property to set + */ + static void SetNumberProperty(JSIValue object, const char * const propName, double value); + + /** + * @brief Set boolean property to javascript object with given name. + * + * @param [in] object: host object to set + * @param [in] propName: name of the boolean property to set + * @param [in] value: boolean value of the property to set + */ + static void SetBooleanProperty(JSIValue object, const char * const propName, bool value); + + /** + * @brief Set string property to javascript object with given name. + * + * @param [in] object: host object to set + * @param [in] propName: name of the string property to set + * @param [in] value: string value of the property to set + */ + static void SetStringProperty(JSIValue object, const char * const propName, const char *value); + + /** + * @brief Create javascript function with given native function. + * + * @param [in] handler: native function pointer + * @return javascript function object + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateFunction(JSIFunctionHandler handler); + + /** + * @brief Create javascript string object with character string. + * + * @param [in] str: string source + * @return the string object created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateString(const char * const str); + + /** + * @brief Create an undefined object. + * + * @return the undefined object created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateUndefined(); + + /** + * @brief Check if the specified value is a function object value, the value must be created by jerry interface. + * + * @param [in] value: value to check + * @return true: if the given value is a function + * false: otherwise + */ + static bool ValueIsFunction(JSIValue value); + + /** + * @brief Check if the specified value is undefined. + * + * @param [in] value: value to check + * @return true: if the given value is undefined + * false: otherwise + */ + static bool ValueIsUndefined(JSIValue value); + + /** + * @brief Check if the specified value is a number. + * + * @param [in] value: value to check + * @return true: if the given value is a number + * false: otherwise + */ + static bool ValueIsNumber(JSIValue value); + + /** + * @brief Check if the specified value is a string value. + * + * @param [in] value: value to check + * @return true: if the given value is a string value + * false: otherwise + */ + static bool ValueIsString(JSIValue value); + + /** + * @brief Check if the specified value is a boolean value. + * + * @param [in] value: value to check + * @return true: if the given value is a boolean value + * false: otherwise + */ + static bool ValueIsBoolean(JSIValue value); + + /** + * @brief Check if the specified value is a null value. + * + * @param [in] value: value to check + * @return true: if the given value is a null value + * false: otherwise + */ + static bool ValueIsNull(JSIValue value); + + /** + * @brief Check if the specified value is an object value. + * + * @param [in] value: value to check + * @return true: if the given value is an object value + * false: otherwise + */ + static bool ValueIsObject(JSIValue value); + + /** + * @brief Check if the specified value is error value. + * + * @param [in] value: value to check + * @return true: if the given value is error value + * false: otherwise + */ + static bool ValueIsError(JSIValue value); + + /** + * @brief Get the same value as json.stringify(). + * + * @param [in] value: value which can be json stringfied + * @return the json string created + * value returned should be released with ReleaseString(char *&str) when it won't be used any more + */ + static char *JsonStringify(JSIValue value); + + /** + * @brief Get the same value as json.parse(). + * + * @param [in] str: character string which is in json pattern + * @return JSI value created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue JsonParse(const char * const str); + + /** + * @brief Get value of a property from the specified object with the given key. + * + * @param [in] object: object value + * @param [in] key: property name + * @return acquired value of the property + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue GetProperty(JSIValue object, JSIValue key); + + /** + * @brief Get value of a property from the specified object with the given character name. + * + * @param [in] object: object value + * @param [in] propName: property name in character string + * @return acquired value of the property + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue GetNamedProperty(JSIValue object, const char * const propName); + + /** + * @brief Get number value from the specified object with the given property name. + * + * @param [in] object: object value + * @param [in] propName: the number property name + * @return number value acquired + * 0.0 will be returned if the argument passed is not a number object + */ + static double GetNumberProperty(JSIValue object, const char * const propName); + + /** + * @brief Get boolean value from the specified object with the given property name. + * + * @param [in] object: object value + * @param [in] propName: the boolean property name + * @return true: if the property value is logical true + * false: otherwise + */ + static bool GetBooleanProperty(JSIValue object, const char * const propName); + + /** + * @brief Get string value from the specified object with the given property name. + * + * @param [in] object: object value + * @param [in] propName: the string property name + * @return the string value acquired + * value returned should be released with ReleaseString(char *&str) when it won't be used any more + */ + static char *GetStringProperty(JSIValue object, const char * const propName); + + /** + * @brief: Release specified API value. + * + * @param: value JSI value to release + */ + static void ReleaseValue(JSIValue value); + + static void ReleaseValueList() {} + + /** + * @brief: Release API value list. + * + * @param: JSI value list to release + */ + template static void ReleaseValueList(T head, Args... rest) + { + ReleaseValue(head); + ReleaseValueList(rest...); + } + + /** + * @brief: Release string value. + * + * @param: str: pointer to the buffer to be released + */ + static void ReleaseString(char *&str); + + /** + * @brief Call javascript function specified by a function value. + * + * @param [in] funcObj: the function object to call + * @param [in] thisVal: object for 'this' binding + * @param [in] argv: function's call arguments + * @param [in] argc: number of arguments + */ + static void CallFunction(JSIValue funcObj, JSIValue thisVal, const JSIValue *argv, uint8_t argc); + + /** + * @brief Create javascript number value. + * + * @param [in] value: source number + * @return the number value created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateNumber(double value); + + /** + * @brief Create a JSIValue representing a not-a-number value. + * + * @return a JSIValue representing the not-a-number value + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateNumberNaN(); + + /** + * @brief Create javascript error object. + * + * @param [in] type: error type + * @param [in] errorMsg: value of 'message' property of constructed error object + * @return value of the constructed error object + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateError(JsiErrorType type, const char * const errorMsg); + + /** + * @brief Get the type of the error object. + * + * @param [in] errorValue: error value to get + * @return the type of the error object + */ + static JsiErrorType GetErrorType(JSIValue errorValue); + + /** + * @brief Create javascript boolean value. + * + * @param [in] value: bool value + * @return the boolean value created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateBoolean(bool value); + + /** + * @brief Create javascript null object. + * + * @return the null object created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateNull(); + +#ifdef JS_FWK_SYMBOL + /** + * @brief Create a javascript symbol. + * + * @param [in] description: source value + * @return the symbol object created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateSymbol(JSIValue description); + + /** + * @brief Check if the specified value is a symbol value. + * + * @param [in] value: value to check + * @return true: if the given value is a symbol value + * false: otherwise + */ + static bool ValueIsSymbol(JSIValue value); +#endif // JS_FWK_SYMBOL + + /** + * @brief Create a javascript array. + * + * @param [in] length: array length + * @return the array object created + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateArray(uint32_t length); + + /** + * @brief Set indexed value in the specified javascript object. + * + * @param [in] object: object to set + * @param [in] index: index number + * @param [in] value: value to set + * @return true: if the operation succeed + * false: otherwise + */ + static bool SetPropertyByIndex(JSIValue object, uint32_t index, JSIValue value); + + /** + * @brief Get the string value of the given JSIValue object. + * + * @param [in] value: source value + * @return the string value created + * value returned should be released with ReleaseString(char *&str) when it won't be used any more + */ + static char *ValueToString(JSIValue value); + + /** + * @brief Get the number value of the given JSIValue object. + * + * @param [in] value: source value + * @return double value acquired + * 0.0 will be returned if the argument passed is not a number object + */ + static double ValueToNumber(JSIValue value); + + /** + * @brief Get the boolean value of the given JSIValue object. + * + * @param [in] value: source value + * @return true: if the given value is logical true + * false: otherwise + */ + static bool ValueToBoolean(JSIValue value); + + /** + * @brief Check if the specified value is an array object. + * + * @param [in] value: array value + * @return array length acquired + * 0 will be returned if the argument passed is not an array object + */ + static uint32_t GetArrayLength(JSIValue value); + + /** + * @brief Get indexed value from the javascript array object. + * + * @param [in] object: source array object + * @param [in] index: index number + * @return value acquired from the specified index of the array + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue GetPropertyByIndex(JSIValue object, uint32_t index); + + /** + * @brief Get keys of the specified object value. + * + * @param [in] object: object value + * @return array object of the given object keys + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue GetObjectKeys(JSIValue object); + + /** + * @brief Get heap memory status. + * + * @param [out] heapStatus: struct for heap memory status acquired + * @return true: if the operation succeed + * false: otherwise + */ + static bool GetJSHeapStatus(JSHeapStatus &heapStatus); + + /** + * @brief Check if the specified value is an array object. + * + * @param [in] value: value to check + * @return true: if the given value is an array object + * false: otherwise + */ + static bool ValueIsArray(JSIValue value); + + /** + * @brief Acquire the specified JSI value to create a reference + * + * @param [in] value: JSI value to acquire + * @return acquired value that may be used outside of the engine + * value returned should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue AcquireValue(JSIValue value); + + /** + * @brief Set API for given exports object + * + * @param [in] exports: object to set + * @param [in] name: API name + * @param [in] handler: pointer to the native implementation of this JS API + */ + static void SetModuleAPI(JSIValue exports, const char * const name, JSIFunctionHandler handler); + + /** + * @brief Set JS page destroy callback on given module object + * + * @param [in] object: JS module object + * @param [in] callback: native destroy callback + * Note: this function is deprecated, use the other one alternatively + */ + static void SetOnDestroy(JSIValue object, NativeCallback callback); + + /** + * @brief set JS page destroy callback on given module object + * + * @param [in] object: JS module object + * @param [in] callback: native destroy callback + */ + static void SetOnDestroy(JSIValue object, JsiCallback callback); + + /** + * @brief set JS ability terminate callback on given module object + * + * @param [in] object: JS module object + * @param [in] callback: native terminate callback + * Note: this function is deprecated, use the other one alternatively + */ + static void SetOnTerminate(JSIValue object, NativeCallback callback); + + /** + * @brief set JS ability terminate callback on given module object + * + * @param [in] object: JS module object + * @param [in] callback: native terminate callback + */ + static void SetOnTerminate(JSIValue object, JsiCallback callback); + +#ifdef JS_FWK_TYPEDARRAY + /** + * @brief Get the properties of the given javascript TypedArray object. + * + * @param [in] typedArray: TypedArray object + * @param [out] type: type of the TypedArray, one of the TypedArrayType enum value + * @param [out] length: the element number of the TypedArray + * 0 if the typedArray parameter is not a TypedArray object + * @param [out] arrayBuffer: the ArrayBuffer object used by the TypedArray object + * value should be released by caller with ReleaseValue when it won't be used any more + * @param [out] byteOffset: the start offset of the ArrayBuffer for the TypedArray + * @return pointer to the Array Buffer's data area + * must ensure that the output pointer is used correctly, that is there is no out of bounds reads or writes + * the lifetime of the underlying data buffer is managed by the ArrayBuffer value, thus, do not release the + * pointer returned + */ + static uint8_t *GetTypedArrayInfo(JSIValue typedArray, + TypedArrayType &type, + size_t &length, + JSIValue &arrayBuffer, + size_t &byteOffset); + + /** + * @brief Create a TypedArray object using an already existing ArrayBuffer object. + * + * @param [in] type: type of the TypedArray, one of the TypedArrayType enum value + * @param [in] length: the element number of the TypedArray + * @param [in] arrayBuffer: the ArrayBuffer object to use for the new TypedArray + * @param [in] byteOffset: the start offset of the ArrayBuffer for the TypedArray + * @return the TypedArray object created + * value returned should be released by caller with ReleaseValue when it won't be used any more. + */ + static JSIValue CreateTypedArray(TypedArrayType type, size_t length, JSIValue arrayBuffer, size_t byteOffset); + + /** + * @brief Get the properties of the given ArrayBuffer object. + * + * @param [in] arrayBuffer: ArrayBuffer object + * @param [out] byteLength size of the ArrayBuffer in bytes + * 0 if the arrayBuffer parameter is not an ArrayBuffer object + * @return pointer to the Array Buffer's data area + * must ensure that the output pointer is used correctly, that is there is no out of bounds reads or writes + * the lifetime of the underlying data buffer is managed by the ArrayBuffer value, thus, do not release the + * pointer returned + */ + static uint8_t *GetArrayBufferInfo(JSIValue arrayBuffer, size_t &byteLength); + + /** + * @brief Create an ArrayBuffer object. + * + * @param [in] byteLength: size of the ArrayBuffer to create in bytes + * @param [out] buffPtr: pointer to the Array Buffer's data area + * must ensure that the output pointer is used correctly, that is there is no out of bounds reads or writes + * the lifetime of the underlying data buffer is managed by the ArrayBuffer value, thus, do not release the pointer + * @return the ArrayBuffer object created + * result should be released by caller with ReleaseValue when it won't be used any more + */ + static JSIValue CreateArrayBuffer(size_t byteLength, uint8_t *&buffPtr); + + /** + * @brief Check if the specified value is an ArrayBuffer object. + * + * @param [in] value: value to check + * @return true: if the given value is an ArrayBuffer object + * false: otherwise + */ + static bool ValueIsArrayBuffer(JSIValue value); + + /** + * @brief Check if the specified value is a TypedArray object. + * + * @param [in] value: value to check + * @return true: if the given value is an TypedArray object + * false: otherwise + */ + static bool ValueIsTypedArray(JSIValue value); +#endif // JS_FWK_TYPEDARRAY + + /** + * @brief Define a property on the specified object with the given name. + * + * @param [in] object: object to define property on + * @param [in] propName: property name + * @param [in] descriptor: property descriptor + * @return true: if success + * false: otherwise + */ + static bool DefineProperty(JSIValue object, JSIValue propName, JSPropertyDescriptor descriptor); + + /** + * @brief Define a property on the specified object with the given character name. + * + * @param [in] object: object to define property on + * @param [in] propNameStr: property name in character string + * @param [in] descriptor: property descriptor + * @return true: if success + * false: otherwise + */ + static bool DefineNamedProperty(JSIValue object, const char * const propNameStr, JSPropertyDescriptor descriptor); + + /** + * @brief Define a property on the specified object with the given setter and getter. + * + * @param [in] object: object to define property on + * @param [in] propNameStr: property name in character string + * @param [in] setter: access function for setting value + * @param [in] getter: access function for getting value + * @return true: if success + * false: otherwise + */ + static bool DefineNamedProperty(JSIValue object, + const char * const propNameStr, + JSIFunctionHandler setter, + JSIFunctionHandler getter); + + /** + * @brief Call fail and complete callbacks acquired from args. + * + * @param [in] thisVal: object for 'this' binding + * @param [in] args: object to acquire function callbacks from + * @param [in] errCode: error code for fail callback + * @param [in] errDesc: error description for fail callback + */ + static void FailCallback(const JSIValue thisVal, const JSIValue args, int32_t errCode, const char * const errDesc); + + /** + * @brief Call success and complete callbacks acquired from args. + * + * @param [in] thisVal: object for 'this' binding + * @param [in] args: object to acquire function callbacks from + * @param [in] argv: arguments for success callback + * @param [in] argc: number of arguments for success callback + */ + static void SuccessCallback(const JSIValue thisVal, const JSIValue args, const JSIValue *argv, uint8_t argc); + +private: + // private constructor for singleton instance + JSI() {} + ~JSI() {} + static void SetNamedPointer(JSIValue object, const char * const name, JsiCallback callback); +}; +} // namespace ACELite +} // namespace OHOS + +#endif // OHOS_ACELITE_JSI_H diff --git a/interfaces/innerkits/builtin/jsi/jsi_types.h b/interfaces/innerkits/builtin/jsi/jsi_types.h new file mode 100644 index 0000000..188c63b --- /dev/null +++ b/interfaces/innerkits/builtin/jsi/jsi_types.h @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2020 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. + */ + +#ifndef OHOS_ACELITE_JSI_TYPES_H +#define OHOS_ACELITE_JSI_TYPES_H + +#include + +namespace OHOS { +namespace ACELite { +// opaque pointer for JSI abstract value +using JSIValue = struct JSIVal *; + +// type used for initialization functions of built-in modules +using InitFunc = void(*)(JSIValue exports); + +/** + * type used for native callback of built-in modules + * Note: this type is deprecated, use JsiCallback alternatively + */ +using NativeCallback = void(*)(); + +// type used for native callback of built-in modules +using JsiCallback = void(*)(int8_t statusCode); + +// struct information for built-in modules +struct Module { + const char* name; + InitFunc initFunc; +}; + +// struct information for private modules +struct PrivateModule { + const char* bundleName; + Module module; + PrivateModule(const PrivateModule &) = delete; + PrivateModule &operator=(const PrivateModule &) = delete; + PrivateModule(PrivateModule &&) = delete; + PrivateModule &operator=(PrivateModule &&) = delete; +}; + +// constants for JSI API development +constexpr char CB_CALLBACK[] = "callback"; +constexpr char CB_SUCCESS[] = "success"; +constexpr char CB_FAIL[] = "fail"; +constexpr char CB_COMPLETE[] = "complete"; +constexpr uint8_t ARGC_ONE = 1; +constexpr uint8_t ARGC_TWO = 2; +constexpr uint8_t ARGC_THREE = 3; + +// Error code used for callback processing +constexpr int8_t JSI_ERR_OK = 0; +constexpr int8_t JSI_ERR_FAIL = -1; + +/** + * @enum TypedArrayType + * + * @brief Values that represent different types of TypedArray object + */ +enum class TypedArrayType { + JSI_INVALID_ARRAY, + JSI_INT8_ARRAY, + JSI_UINT8_ARRAY, + JSI_UINT8CLAMPED_ARRAY, + JSI_INT16_ARRAY, + JSI_UINT16_ARRAY, + JSI_INT32_ARRAY, + JSI_UINT32_ARRAY, + JSI_FLOAT32_ARRAY, + JSI_FLOAT64_ARRAY, + JSI_TYPE_MAX_ARRAY +}; + +/** + * @enum JsiErrorType + * + * @brief Values that represent different types of error object + */ +enum class JsiErrorType { + JSI_ERROR_INVALID, + JSI_ERROR_COMMON, + JSI_ERROR_EVAL, + JSI_ERROR_RANGE, + JSI_ERROR_REFERENCE, + JSI_ERROR_SYNTAX, + JSI_ERROR_TYPE, + JSI_ERROR_URI, + JSI_ERROR_MAX +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_JSI_TYPES_H diff --git a/readme.md b/readme.md deleted file mode 100755 index f7333eb..0000000 --- a/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -详见：https://gitee.com/openharmony/docs/blob/master/readme/JS应用开发框架README.md - -see: https://gitee.com/openharmony/docs/blob/master/docs-en/readme/js-application-framework.md \ No newline at end of file diff --git a/src/core/base/ace_mem_base.cpp b/src/core/base/ace_mem_base.cpp deleted file mode 100755 index 5bc70f9..0000000 --- a/src/core/base/ace_mem_base.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ -#include "ace_mem_base.h" - -#include -#include "acelite_config.h" - -#if defined(FEATURE_ACELITE_MC_MEMORY_POOL) && defined(FEATURE_ACELITE_MEMORY_POOL) -#error Only one marco can be defined -#elif defined(FEATURE_ACELITE_MC_MEMORY_POOL) && (defined(TARGET_SIMULATOR)) -#error Only one marco can be defined -#elif defined(FEATURE_ACELITE_PRODUCT_MEMORY_POOL) && (defined(TARGET_SIMULATOR)) -#error Only one macro can be defined -#elif defined(FEATURE_ACELITE_MEMORY_POOL) && (defined(TARGET_SIMULATOR)) -#error Only one macro can be defined -#endif - -#if defined(FEATURE_ACELITE_MC_MEMORY_POOL) -#include "mc_memory.h" -#elif defined(FEATURE_ACELITE_PRODUCT_MEMORY_POOL) -#include "mem_pool.h" -#elif defined(FEATURE_ACELITE_MEMORY_POOL) -#include "hos_errno.h" -#include "hos_memory.h" -#else -#include -#endif - -namespace OHOS { -namespace ACELite { -void* ace_malloc(size_t size) -{ -#if defined(FEATURE_ACELITE_MC_MEMORY_POOL) - return MC_UI_MEM_ALLOC(size); -#elif defined(FEATURE_ACELITE_PRODUCT_MEMORY_POOL) - return MemPool::GetInstance()->Malloc(size); -#elif defined(FEATURE_ACELITE_MEMORY_POOL) - return HOS_MemAlloc(0, size); -#else - return malloc(size); -#endif -} - -void* ace_calloc(size_t num, size_t size) -{ -#if (defined(FEATURE_ACELITE_MC_MEMORY_POOL) || defined(FEATURE_ACELITE_PRODUCT_MEMORY_POOL) || \ - defined(FEATURE_ACELITE_MEMORY_POOL)) - // the calloc is not provided for some platform - return nullptr; -#else - return calloc(num, size); -#endif -} - -void ace_free(void* ptr) -{ -#if defined(FEATURE_ACELITE_MC_MEMORY_POOL) - MC_UI_MEM_FREE(ptr); -#elif defined(FEATURE_ACELITE_PRODUCT_MEMORY_POOL) - MemPool::GetInstance()->Free(ptr); -#elif defined(FEATURE_ACELITE_MEMORY_POOL) - HOS_MemFree(0, ptr); -#else - free(ptr); -#endif -} -} // namespace ACELite -} // namespace OHOS diff --git a/src/core/components/BUILD.gn b/src/core/components/BUILD.gn deleted file mode 100755 index 02e39c3..0000000 --- a/src/core/components/BUILD.gn +++ /dev/null @@ -1,45 +0,0 @@ -#Copyright (c) 2020 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. - -source_set("components") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "analog_clock_component.cpp", - "canvas_component.cpp", - "chart_component.cpp", - "clock_hand_component.cpp", - "component.cpp", - "component_utils.cpp", - "div_component.cpp", - "image_animator_component.cpp", - "image_component.cpp", - "input_component.cpp", - "list_adapter.cpp", - "list_component.cpp", - "marquee_component.cpp", - "picker_view_component.cpp", - "progress_component.cpp", - "slider_component.cpp", - "swiper_component.cpp", - "switch_component.cpp", - "tab_bar_component.cpp", - "tab_content_component.cpp", - "tabs_component.cpp", - "text_component.cpp", - "scroll_layer.cpp", - ] - include_dirs = [ - ] -} diff --git a/src/core/components/canvas_component.cpp b/src/core/components/canvas_component.cpp deleted file mode 100755 index 3060e2c..0000000 --- a/src/core/components/canvas_component.cpp +++ /dev/null @@ -1,672 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ - -#include "acelite_config.h" - -#ifdef FEATURE_COMPONENT_CANVAS -#include "canvas_component.h" -#include "js_fwk_common.h" - -namespace OHOS { -namespace ACELite { -// default fill style color=black -const char * const CanvasComponent::DEFAULT_FILLSTYLE = "#000000"; -// default stroke style color=black -const char * const CanvasComponent::DEFAULT_STROKESTYLE = "#000000"; -// default font size and font family -const char * const CanvasComponent::DEFAULT_FONT = "30px " DEFAULT_VECTOR_FONT_FILENAME; -// default text align=left -const char * const CanvasComponent::DEFAULT_TEXTALIGN = "left"; - -const uint8_t CanvasComponent::ARGS_COUNT_ONE = 1; -const uint8_t CanvasComponent::ARGS_COUNT_THREE = 3; -const uint8_t CanvasComponent::ARGS_COUNT_FOUR = 4; -const uint8_t CanvasComponent::ARGS_INDEX_0 = 0; -const uint8_t CanvasComponent::ARGS_INDEX_1 = 1; -const uint8_t CanvasComponent::ARGS_INDEX_2 = 2; -const uint8_t CanvasComponent::ARGS_INDEX_3 = 3; - -// API-attribute -const char * const CanvasComponent::ATTR_FILLSTYLE = "fillStyle"; -const char * const CanvasComponent::ATTR_STROKESTYLE = "strokeStyle"; -const char * const CanvasComponent::ATTR_LINEWIDTH = "lineWidth"; -const char * const CanvasComponent::ATTR_FONT = "font"; -const char * const CanvasComponent::ATTR_TEXTALIGN = "textAlign"; - -// API-method -const char * const CanvasComponent::FUNC_GETCONTEXT = "getContext"; -const char * const CanvasComponent::FUNC_FILLRECT = "fillRect"; -const char * const CanvasComponent::FUNC_STROKERECT = "strokeRect"; -const char * const CanvasComponent::FUNC_FILLTEXT = "fillText"; - -// create canvas draw attribute-callback mapping -const AttrMap CanvasComponent::attrMap_[] = { - {ATTR_FILLSTYLE, FillStyleSetter, FillStyleGetter}, - {ATTR_STROKESTYLE, StrokeStyleSetter, StrokeStyleGetter}, - {ATTR_LINEWIDTH, LineWidthSetter, LineWidthGetter}, - {ATTR_FONT, FontSetter, FontGetter}, - {ATTR_TEXTALIGN, TextAlignSetter, TextAlignGetter} -}; - -// create canvas draw method-callback mapping -const MethodMap CanvasComponent::methodMap_[] = { - {FUNC_GETCONTEXT, CanvasGetContext}, - {FUNC_FILLRECT, CanvasFillRect}, - {FUNC_STROKERECT, CanvasStrokeRect}, - {FUNC_FILLTEXT, CanvasFillText} -}; - -CanvasComponent::CanvasComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) - : Component(options, children, styleManager), - canvas_(nullptr), - canvas2dContext_(UNDEFINED), - fillStyleValue_(nullptr), - strokeStyleValue_(nullptr), - fontValue_(nullptr), - textAlignValue_(nullptr), - lineWidthValue_(1) -{ - SetComponentName(K_CANVAS); - // set default paint pattern - paint_.SetFillColor(Color::Black()); - paint_.SetOpacity(OPA_OPAQUE); - paint_.SetStrokeColor(Color::Black()); - paint_.SetStrokeWidth(1); - - // set default text font pattern - fontStyle_.align = TEXT_ALIGNMENT_LEFT; - fontStyle_.direct = TEXT_DIRECT_LTR; - fontStyle_.fontSize = DEFAULT_FONT_SIZE; - char *defaultFontName = nullptr; - CopyFontFamily(defaultFontName, DEFAULT_FONT_FAMILY); - fontStyle_.fontName = defaultFontName; - fontStyle_.letterSpace = DEFAULT_FONT_LETTERSPACE; - - RegisterNamedFunction(methodMap_[0].methodName, methodMap_[0].callbackName); -} -// Create FlexLayout -bool CanvasComponent::CreateNativeViews() -{ - canvas_ = new UICanvas(); - if (canvas_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create native canvas view failed"); - return false; - } - return true; -} - -void CanvasComponent::ReleaseNativeViews() -{ - ACE_DELETE(canvas_); - ACE_FREE(fillStyleValue_); - ACE_FREE(strokeStyleValue_); - ACE_FREE(fontValue_); - ACE_FREE(textAlignValue_); - // free fontStyle_.fontName memory which malloc in FontSetter method. - if (fontStyle_.fontName != nullptr) { - ace_free(const_cast(fontStyle_.fontName)); - fontStyle_.fontName = nullptr; - } - if (!IS_UNDEFINED(canvas2dContext_)) { - bool deleted = jerry_delete_object_native_pointer(canvas2dContext_, nullptr); - if (!deleted) { - HILOG_WARN(HILOG_MODULE_ACE, "canvas_component: delete object native pointer canvas2dContext_ failed!"); - } - jerry_release_value(canvas2dContext_); - } -} - -UIView *CanvasComponent::GetComponentRootView() const -{ - return canvas_; -} - -jerry_value_t CanvasComponent::CanvasGetContext(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - (void)args; - if (argsNum != ARGS_COUNT_ONE) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of getContext method parameter error!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - if (IS_UNDEFINED(component->canvas2dContext_)) { - component->canvas2dContext_ = jerry_create_object(); - jerry_set_object_native_pointer(component->canvas2dContext_, component, nullptr); - - // register fillStyle, strokeStyle, lineWidth, font, textAlign attribute - uint16_t attrMapLength = sizeof(attrMap_) / sizeof(attrMap_[0]); - for (uint16_t index = 0; index < attrMapLength; index++) { - RegisterAttributeFunc(component->canvas2dContext_, attrMap_[index].attrName, attrMap_[index].setterName, - attrMap_[index].getterName); - } - - // register fillRect, strokeRect, fillText method - uint16_t methodMapLength = sizeof(methodMap_) / sizeof(methodMap_[0]); - for (uint16_t index = 1; index < methodMapLength; index++) { - RegisterDrawMethodFunc(component->canvas2dContext_, methodMap_[index].methodName, - methodMap_[index].callbackName); - } - } - - jerry_acquire_value(component->canvas2dContext_); - return component->canvas2dContext_; -} - -jerry_value_t CanvasComponent::FillStyleSetter(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_ONE) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the value of fillStyle is null!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - ACE_FREE(component->fillStyleValue_); - - component->fillStyleValue_ = MallocStringOf(args[ARGS_INDEX_0]); - if (component->fillStyleValue_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get fillStyle value failed"); - return UNDEFINED; - } - - uint32_t color = 0; - uint8_t alpha = OPA_OPAQUE; - ParseColor(component->fillStyleValue_, color, alpha); - component->paint_.SetFillColor(component->GetRGBColor(color)); - component->paint_.SetOpacity(alpha); - return UNDEFINED; -} - -jerry_value_t CanvasComponent::FillStyleGetter(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - (void)args; - (void)argsNum; - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - if (component->fillStyleValue_ == nullptr) { - CopyFontFamily(component->fillStyleValue_, DEFAULT_FILLSTYLE); - } - - if (component->fillStyleValue_ != nullptr) { - return jerry_create_string(reinterpret_cast(component->fillStyleValue_)); - } else { - return UNDEFINED; - } -} - -jerry_value_t CanvasComponent::StrokeStyleSetter(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_ONE) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the value of strokeStyle is null!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - ACE_FREE(component->strokeStyleValue_); - - component->strokeStyleValue_ = MallocStringOf(args[ARGS_INDEX_0]); - if (component->strokeStyleValue_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get strokeStyle value failed"); - return UNDEFINED; - } - - uint32_t color = 0; - uint8_t alpha = OPA_OPAQUE; - ParseColor(component->strokeStyleValue_, color, alpha); - component->paint_.SetStrokeColor(component->GetRGBColor(color)); - component->paint_.SetOpacity(alpha); - return UNDEFINED; -} - -jerry_value_t CanvasComponent::StrokeStyleGetter(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - (void)args; - (void)argsNum; - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - if (component->strokeStyleValue_ == nullptr) { - CopyFontFamily(component->strokeStyleValue_, DEFAULT_STROKESTYLE); - } - - if (component->strokeStyleValue_ != nullptr) { - return jerry_create_string(reinterpret_cast(component->strokeStyleValue_)); - } else { - return UNDEFINED; - } -} - -jerry_value_t CanvasComponent::LineWidthSetter(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_ONE) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the value of lineWidth is null!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - component->lineWidthValue_ = IntegerOf(args[ARGS_INDEX_0]); - component->paint_.SetStrokeWidth(component->lineWidthValue_); - return UNDEFINED; -} - -jerry_value_t CanvasComponent::LineWidthGetter(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - (void)args; - (void)argsNum; - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - return jerry_create_number(component->lineWidthValue_); -} - -jerry_value_t CanvasComponent::FontSetter(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_ONE) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the value of font is null!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - ACE_FREE(component->fontValue_); - - component->fontValue_ = MallocStringOf(args[ARGS_INDEX_0]); - if (component->fontValue_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get text font value failed"); - return UNDEFINED; - } - - const int8_t maxParamCount = 2; - for (int8_t index = 0; index < maxParamCount; index++) { - // get font size or font family from fontValue. - char *mallocSubFont = nullptr; - component->GetSubFont(component->fontValue_, index, mallocSubFont); - if (mallocSubFont == nullptr) { - HILOG_WARN(HILOG_MODULE_ACE, "canvas_component: get text font size or font family failed"); - ace_free(component->fontValue_); - component->fontValue_ = nullptr; - return UNDEFINED; - } - - // if it is a font size - if (*mallocSubFont >= '0' && *mallocSubFont <= '9') { - component->fontStyle_.fontSize = strtol(mallocSubFont, nullptr, DEC); - ace_free(mallocSubFont); - mallocSubFont = nullptr; - } else { // if it is a font family - // free default component->fontStyle_.fontName memory. - if (component->fontStyle_.fontName != nullptr) { - ace_free(const_cast(component->fontStyle_.fontName)); - component->fontStyle_.fontName = nullptr; - } - // set customized font name, the memory of mallocFontFamily need be free in CanvasFillText method. - component->fontStyle_.fontName = mallocSubFont; - } - } - return UNDEFINED; -} - -jerry_value_t CanvasComponent::FontGetter(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - (void)args; - (void)argsNum; - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - if (component->fontValue_ == nullptr) { - CopyFontFamily(component->fontValue_, DEFAULT_FONT); - } - - if (component->fontValue_ != nullptr) { - return jerry_create_string(reinterpret_cast(component->fontValue_)); - } else { - return UNDEFINED; - } -} - -jerry_value_t CanvasComponent::TextAlignSetter(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_ONE) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the value of textAlign is null!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - ACE_FREE(component->textAlignValue_); - - uint16_t textAlignLength = 0; - component->textAlignValue_ = MallocStringOf(args[ARGS_INDEX_0], &textAlignLength); - if (component->textAlignValue_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get text align value failed"); - return UNDEFINED; - } - - uint16_t textAlignId = KeyParser::ParseKeyId(component->textAlignValue_, textAlignLength); - if (textAlignId == K_LEFT) { - component->fontStyle_.align = TEXT_ALIGNMENT_LEFT; - } else if (textAlignId == K_RIGHT) { - component->fontStyle_.align = TEXT_ALIGNMENT_RIGHT; - } else if (textAlignId == K_CENTER) { - component->fontStyle_.align = TEXT_ALIGNMENT_CENTER; - } else { - // do nothing(use defualt align=TEXT_ALIGNMENT_LEFT) - } - return UNDEFINED; -} - -jerry_value_t CanvasComponent::TextAlignGetter(const jerry_value_t func, - const jerry_value_t dom, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - (void)args; - (void)argsNum; - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(dom)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - if (component->textAlignValue_ == nullptr) { - CopyFontFamily(component->textAlignValue_, DEFAULT_TEXTALIGN); - } - - if (component->textAlignValue_ != nullptr) { - return jerry_create_string(reinterpret_cast(component->textAlignValue_)); - } else { - return UNDEFINED; - } -} - -jerry_value_t CanvasComponent::CanvasFillRect(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_FOUR) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of fillRect method parameter error!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - int16_t startX = IntegerOf(args[ARGS_INDEX_0]); - int16_t startY = IntegerOf(args[ARGS_INDEX_1]); - int16_t endX = IntegerOf(args[ARGS_INDEX_2]); - int16_t endY = IntegerOf(args[ARGS_INDEX_3]); - - // FILL_STYLE: fill rect support fill shapses only - component->paint_.SetStyle(component->paint_.FILL_STYLE); - - Point startPoint; - startPoint.x = startX; - startPoint.y = startY; - component->canvas_->DrawRect(startPoint, endX, endY, component->paint_); - return UNDEFINED; -} - -jerry_value_t CanvasComponent::CanvasStrokeRect(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_FOUR) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of strokeRect method parameter error!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - int16_t startX = IntegerOf(args[ARGS_INDEX_0]); - int16_t startY = IntegerOf(args[ARGS_INDEX_1]); - int16_t endX = IntegerOf(args[ARGS_INDEX_2]); - int16_t endY = IntegerOf(args[ARGS_INDEX_3]); - - // STROKE_STYLE: stroke rect support draw borders only - component->paint_.SetStyle(component->paint_.STROKE_STYLE); - - Point startPoint; - startPoint.x = startX; - startPoint.y = startY; - component->canvas_->DrawRect(startPoint, endX, endY, component->paint_); - return UNDEFINED; -} - -jerry_value_t CanvasComponent::CanvasFillText(const jerry_value_t func, - const jerry_value_t context, - const jerry_value_t args[], - const jerry_length_t argsNum) -{ - (void)func; - if (argsNum != ARGS_COUNT_THREE) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: the number of fillText method parameter error!"); - return UNDEFINED; - } - - CanvasComponent *component = static_cast(ComponentUtils::GetComponentFromBindingObject(context)); - if (component == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get canvas component from js object failed!"); - return UNDEFINED; - } - - char *textValue = MallocStringOf(args[ARGS_INDEX_0]); - if (textValue == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get text value failed"); - return UNDEFINED; - } - - int16_t startX = IntegerOf(args[ARGS_INDEX_1]); - int16_t startY = IntegerOf(args[ARGS_INDEX_2]); - int16_t maxWidth = component->canvas_->GetWidth(); - - // FILL_STYLE: fillText support fill shapses only - component->paint_.SetStyle(component->paint_.FILL_STYLE); - - Point startPoint; - const int8_t half = 2; - startPoint.x = startX; - startPoint.y = startY; - - // if textAlign=left, not need transfer startX, if textAlign=right or center, need transfer startX - if (component->fontStyle_.align == TEXT_ALIGNMENT_RIGHT) { - startPoint.x = startX - maxWidth; - } else if (component->fontStyle_.align == TEXT_ALIGNMENT_CENTER) { - startPoint.x = (startX + startX - maxWidth) / half; - } else { - startPoint.x = startX; - } - - component->canvas_->DrawLabel(startPoint, textValue, maxWidth, component->fontStyle_, component->paint_); - - ACE_FREE(textValue); - return UNDEFINED; -} - -void CanvasComponent::GetSubFont(const char *font, const uint8_t index, char *&subFont) const -{ - if (font == nullptr || *font == '\0') { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: get font attribute failed"); - return; - } - - if (strlen(font) >= UINT16_MAX) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: font size overflow."); - return; - } - - // skip space character at the head of string. - while (*font != '\0') { - if (*font == ' ') { - font++; - } else { - break; - } - } - - uint8_t currentIndex = 0; - const char *currentPos = font; - const char *endPos = font; - while (*currentPos != '\0') { - // find the sub font string - if (currentIndex == index) { - if (*endPos != ' ' && *endPos != '\0') { - endPos++; - continue; - } - uint16_t len = endPos - currentPos; - uint16_t startIndex = currentPos - font; - subFont = static_cast(ace_malloc(len + 1)); - if (subFont == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: malloc buffer failed for subFont"); - return; - } - errno_t error = strncpy_s(subFont, len + 1, font + startIndex, len); - if (error != 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: copy string failed"); - ace_free(subFont); - subFont = nullptr; - return; - } - subFont[len] = '\0'; - break; - } else { // go forward to next sub font string. - if (*(currentPos) == ' ' && *(currentPos + 1) != ' ') { - currentIndex = currentIndex + 1; - endPos = currentPos + 1; - } - currentPos++; - } - } -} - -void CanvasComponent::RegisterAttributeFunc(jerry_value_t canvas2dContext, - const char *attributeName, - jerry_external_handler_t setterHandler, - jerry_external_handler_t getterHandler) -{ - // register canvas js attribute setter property via the jerry_define_own_property method - jerry_value_t propName = jerry_create_string(reinterpret_cast(attributeName)); - jerry_property_descriptor_t desc; - jerry_init_property_descriptor_fields(&desc); - desc.is_set_defined = true; - desc.setter = jerry_create_external_function(setterHandler); - desc.is_get_defined = true; - desc.getter = jerry_create_external_function(getterHandler); - jerry_value_t returnValue = jerry_define_own_property(canvas2dContext, propName, &desc); - jerry_free_property_descriptor_fields(&desc); - ReleaseJerryValue(propName, returnValue, VA_ARG_END_FLAG); -} - -void CanvasComponent::RegisterDrawMethodFunc(jerry_value_t canvas2dContext, - const char *drawMethodName, - jerry_external_handler_t handler) -{ - JerrySetFuncProperty(canvas2dContext, drawMethodName, handler); -} -} // namespace ACELite -} // namespace OHOS -#endif // FEATURE_COMPONENT_CANVAS diff --git a/src/core/components/component_utils.cpp b/src/core/components/component_utils.cpp deleted file mode 100755 index d48c8b0..0000000 --- a/src/core/components/component_utils.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ - -#include "component_utils.h" -#include "ace_log.h" -#include "component.h" - -namespace OHOS { -namespace ACELite { -UIView* ComponentUtils::GetViewFromBindingObject(jerry_value_t value) -{ - Component* component = GetComponentFromBindingObject(value); - return component ? component->GetComponentRootView() : nullptr; -} - -Component* ComponentUtils::GetComponentFromBindingObject(jerry_value_t value) -{ - if (IS_UNDEFINED(value)) { - return nullptr; - } - - Component* component = nullptr; - bool isBinded = jerry_get_object_native_pointer(value, reinterpret_cast(&component), nullptr); - if (!isBinded || (component == nullptr)) { - return nullptr; - } - return component; -} -} // namespace ACELite -} // namespace OHOS diff --git a/src/core/components/div_component.cpp b/src/core/components/div_component.cpp deleted file mode 100755 index 738c35f..0000000 --- a/src/core/components/div_component.cpp +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ - -#include "div_component.h" -#include "ace_log.h" -#include "key_parser.h" -#include "keys.h" - -namespace OHOS { -namespace ACELite { -DivComponent::DivComponent(jerry_value_t options, - jerry_value_t children, - AppStyleManager* styleManager, - const LayoutType type) - : Component(options, children, styleManager), - isSecondaryAxisAlignSet_(false), - combinedStyle_(nullptr), - nativeView_(nullptr), - layoutType_(FLEX) -{ - SetComponentName(K_DIV); - // get combined style for style items - combinedStyle_ = GetStyleManager()->GetCombinedStyle(); - layoutType_ = type; -} - -bool DivComponent::CreateNativeViews() -{ - if (layoutType_ == LayoutType::POSITION) { - nativeView_ = new UIViewGroup(); - } else { - nativeView_ = new FlexLayout(); - } - - if (nativeView_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "div create fail"); - return false; - } - - return true; -} - -void DivComponent::ReleaseNativeViews() -{ - if (nativeView_) { - delete nativeView_; - nativeView_ = nullptr; - } -} - -inline UIView *DivComponent::GetComponentRootView() const -{ - return nativeView_; -} - -bool DivComponent::ApplyPrivateStyle(const AppStyleItem* style) -{ - bool applyResult = true; - // set layout - if (layoutType_ == LayoutType::POSITION) { - // do nothing - applyResult = false; - } else { - // Set default value - if (!isSecondaryAxisAlignSet_) { - (reinterpret_cast(nativeView_))->SetSecondaryAxisAlign(OHOS::ALIGN_START); - } - uint16_t stylePropNameId = GetStylePropNameId(style); - if (!KeyParser::IsKeyValid(stylePropNameId)) { - return false; - } - const char * const strValue = GetStyleStrValue(style); - if (strValue == nullptr) { - return false; - } - uint16_t valueId = KeyParser::ParseKeyId(strValue, GetStyleStrValueLen(style)); - switch (stylePropNameId) { - case K_FLEX_DIRECTION: { - switch (valueId) { - case K_COLUMN: - (reinterpret_cast(nativeView_))->SetLayoutDirection(LAYOUT_VER); - break; - case K_ROW: - (reinterpret_cast(nativeView_))->SetLayoutDirection(LAYOUT_HOR); - break; - case K_ROW_REVERSE: - (reinterpret_cast(nativeView_))->SetLayoutDirection(LAYOUT_HOR_R); - break; - case K_COLUMN_REVERSE: - (reinterpret_cast(nativeView_))->SetLayoutDirection(LAYOUT_VER_R); - break; - default: - applyResult = false; - break; - } - break; - } - case K_JUSTIFY_CONTENT: { - switch (valueId) { - case K_FLEX_START: - (reinterpret_cast(nativeView_))->SetMajorAxisAlign(OHOS::ALIGN_START); - break; - case K_FLEX_END: - (reinterpret_cast(nativeView_))->SetMajorAxisAlign(OHOS::ALIGN_END); - break; - case K_CENTER: - (reinterpret_cast(nativeView_))->SetMajorAxisAlign(OHOS::ALIGN_CENTER); - break; - case K_SPACE_BETWEEN: - (reinterpret_cast(nativeView_))->SetMajorAxisAlign(OHOS::ALIGN_BETWEEN); - break; - case K_SPACE_AROUND: - (reinterpret_cast(nativeView_))->SetMajorAxisAlign(OHOS::ALIGN_EVENLY); - break; - default: - applyResult = false; - break; - } - break; - } - case K_ALIGN_ITEMS: { - switch (valueId) { - case K_FLEX_START: - (reinterpret_cast(nativeView_))->SetSecondaryAxisAlign(OHOS::ALIGN_START); - break; - case K_FLEX_END: - (reinterpret_cast(nativeView_))->SetSecondaryAxisAlign(OHOS::ALIGN_END); - break; - case K_CENTER: - (reinterpret_cast(nativeView_))->SetSecondaryAxisAlign(OHOS::ALIGN_CENTER); - break; - default: - applyResult = false; - break; - } - if (applyResult) - isSecondaryAxisAlignSet_ = true; - break; - } - case K_FLEX_WRAP: { - if (valueId == K_WRAP) { - (reinterpret_cast(nativeView_))->SetFlexWrap(FlexLayout::WRAP); - } else { - (reinterpret_cast(nativeView_))->SetFlexWrap(FlexLayout::NOWRAP); - } - break; - } - default: - applyResult = false; - break; - } - } - - return applyResult; -} - -bool DivComponent::ProcessChildren() -{ - if (!nativeView_) { - return false; - } - - // first, add all children to this container - AppendChildren(nativeView_); - // second, layout them - if (layoutType_ != LayoutType::POSITION) { - nativeView_->LayoutChildren(); - } - - return true; -} - -void DivComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) -{ - nativeView_->LayoutChildren(); -} -} // namespace ACELite -} // namespace OHOS diff --git a/src/core/components/input_component.cpp b/src/core/components/input_component.cpp deleted file mode 100755 index 17df226..0000000 --- a/src/core/components/input_component.cpp +++ /dev/null @@ -1,538 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ - -#include "input_component.h" -#include "ace_log.h" -#include "ace_mem_base.h" -#include "js_app_context.h" -#include "js_fwk_common.h" -#include "key_parser.h" -#include "keys.h" -#include "ui_button.h" -#include "font/ui_font_header.h" - -namespace OHOS { -namespace ACELite { -bool InputComponent::CreateNativeViews() -{ - CreateCheckboxOrRadio(); - if ((checkbox_ == nullptr) && (radioButton_ == nullptr)) { - button_ = new UILabelButton(); - if (button_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create button failed"); - return false; - } - // set font family - if (!CopyFontFamily(fontFamily_, DEFAULT_FONT_FAMILY)) { - return false; - } - const uint8_t defaultWidth = 100; - const uint8_t defaultHeight = 50; - button_->SetWidth(defaultWidth); - button_->SetHeight(defaultHeight); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - button_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - button_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); - } - return (checkbox_ != nullptr) || (button_ != nullptr) || (radioButton_ != nullptr); -} - -void InputComponent::CreateCheckboxOrRadio() -{ - jerry_value_t attrsPropValue = jerryx_get_property_str(options_, ATTR_ATTRS); - // create component according to attribute type - const char * const attrType = "type"; - jerry_value_t typeValHandler = jerryx_get_property_str(attrsPropValue, attrType); - if (!jerry_value_is_undefined(typeValHandler)) { - uint16_t len = 0; - char *type = MallocStringOf(typeValHandler, &len); - uint16_t typeId = KeyParser::ParseKeyId(type, len); - if (typeId == K_CHECKBOX) { - checkbox_ = new UICheckBox(); - if (checkbox_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create checkbox failed."); - } - } else if (typeId == K_RADIO) { - // get the property name - const char * const nameAttr = "name"; - char *name = nullptr; - jerry_value_t nameAttrVal = jerryx_get_property_str(attrsPropValue, nameAttr); - if (!jerry_value_is_undefined(nameAttrVal)) { - name = MallocStringOf(nameAttrVal); - } - jerry_release_value(nameAttrVal); - if (name == nullptr) { - const char * const tmpNameVal = ""; - radioButton_ = new UIRadioButton(tmpNameVal); - } else { - radioButton_ = new UIRadioButton(name); - } - ACE_FREE(name); - if (radioButton_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create radioButton failed"); - } - } - ACE_FREE(type); - } - ReleaseJerryValue(typeValHandler, attrsPropValue, VA_ARG_END_FLAG); -} - -void InputComponent::ReleaseNativeViews() -{ - if (checkbox_ != nullptr) { - delete checkbox_; - checkbox_ = nullptr; - } - if (button_ != nullptr) { - delete button_; - button_ = nullptr; - } - if (radioButton_ != nullptr) { - delete radioButton_; - radioButton_ = nullptr; - } - if (changeListener_ != nullptr) { - delete changeListener_; - changeListener_ = nullptr; - } - if (clickListener_ != nullptr) { - delete clickListener_; - clickListener_ = nullptr; - } - ACE_FREE(textValue_); - ACE_FREE(fontFamily_); - ACE_FREE(normalBackGroundImg_); - ACE_FREE(pressedBackGroundImg_); -} -bool InputComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) -{ - switch (attrKeyId) { - case K_CHECKED: - // set the state of checkbox and radioButton - if ((checkbox_ != nullptr) || (radioButton_ != nullptr)) { - if (jerry_value_is_boolean(attrValue)) { - bool checked = jerry_get_boolean_value(attrValue); - UICheckBox::UICheckBoxState state = - checked ? UICheckBox::UICheckBoxState::SELECTED : UICheckBox::UICheckBoxState::UNSELECTED; - if (checkbox_ != nullptr) { - checkbox_->SetState(state); - } else { - radioButton_->SetState(state); - } - return true; - } else { - HILOG_ERROR(HILOG_MODULE_ACE, "the checkbox checked is error value"); - return false; - } - } - break; - case K_VALUE: - ACE_FREE(textValue_); - textValue_ = MallocStringOf(attrValue); - return true; - case K_NAME: - if (radioButton_ != nullptr) { - char *name = MallocStringOf(attrValue); - UIRadioButton *radio = static_cast(radioButton_); - if (name == nullptr) { - const char * const tmpName = ""; - radio->SetName(tmpName); - } else { - radio->SetName(name); - ACE_FREE(name); - } - return true; - } - break; - default: - break; - } - return false; -} - -bool InputComponent::RegisterPrivateEventListener(uint16_t eventTypeId, jerry_value_t funcValue) -{ - if (eventTypeId == K_CHANGE) { - if ((checkbox_ != nullptr) || (radioButton_ != nullptr)) { - if (checkbox_ != nullptr) { - changeListener_ = new StateChangeListener(funcValue, K_CHECKBOX); - } else { - changeListener_ = new StateChangeListener(funcValue, K_RADIO); - } - if (changeListener_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create change listener failed"); - return false; - } - return true; - } - } else if (eventTypeId == K_CLICK) { - clickListener_ = new ViewOnClickListener(funcValue, eventTypeId); - if (clickListener_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); - return false; - } - return true; - } - return false; -} - -bool InputComponent::ApplyPrivateStyle(const AppStyleItem *style) -{ - if (button_ == nullptr) { - return HandleImage(*style); - } - bool result = true; - uint16_t styleKey = GetStylePropNameId(style); - switch (styleKey) { - case K_FONT_SIZE: - result = SetFontSize(style); - break; - case K_FONT_FAMILY: - if (IsStyleValueTypeString(style)) { - // the style would be freed after this method - result = CopyFontFamily(fontFamily_, GetStyleStrValue(style)); - } else { - result = false; - } - break; - case K_TEXT_ALIGN: - result = SetTextAlign(style); - break; - case K_COLOR: - result = SetColor(*style); - break; - case K_BACKGROUND_COLOR: - result = SetBackgroundColor(*style); - break; - case K_BACKGROUND_IMAGE: - result = HandleButtonBackGroundImg(*style); - break; - case K_MARGIN: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetMargin(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetMargin(*button_, *style); - break; - } - case K_MARGIN_BOTTOM: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetBottomMargin(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetBottomMargin(*button_, *style); - break; - } - case K_MARGIN_LEFT: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetLeftMargin(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetLeftMargin(*button_, *style); - break; - } - case K_MARGIN_RIGHT: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetRightMargin(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetRightMargin(*button_, *style); - break; - } - case K_MARGIN_TOP: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetTopMargin(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetTopMargin(*button_, *style); - break; - } - case K_PADDING: - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetPadding(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetPadding(*button_, *style); - break; - case K_PADDING_BOTTOM: - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetBottomPadding(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetBottomPadding(*button_, *style); - break; - case K_PADDING_LEFT: - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetLeftPadding(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetLeftPadding(*button_, *style); - break; - case K_PADDING_RIGHT: - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetRightPadding(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetRightPadding(*button_, *style); - break; - case K_PADDING_TOP: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetTopPadding(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetTopPadding(*button_, *style); - break; - } - case K_BORDER_BOTTOM_WIDTH: - case K_BORDER_LEFT_WIDTH: - case K_BORDER_RIGHT_WIDTH: - case K_BORDER_TOP_WIDTH: - case K_BORDER_WIDTH: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetBorderWidth(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetBorderWidth(*button_, *style); - break; - } - case K_BORDER_BOTTOM_COLOR: - case K_BORDER_LEFT_COLOR: - case K_BORDER_RIGHT_COLOR: - case K_BORDER_TOP_COLOR: - case K_BORDER_COLOR: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetBorderColor(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetBorderColor(*button_, *style); - break; - } - case K_BORDER_RADIUS: { - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - SetBorderRadius(*button_, *style); - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - SetBorderRadius(*button_, *style); - break; - } - default: - result = false; - break; - } - return result; -} - -bool InputComponent::HandleImage(const AppStyleItem &style) -{ - if ((checkbox_ != nullptr) || (radioButton_ != nullptr)) { - uint16_t styleKey = GetStylePropNameId(&style); - if (styleKey == K_BACKGROUND_IMAGE) { - return HandleButtonBackGroundImg(style); - } - } - return false; -} - -bool InputComponent::SetBackgroundColor(const AppStyleItem &style) -{ - if (style.GetPseudoClassType() != PSEUDO_CLASS_ACTIVE) { - // let parent handle the normal state background color style, - // will be set for released state style of ui button - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - Component::SetBackgroundColor(*button_, style); - button_->SetStateForStyle(UIButton::ButtonState::RELEASED); - Component::SetBackgroundColor(*button_, style); - return true; - } - uint32_t color = 0; - uint8_t alpha = OPA_OPAQUE; - if (!GetStyleColorValue(&style, color, alpha)) { - return false; - } - pressedBackGroundColorValue_ = color; - pressedOpacityValue_ = alpha; - return true; -} - -bool InputComponent::SetColor(const AppStyleItem &style) const -{ - bool result = true; - uint32_t color = 0; - uint8_t alpha = OPA_OPAQUE; - if (GetStyleColorValue(&style, color, alpha)) { - button_->SetLabelStyle(STYLE_TEXT_COLOR, GetRGBColor(color).full); - button_->SetLabelStyle(STYLE_TEXT_OPA, alpha); - } else { - result = false; - } - return result; -} - -bool InputComponent::SetTextAlign(const AppStyleItem *style) const -{ - bool result = true; - if (IsStyleValueTypeString(style) && GetStyleStrValue(style)) { - uint16_t valueId = KeyParser::ParseKeyId(GetStyleStrValue(style), GetStyleStrValueLen(style)); - switch (valueId) { - case K_LEFT: - button_->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT); - break; - case K_CENTER: - button_->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); - break; - case K_RIGHT: - button_->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_RIGHT); - break; - default: - HILOG_ERROR(HILOG_MODULE_ACE, "the value of text-align in input component is error"); - result = false; - break; - } - } else { - HILOG_ERROR(HILOG_MODULE_ACE, "the type of style align is error"); - result = false; - } - return result; -} - -bool InputComponent::SetFontSize(const AppStyleItem *style) -{ - bool result = true; - fontSize_ = GetStylePixelValue(style); - return result; -} - -bool InputComponent::HandleButtonBackGroundImg(const AppStyleItem &styleItem) -{ - bool result = false; - if (styleItem.GetValueType() == STYLE_PROP_VALUE_TYPE_STRING) { - const char * const url = styleItem.GetStrValue(); - char *filePath = CreatePathStrFromUrl(url); - if (filePath != nullptr) { - char *imagePath = JsAppContext::GetInstance()->GetResourcePath(filePath); - if (imagePath == nullptr) { - ace_free(filePath); - filePath = nullptr; - return result; - } -#ifdef OHOS_ACELITE_PRODUCT_WATCH - // convert .png/jpeg/bmp to .bin subfix - CureImagePath(imagePath); -#endif // OHOS_ACELITE_PRODUCT_WATCH - if ((styleItem.GetPseudoClassType() == PSEUDO_CLASS_ACTIVE) - || (styleItem.GetPseudoClassType() == PSEUDO_CLASS_CHECKED)) { - // in case we don't free the buffer after using - ACE_FREE(pressedBackGroundImg_); - pressedBackGroundImg_ = imagePath; - } else { - // in case we don't free the buffer after using - ACE_FREE(normalBackGroundImg_); - normalBackGroundImg_ = imagePath; - } - ace_free(filePath); - filePath = nullptr; - result = true; - } - } - return result; -} - -void InputComponent::PostRender() -{ - if (button_ != nullptr) { - if (textValue_ != nullptr && fontFamily_ != nullptr) { - button_->SetFont(fontFamily_, fontSize_); - button_->SetText(textValue_); - } - if (clickListener_ != nullptr) { - button_->SetOnClickListener(clickListener_); - } - if (pressedBackGroundColorValue_ >= 0) { - button_->SetStateForStyle(UIButton::ButtonState::PRESSED); - button_->SetStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(pressedBackGroundColorValue_).full); - button_->SetStyle(STYLE_BACKGROUND_OPA, pressedOpacityValue_); - } - if (normalBackGroundImg_ != nullptr || pressedBackGroundImg_ != nullptr) { - // make sure the normal and pressed image same in case user only set one of them - char *normalImg = (normalBackGroundImg_ == nullptr) ? pressedBackGroundImg_ : normalBackGroundImg_; - char *pressedImg = (pressedBackGroundImg_ == nullptr) ? normalBackGroundImg_ : pressedBackGroundImg_; - button_->SetImageSrc(normalImg, pressedImg); - } - } - DealEvent(); - ACE_FREE(normalBackGroundImg_); - ACE_FREE(pressedBackGroundImg_); -} - -void InputComponent::DealEvent() -{ - if ((checkbox_ == nullptr) && (radioButton_ == nullptr)) { - return; - } - if (changeListener_ != nullptr) { - changeListener_->SetValue(textValue_); - if (checkbox_ != nullptr) { - checkbox_->SetOnChangeListener(changeListener_); - } else { - changeListener_->SetView(radioButton_); - radioButton_->SetOnChangeListener(changeListener_); - } - if (clickListener_ == nullptr) { - // trigger changeEvent - clickListener_ = new ViewOnClickListener(UNDEFINED, K_CLICK); - if (clickListener_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create click listener failed"); - return; - } - } - } - if (clickListener_ != nullptr) { - clickListener_->SetComponentListener(changeListener_); - if (checkbox_ != nullptr) { - checkbox_->SetOnClickListener(clickListener_); - } else { - radioButton_->SetOnClickListener(clickListener_); - } - } - if (normalBackGroundImg_ != nullptr || pressedBackGroundImg_ != nullptr) { - // make sure the normal and pressed image same in case user only set one of them - char *normalImg = (normalBackGroundImg_ == nullptr) ? pressedBackGroundImg_ : normalBackGroundImg_; - char *pressedImg = (pressedBackGroundImg_ == nullptr) ? normalBackGroundImg_ : pressedBackGroundImg_; - if (checkbox_ != nullptr) { - checkbox_->SetImages(pressedImg, normalImg); - } else { - radioButton_->SetImages(pressedImg, normalImg); - } - } -} - -void InputComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) -{ - if (!updateResult || !KeyParser::IsKeyValid(attrKeyId)) { - HILOG_ERROR(HILOG_MODULE_ACE, "input component post update check args failed"); - return; - } - if (button_ != nullptr) { - switch (attrKeyId) { - case K_VALUE: - if (textValue_ != nullptr) { - button_->SetText(textValue_); - } - break; - case K_FONT_SIZE: - case K_FONT_FAMILY: - if (fontFamily_ != nullptr) { - button_->SetFont(fontFamily_, fontSize_); - } - break; - default: - break; - } - } - if (((checkbox_ != nullptr) || (radioButton_ != nullptr)) && (changeListener_ != nullptr) - && (attrKeyId == K_VALUE)) { - changeListener_->SetValue(textValue_); - } -} -} // namespace ACELite -} // namespace OHOS diff --git a/src/core/components/progress_component.cpp b/src/core/components/progress_component.cpp deleted file mode 100755 index bebb73f..0000000 --- a/src/core/components/progress_component.cpp +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ - -#include "progress_component.h" -#include "ace_log.h" -#include "ace_mem_base.h" -#include "component.h" -#include "key_parser.h" -#include "keys.h" -#include "stylemgr/app_style.h" -#include "ui_box_progress.h" -#include "ui_circle_progress.h" - -namespace OHOS { -namespace ACELite { -ProgressComponent::ProgressComponent(jerry_value_t options, jerry_value_t children, AppStyleManager *styleManager) - : Component(options, children, styleManager), - options_(options), - progressView_(nullptr), - type_(HORIZONTAL), - hStrokeWidth_(0), - centerX_(INT16_MAX), - centerY_(INT16_MAX), - radius_(INT16_MAX), - startAngle_(DEFAULT_START_ANGLE), - totalAngle_(DEFAULT_TOTAL_ANGLE) -{ - SetComponentName(K_PROGRESS); -} - -bool ProgressComponent::CreateNativeViews() -{ - // Step1. get progress type - type_ = GetType(); - // Step2. create progress object - if (type_ == ARC) { - progressView_ = new UICircleProgress(); - - if (progressView_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create circle progress error"); - return false; - } - - // set default value - UICircleProgress *circleProgress = reinterpret_cast(progressView_); - circleProgress->SetBackgroundStyle(StyleDefault::GetBrightStyle()); - const int8_t defaultLineWidth = 32; - circleProgress->SetBackgroundStyle(STYLE_LINE_WIDTH, defaultLineWidth); // Compatible with rich devices - circleProgress->SetBackgroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); - - circleProgress->SetForegroundStyle(StyleDefault::GetBrightColorStyle()); - circleProgress->SetForegroundStyle(STYLE_BACKGROUND_OPA, 0); - circleProgress->SetForegroundStyle(STYLE_BORDER_OPA, 0); - circleProgress->SetForegroundStyle(STYLE_LINE_WIDTH, defaultLineWidth); - circleProgress->SetForegroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); - } else { - progressView_ = new UIBoxProgress(); - - if (progressView_ == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "create horizon progress error"); - return false; - } - - UIBoxProgress *horizonProgress = reinterpret_cast(progressView_); - // set default style for progress & background - Style progressStyle = StyleDefault::GetBrightColorStyle(); - Style backStyle = StyleDefault::GetBrightStyle(); - horizonProgress->SetForegroundStyle(progressStyle); - horizonProgress->SetBackgroundStyle(backStyle); - - // set default progress self border width - horizonProgress->SetForegroundStyle(STYLE_BORDER_WIDTH, 0); - horizonProgress->SetBackgroundStyle(STYLE_BORDER_WIDTH, 0); - // set defaut progress stroke width & canvas width & canvas height & border width - hStrokeWidth_ = DEFAULT_STROKE_WIDTH; - } - return true; -} - -void ProgressComponent::ReleaseNativeViews() -{ - if (progressView_) { - delete progressView_; - progressView_ = nullptr; - } -} - -inline UIView *ProgressComponent::GetComponentRootView() const -{ - return progressView_; -} - -bool ProgressComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) -{ - switch (attrKeyId) { - case K_PERCENT: { - // set the specific attribute of this progress view - int16_t rangeMax = 100; - int16_t rangeMin = 0; - progressView_->SetRange(rangeMax, rangeMin); - progressView_->SetValue(IntegerOf(attrValue)); - return true; - } - default: { - return false; - } - } -} - -bool ProgressComponent::ApplyPrivateStyle(const AppStyleItem *style) -{ - bool setResult = true; - - if (type_ == ARC) { - setResult = SetArcProgressStyle(style); - } else { - setResult = SetHorizonProgressStyle(style); - } - return setResult; -} - -ProgressType ProgressComponent::GetType() const -{ - ProgressType pType = HORIZONTAL; - uint16_t len = 0; - char *typeValue = GetStringAttrByName(ATTR_TYPE, &len); - if (typeValue == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "type value is a nullptr"); - return pType; - } - uint16_t typeValueId = KeyParser::ParseKeyId(typeValue, len); - if (typeValueId == K_ARC) { - pType = ARC; - } - ace_free(typeValue); - typeValue = nullptr; - return pType; -} - -char *ProgressComponent::GetStringAttrByName(const char * const name, uint16_t *len) const -{ - char *strValue = nullptr; - jerry_value_t attrsPropValue = jerryx_get_property_str(options_, ATTR_ATTRS); - if (!jerry_value_is_undefined(attrsPropValue)) { - jerry_value_t attrPropValue = jerryx_get_property_str(attrsPropValue, name); - if (jerry_value_is_string(attrPropValue)) { - strValue = MallocStringOf(attrPropValue, len); - } else { - HILOG_ERROR(HILOG_MODULE_ACE, "progress_component: target attribute: %s, value format is error", name); - } - jerry_release_value(attrPropValue); - } else { - HILOG_INFO(HILOG_MODULE_ACE, "progress_component: target attribute: %s, not exist", name); - } - jerry_release_value(attrsPropValue); - return strValue; -} - -void ProgressComponent::HorizonProgressPostDeal() const -{ - // set width & height of progress - UIBoxProgress *horizonProgress = reinterpret_cast(progressView_); - if (horizonProgress->GetWidth() < 0) { - horizonProgress->SetValidWidth(0); - } else { - horizonProgress->SetValidWidth(horizonProgress->GetWidth()); - } - horizonProgress->SetValidHeight(hStrokeWidth_); -} - -void ProgressComponent::SetAngles() -{ - UICircleProgress *circleProgress = reinterpret_cast(progressView_); - - if (centerX_ == INT16_MAX) { - centerX_ = static_cast(circleProgress->GetWidth()) >> 1; - } - if (centerY_ == INT16_MAX) { - centerY_ = static_cast(circleProgress->GetHeight()) >> 1; - } - if (radius_ == INT16_MAX) { - if (circleProgress->GetWidth() <= circleProgress->GetHeight()) { - radius_ = static_cast(circleProgress->GetWidth()) >> 1; - } else { - radius_ = static_cast(circleProgress->GetHeight()) >> 1; - } - } - - circleProgress->SetCenterPosition(centerX_, centerY_); - circleProgress->SetRadius(radius_); - circleProgress->SetStartAngle(startAngle_); - circleProgress->SetEndAngle(startAngle_ + totalAngle_); -} - -bool ProgressComponent::SetArcProgressStyle(const AppStyleItem *style) -{ - if (progressView_ == nullptr) { - return false; - } - - UICircleProgress *circleProgress = reinterpret_cast(progressView_); - - uint16_t stylePropNameId = GetStylePropNameId(style); - - switch (stylePropNameId) { - case K_CENTER_X: { - centerX_ = GetStylePixelValue(style); - return true; - } - case K_CENTER_Y: { - centerY_ = GetStylePixelValue(style); - return true; - } - case K_RADIUS: { - radius_ = GetStylePixelValue(style); - return true; - } - case K_START_ANGLE: { - const int16_t minStartAngle = 0; - const int16_t maxStartAngle = 360; - startAngle_ = GetStyleDegValue(style); // Compatible with rich devices, value should between -180 and 0 - if (startAngle_ > maxStartAngle) { - startAngle_ = maxStartAngle; - } else if (startAngle_ < minStartAngle) { - startAngle_ = minStartAngle; - } - return true; - } - case K_TOTAL_ANGLE: { - const int16_t minStartAngle = -360; - const int16_t maxStartAngle = 360; - totalAngle_ = GetStyleDegValue(style); // Compatible with rich devices, value should between 0 and 180 - if (totalAngle_ < minStartAngle) { - totalAngle_ = minStartAngle; - } else if (totalAngle_ > maxStartAngle) { - totalAngle_ = maxStartAngle; - } - return true; - } - case K_COLOR: { - uint32_t color = 0; - uint8_t alpha = OPA_OPAQUE; - if (!GetStyleColorValue(style, color, alpha)) { - return false; - } - circleProgress->SetForegroundStyle(STYLE_LINE_COLOR, GetRGBColor(color).full); - circleProgress->SetForegroundStyle(STYLE_LINE_OPA, alpha); - return true; - } - case K_STROKE_WIDTH: { - circleProgress->SetBackgroundStyle(STYLE_LINE_WIDTH, GetStylePixelValue(style)); - circleProgress->SetForegroundStyle(STYLE_LINE_WIDTH, GetStylePixelValue(style)); - return true; - } - case K_BACKGROUND_COLOR: { - uint32_t color = 0; - uint8_t alpha = OPA_OPAQUE; - if (!GetStyleColorValue(style, color, alpha)) { - return false; - } - circleProgress->SetBackgroundStyle(STYLE_LINE_COLOR, GetRGBColor(color).full); - circleProgress->SetBackgroundStyle(STYLE_LINE_OPA, alpha); - return true; - } - default: { - return false; - } - } -} - -bool ProgressComponent::SetHorizonProgressStyle(const AppStyleItem *style) -{ - if (progressView_ == nullptr) { - return false; - } - - UIBoxProgress *horizonProgress = reinterpret_cast(progressView_); - uint16_t stylePropNameId = GetStylePropNameId(style); - - switch (stylePropNameId) { - // Get stroke width. - case K_STROKE_WIDTH: { - hStrokeWidth_ = GetStylePixelValue(style); - break; - } - // Set horizon progress style: color. - case K_COLOR: { - uint32_t color = 0; - uint8_t alpha = OPA_OPAQUE; - if (!GetStyleColorValue(style, color, alpha)) { - return false; - } - horizonProgress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, GetRGBColor(color).full); - horizonProgress->SetForegroundStyle(STYLE_BACKGROUND_OPA, alpha); - break; - } - default: { - return false; - } - } - return true; -} - -void ProgressComponent::PostRender() -{ - if (type_ == HORIZONTAL) { - HorizonProgressPostDeal(); - } else if (type_ == ARC) { - SetAngles(); - } -} - -void ProgressComponent::PostUpdate(uint16_t attrKeyId, bool updateResult) -{ - if (type_ == HORIZONTAL) { - HorizonProgressPostDeal(); - } else if (type_ == ARC) { - SetAngles(); - } else { - // Do nothing - } -} -} // namespace ACELite -} // namespace OHOS diff --git a/src/core/context/BUILD.gn b/src/core/context/BUILD.gn deleted file mode 100755 index 99dff77..0000000 --- a/src/core/context/BUILD.gn +++ /dev/null @@ -1,37 +0,0 @@ -#Copyright (c) 2020 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. - -declare_args() { - enable_hos_ace_fafwk_test = false -} - -source_set("context") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - - if(enable_hos_ace_fafwk_test == true) { - defines += ["HOS_ACE_FAFWK_TEST"] - } - - sources = [ - "js_ability.cpp", - "js_ability_impl.cpp", - "js_app_context.cpp", - "js_app_environment.cpp", - "js_profiler.cpp", - "js_timer_list.cpp", - ] - include_dirs = [ - ] -} diff --git a/src/core/jsi/BUILD.gn b/src/core/jsi/BUILD.gn deleted file mode 100755 index b8fa9cd..0000000 --- a/src/core/jsi/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -#Copyright (c) 2020 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. - -source_set("jsi") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "jsi.cpp", - ] - include_dirs = [ - "internal", - ] -} diff --git a/src/core/modules/BUILD.gn b/src/core/modules/BUILD.gn deleted file mode 100755 index bfb7aa6..0000000 --- a/src/core/modules/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -#Copyright (c) 2020 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. - -source_set("modules") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "module_manager.cpp", - "presets/console_log_impl.cpp", - "presets/console_module.cpp", - "presets/feature_ability_module.cpp", - "presets/preset_module.cpp", - "presets/profiler_module.cpp", - "presets/render_module.cpp", - "presets/require_module.cpp", - #"presets/jstest_module.cpp", - "presets/timer_module.cpp", - "app_module.cpp", - #"sample_module.cpp", - "router_module.cpp", - "presets/localization_module.cpp", - "presets/cjson_parser.cpp", - ] - include_dirs = [ - "presets", - "maplejs", - "//test/lite/testservice/include", - "//vendor/huawei/watchgt/devkit/hal/include", - "//foundation/distributedschedule/interfaces/innerkits/samgr_lite/communication/mpc/transport", - "//foundation/distributedschedule/interfaces/innerkits/samgr_lite/communication/mpc", - ] -} diff --git a/src/core/modules/presets/cjson_parser.h b/src/core/modules/presets/cjson_parser.h deleted file mode 100755 index 7edc2d1..0000000 --- a/src/core/modules/presets/cjson_parser.h +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ -#ifndef OHOS_ACELITE_CJSON_PARSER_H -#define OHOS_ACELITE_CJSON_PARSER_H -#include "acelite_config.h" - -#ifdef FEATURE_LOCALIZATION_MODULE -#include -#include -#include "ace_mem_base.h" -#include "js_app_context.h" -#include "non_copyable.h" - -namespace OHOS { -namespace ACELite { -class CJSONParser final : public MemoryHeap { -public: - ACE_DISALLOW_COPY_AND_MOVE(CJSONParser); - struct ListNode : public MemoryHeap { - char *value; - ListNode *next; - }; - - CJSONParser(); - - ~CJSONParser() - { - if (fileList_ != nullptr) { - ClearNode(fileList_); - } - ACE_FREE(countries_); - ACE_FREE(language_); - ACE_FREE(filePath_); - } - - /** - * @breif: read the next file which matches the language-country, and then transfer the file content - * to json. - * - * @return if the fileList is nullptr or read the last one return false.if get the correct content return true. - */ - bool ChangeJsonFile(cJSON *¤tItem); - - /** - * @brief: replace the placeholder in result with the data defined by user - * if plural is true, it will replace the number in placeholder, - * replace the same name in js object. - */ -#ifdef LOCALIZATION_PLURAL - char *FillPlaceholder(char *format, jerry_value_t arg, jerry_length_t num, bool isPlural); -#else - char *FillPlaceholder(const char *format, jerry_value_t arg, jerry_length_t num); -#endif // LOCALIZATION_PLURAL - - /** - * @brief:set the readIndex_ = 0; the value of index is the index where the key is defined - */ - void ResetIndex(); - - /** - * @brief: get the filePath name - */ - bool Init(); - - /** - * @brief: merge string destination and resource, save the merge result in destination - * if check is true, it will free destination string - */ - char *SubStr(const char *src, size_t start, size_t length); - - /** - * @brief: split the string by delemeter and save the split result in node - * - * @return the length of node - */ - uint8_t Split(const char *target, char delemeter, ListNode *&node); - - static bool AddNode(ListNode *&head, char *current); - static char *GetNode(ListNode *node, int index); - static void ClearNode(ListNode *&node); - static char *ToString(ListNode *node, uint8_t length); - -private: - constexpr static int maxLen_ = 26; - const char * const allCountries_[maxLen_] = { - "DEFGILMOQRSTUWXZ", - "ABDEFGHIJLMNORSTVWYZ", - "ACDFGHIKLMNORUVWXYZ", - "EJKMOZ", - "CEGHRST", - "IJKMOR", - "ABDEFGHILMNPQRSTUWY", - "KMNRTU", - "DELMNOQRST", - "EMOP", - "EGHIMNPRWYZ", - "ABCIKRSTUVY", - "ACDEFGHKLMNOPQRSTUVWXYZ", - "ACEFGILOPRUZ", - "M", - "AEFGHKLMNRSTWY", - "A", - "EOSUW", - "ABCDEGHIJKLMNORSTVXYZ", - "CDFGHJKLMNORTVWZ", - "AGMSYZ", - "ACEGINU", - "FS", - "", - "ET", - "AMW", - }; - enum FILETYPE { COUNTRY = 0, LANG = 1, OTHERCOUNTRY = -1, ERRORCODE = -2}; - const char *GetCountries(int8_t index); - - bool GetFiles(); - /** - * @brief:compare the fileName with the string language-country - * - * @return 0:the file name is language-countryXXXX.json - * 1:the file name is language -XXX.json - * 2:the file name is language-otherCountryXXX.json - */ - int8_t CompareFileName(const char *name); - /** - * @Brief get the locale string and split it by ',' - */ - void SetLanguage(); - - /** - * @Brief: get the positon of delemeter after index - * @return if the index is upper than the length of string, return -1 - * else if the index is not defined in string, return the length, else return the position of it - */ - int IndexOf(const char *string, char delemeter, int index); - - /** - * @Brief: split the string defined in value by '|', and get value in the split string - * For example: the string is car|cars, if the value of param is odd, assign value car,else cars - */ -#ifdef LOCALIZATION_PLURAL - char *GetPluralValue(char *value, jerry_value_t param); - uint8_t FormatString(const char *format, jerry_value_t arg, ListNode *&node, bool isPlural, jerry_value_t num); - /** - * @brief: get the value defined in param - * @param: attrName:the attrbute name in param, for example "name" - * param: the object defined attrName, for example {"name":"Jane"} - * @return: the value in param - */ - char *GetParamValue(const char *attrName, jerry_value_t param, bool isPlural); -#else - uint8_t FormatString(const char *format, jerry_value_t arg, ListNode *&node, jerry_value_t num); - char *GetParamValue(const char *attrName, jerry_value_t param); -#endif - - /** - * @Brief: sort the file name alphabetical order - */ - void SortFileName(ListNode *node); - - void MergeList(ListNode *&destination, ListNode *source); - - uint8_t curFileIndex_; // the file index current read - uint8_t totalFiles_; - char *countries_; // the current country and origion - char *language_; // the current system language - char leftDelemeter_; - char rightDelemeter_; - char *filePath_; - ListNode *fileList_; -#if (defined(_WIN32) || defined(_WIN64)) - bool ReadWinFile(ListNode *&languageFile, ListNode *&countryFile); -#else - bool ReadFile(ListNode *&languageFile, ListNode *&countryFile); -#endif -}; -} // namespace ACELite -} // namespace OHOS -#endif // LOCALIZATION_MODULE -#endif // OHOS_ACELITE_CJSON_PARSER_H diff --git a/src/core/router/BUILD.gn b/src/core/router/BUILD.gn deleted file mode 100755 index c027925..0000000 --- a/src/core/router/BUILD.gn +++ /dev/null @@ -1,25 +0,0 @@ -#Copyright (c) 2020 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. - -source_set("router") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "js_page_state_machine.cpp", - "js_router.cpp", - "js_page_state.cpp", - ] - include_dirs = [ - ] -} diff --git a/src/core/stylemgr/BUILD.gn b/src/core/stylemgr/BUILD.gn deleted file mode 100755 index 6b8002c..0000000 --- a/src/core/stylemgr/BUILD.gn +++ /dev/null @@ -1,27 +0,0 @@ -#Copyright (c) 2020 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. - -source_set("stylemgr") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "app_style_list.cpp", - "app_style_sheet.cpp", - "app_style_item.cpp", - "app_style_manager.cpp", - "app_style.cpp", - ] - include_dirs = [ - ] -} diff --git a/src/core/wrapper/BUILD.gn b/src/core/wrapper/BUILD.gn deleted file mode 100755 index f7ba3df..0000000 --- a/src/core/wrapper/BUILD.gn +++ /dev/null @@ -1,23 +0,0 @@ -#Copyright (c) 2020 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. - -source_set("wrapper") { - configs += [ - "//foundation/ace/lite/jsfwk:ace_config", - ] - sources = [ - "js.cpp" - ] - include_dirs = [ - ] -} diff --git a/targets/linux/acelite_config.h b/targets/linux/acelite_config.h deleted file mode 100755 index acd76ea..0000000 --- a/targets/linux/acelite_config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ - -#ifndef OHOS_ACELITE_CONFIG_H -#define OHOS_ACELITE_CONFIG_H - -/** - * ================================================================================================ - * hi3516_linux config for hmf - * ================================================================================================ - */ -#define OHOS_ACELITE_LINUX // NOTE: DO NOT use this macro directly - -/** - * Compile all test entry for hmf - */ -#ifdef FEATURE_TEST_IMPLEMENTATION -#error "must keep the global configuration unique" -#else -#define FEATURE_TEST_IMPLEMENTATION -#endif - -/** - * use hi log interface to trace out - */ -#ifdef FEATURE_ACELITE_HI_LOG_PRINTF -#error "must keep the global configuration unique" -#else -#define FEATURE_ACELITE_HI_LOG_PRINTF -#endif - -#define DEFAULT_PROFILER_MSG_PATH "/user/data/" - -#define PROFILER_ENABLE_FLAG_FILE "/user/data/profiler_enable" - -#define RUNTIME_MODE_FILE_PATH "/user/data/jsparser_enable" - -#endif // OHOS_ACELITE_CONFIG_H - diff --git a/test/BUILD.gn b/test/BUILD.gn new file mode 100755 index 0000000..1cf98af --- /dev/null +++ b/test/BUILD.gn @@ -0,0 +1,45 @@ +#Copyright (c) 2021 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("//build/lite/config/test.gni") +import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni") + +cache_manager_unittest_root = + "$ace_lite_root/frameworks/src/core/base/cache/test/unittest" +components_unittest_root = + "$ace_lite_root/frameworks/src/core/components/test/unittest" +context_unittest_root = + "$ace_lite_root/frameworks/src/core/context/test/unittest" +jsi_unittest_root = "$ace_lite_root/frameworks/src/core/jsi/test/unittest" +modules_unittest_root = + "$ace_lite_root/frameworks/src/core/modules/test/unittest" +stylemgr_unittest_root = + "$ace_lite_root/frameworks/src/core/stylemgr/test/unittest" + +# common config for all test, append extra in self gn +config("test_common_config") { + include_dirs = ace_test_includes + configs = ace_test_configs + defines = ace_test_defines +} + +group("unittest") { + deps = [ + "$cache_manager_unittest_root:cache_manager_unittest", + "$components_unittest_root:components_unittest", + "$context_unittest_root:js_frameworks_unittest", + "$jsi_unittest_root:jsi_unittest", + "$modules_unittest_root:modules_unittest", + "$stylemgr_unittest_root:stylemgr_unittest", + ] +} diff --git a/test/ace_test_config.gni b/test/ace_test_config.gni new file mode 100755 index 0000000..5e6f81a --- /dev/null +++ b/test/ace_test_config.gni @@ -0,0 +1,86 @@ +#Copyright (c) 2021 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("//build/lite/config/test.gni") + +ace_lite_root = "//foundation/ace/ace_engine_lite" +ace_lite_builtin_root = + "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin" +graphic_ui_root = "//foundation/graphic/ui" +test_output_root = "$root_out_dir/test/unittest/jsfwk" + +ace_test_includes = [ + "${aafwk_lite_path}/interfaces/kits/ability_lite", + "${aafwk_lite_path}/interfaces/kits/want_lite", + "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", + "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", + "${appexecfwk_lite_path}/utils/bundle_lite", + "$graphic_ui_root/frameworks", + "$graphic_ui_root/interfaces/kits/animator", + "$graphic_ui_root/interfaces/kits/components", + "$graphic_ui_root/interfaces/kits/dfx", + "$graphic_ui_root/interfaces/kits/events", + "$graphic_ui_root/interfaces/kits/layout", + "$graphic_ui_root/interfaces/kits/themes", + "$graphic_ui_root/interfaces/kits/font", + "//foundation/multimedia/services/media_lite/camera", + "//foundation/multimedia/services/media_lite/camera/hal", + "//third_party/bounds_checking_function/include", + "//third_party/jerryscript/jerry-core/include", + "//third_party/jerryscript/jerry-ext/include/jerryscript-ext", + "//third_party/jerryscript/jerry-port/default/include", + "//third_party/cJSON", + "//utils/native/lite/include", + "$ace_lite_builtin_root/async", + "$ace_lite_builtin_root/base", + "$ace_lite_builtin_root/jsi", + "$ace_lite_root/frameworks/include/context", + "$ace_lite_root/frameworks/src/core", + "$ace_lite_root/frameworks/src/core/animation", + "$ace_lite_root/frameworks/src/core/base", + "$ace_lite_root/frameworks/src/core/base/cache", + "$ace_lite_root/frameworks/src/core/components", + "$ace_lite_root/frameworks/src/core/components/test/unittest/common", + "$ace_lite_root/frameworks/src/core/context", + "$ace_lite_root/frameworks/src/core/directive", + "$ace_lite_root/frameworks/src/core/router", + "$ace_lite_root/frameworks/src/core/jsi", + "$ace_lite_root/frameworks/src/core/modules", + "$ace_lite_root/frameworks/src/core/router", + "$ace_lite_root/frameworks/src/core/stylemgr", + "$ace_lite_root/frameworks/src/core/wrapper", + "$ace_lite_root/test/moduletest/common", +] + +ace_test_configs = [ "$ace_lite_root/frameworks:ace_lite_config" ] + +ace_test_defines = [ + "TDD_ASSERTIONS", + "__LITEOS__", +] + +ace_test_deps = [ + "${aafwk_lite_path}/frameworks/ability_lite:aafwk_abilitykit_lite", + "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", + "//foundation/ace/ace_engine_lite/frameworks:ace_lite", + "//foundation/communication/ipc_lite:liteipc_adapter", + "//foundation/distributedschedule/samgr_lite/communication/broadcast", + "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//foundation/distributedschedule/samgr_lite/samgr_client:client", + "//foundation/graphic/surface", + "//foundation/graphic/ui:lite_ui", + "//foundation/graphic/utils:lite_graphic_utils", + "//foundation/graphic/wms:lite_wms", + "//utils/native/lite/js/builtin:ace_utils_kits", + "//utils/native/lite/kv_store/src:utils_kv_store", +] diff --git a/test/moduletest/common/base_test.cpp b/test/moduletest/common/base_test.cpp new file mode 100755 index 0000000..f79a8aa --- /dev/null +++ b/test/moduletest/common/base_test.cpp @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "base_test.h" + +#include "js_debugger_config.h" + +namespace OHOS { +namespace ACELite { +BaseTest::BaseTest() : globObj_(0), attrsObj_(0), styleObj_(0), componentNameId_(0) {} + +void BaseTest::SetUp(void) +{ + Debugger::GetInstance().SetupJSContext(); + jerry_init(JERRY_INIT_EMPTY); + + globObj_ = jerry_get_global_object(); + attrsObj_ = jerry_create_object(); + JerrySetNamedProperty(globObj_, "attrs", attrsObj_); + + styleObj_ = jerry_create_object(); + JerrySetNamedProperty(globObj_, "staticStyle", styleObj_); + rootComponentMock_.PrepareRootContainer(); +} + +void BaseTest::TearDown() +{ + JsAppContext::GetInstance()->ReleaseStyles(); + jerry_release_value(attrsObj_); + jerry_release_value(styleObj_); + jerry_release_value(globObj_); + jerry_cleanup(); + Debugger::GetInstance().ReleaseJSContext(); +} + +Component *BaseTest::GetRenderedComponent(uint16_t componentKeyId) const +{ + jerry_value_t children = jerry_create_null(); + Component *component = ComponentFactory::CreateComponent(componentKeyId, globObj_, children); + rootComponentMock_.RenderComponent(*component); + jerry_release_value(children); + return component; +} + +ColorType BaseTest::GetRGBColor(int32_t colorIntValue) const +{ + uint32_t colorValue = colorIntValue; + uint8_t red8 = uint8_t((colorValue & TEXT_RED_COLOR_MASK) >> RED_COLOR_START_BIT); + uint8_t green8 = uint8_t((colorValue & TEXT_GREEN_COLOR_MASK) >> GREEN_COLOR_START_BIT); + uint8_t blue8 = uint8_t((colorValue & TEXT_BLUE_COLOR_MASK)); + return Color::GetColorFromRGB(red8, green8, blue8); +} + +void BaseTest::UpdateNumAttributeOrStyleValue(Component *component, + const char *attributeName, + const int32_t newNumValue, + const bool isToSetAttribute) const +{ + if (component == nullptr) { + HILOG_WARN(HILOG_MODULE_ACE, "UpdateNumAttributeOrStyleValue component is null\n"); + return; + } + jerry_value_t attrName = jerry_create_string(reinterpret_cast(attributeName)); + jerry_value_t attrValue = jerry_create_number(newNumValue); + if (isToSetAttribute) { + jerry_set_property(attrsObj_, attrName, attrValue); + } else { + jerry_set_property(styleObj_, attrName, attrValue); + } + component->UpdateView(KeyParser::ParseKeyId(attributeName), attrValue); + jerry_release_value(attrName); + jerry_release_value(attrValue); +} + +void BaseTest::UpdateCharAttributeOrStyleValue(Component *component, + const char *attributeName, + const char *newCharValue, + const bool isToSetAttribute) const +{ + if (component == nullptr) { + HILOG_WARN(HILOG_MODULE_ACE, "UpdateCharAttributeOrStyleValue component is null\n"); + return; + } + jerry_value_t attrName = jerry_create_string(reinterpret_cast(attributeName)); + jerry_value_t attrValue = jerry_create_string(reinterpret_cast(newCharValue)); + if (isToSetAttribute) { + jerry_set_property(attrsObj_, attrName, attrValue); + } else { + jerry_set_property(styleObj_, attrName, attrValue); + } + component->UpdateView(KeyParser::ParseKeyId(attributeName), attrValue); + jerry_release_value(attrName); + jerry_release_value(attrValue); +} + +uint16_t BaseTest::SetCompnentNameId(const char *componentName) +{ + if (componentName == nullptr) { + HILOG_WARN(HILOG_MODULE_ACE, "null component name\n"); + return K_UNKNOWN; + } + uint8_t maxLength = 9; + char *tarComponentName = (char *)malloc(maxLength); + if (tarComponentName == nullptr) { + HILOG_WARN(HILOG_MODULE_ACE, "alloc memory fail\n"); + return K_UNKNOWN; + } + tarComponentName[0] = '\0'; + bool copyRes = false; + if (!strcmp(componentName, "progress")) { + if (strcpy_s(tarComponentName, maxLength, "progress") == 0) + copyRes = true; + } else if (!strcmp(componentName, "chart")) { + if (strcpy_s(tarComponentName, maxLength, "chart") == 0) + copyRes = true; + } else if (!strcmp(componentName, "marquee")) { + if (strcpy_s(tarComponentName, maxLength, "marquee") == 0) + copyRes = true; + } + + if (copyRes) { + componentNameId_ = KeyParser::ParseKeyId(tarComponentName, strlen(tarComponentName)); + } else { + componentNameId_ = K_UNKNOWN; + } + free(tarComponentName); + tarComponentName = nullptr; + return componentNameId_; +} +} // namespace ACELite +} // namespace OHOS diff --git a/test/moduletest/common/base_test.h b/test/moduletest/common/base_test.h new file mode 100755 index 0000000..18d54d8 --- /dev/null +++ b/test/moduletest/common/base_test.h @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_TEST_CONSTANTS_H +#define OHOS_ACELITE_TEST_CONSTANTS_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif + +#include "component_factory.h" +#include "js_app_environment.h" +#include "root_component_mock.h" +#include "root_view.h" +#include "stylemgr/app_style_item.h" +#include "stylemgr/app_style_manager.h" +#include "test_common.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class BaseTest : public testing::Test { +#else +class BaseTest { +#endif +public: + BaseTest(); + virtual ~BaseTest(){}; + void SetUp(); + void TearDown(); + +protected: + jerry_value_t globObj_; + jerry_value_t attrsObj_; + jerry_value_t styleObj_; + uint16_t componentNameId_; + + Component *GetRenderedComponent(uint16_t componentKeyId) const; + ColorType GetRGBColor(int32_t colorIntValue) const; + void UpdateNumAttributeOrStyleValue(Component *component, + const char *attributeName, + const int32_t newNumValue, + bool isToSetAttribute) const; + void UpdateCharAttributeOrStyleValue(Component *component, + const char *attributeName, + const char *newCharValue, + bool isToSetAttribute) const; + uint16_t SetCompnentNameId(const char *componentName); + +private: + RootComponentMock rootComponentMock_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_TEST_CONSTANTS_H diff --git a/test/moduletest/common/basic_tdd_test.cpp b/test/moduletest/common/basic_tdd_test.cpp new file mode 100755 index 0000000..803c70f --- /dev/null +++ b/test/moduletest/common/basic_tdd_test.cpp @@ -0,0 +1,233 @@ +/* + * Copyright (c) 2021 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. + */ +#include "basic_tdd_test.h" +#include +#include +#include "common/graphic_startup.h" +#include "common/task_manager.h" +#include "component_utils.h" +#include "descriptor_utils.h" +#include "dock/screen_device_proxy.h" +#include "event_injector.h" +#include "js_app_context.h" +#include "js_app_environment.h" +#include "root_view.h" + +namespace OHOS { +namespace ACELite { +BasicTddTest::BasicTddTest() : rootComponent_(nullptr) {} +BasicTddTest::~BasicTddTest() {} + +ScreenDevice *BasicTddTest::display_ = nullptr; +Window *BasicTddTest::window_ = nullptr; +pthread_t BasicTddTest::tickThread_ = -1; +bool BasicTddTest::isTickTaskRunning_ = false; + +// 10ms a tick +constexpr uint16_t TICK = 10000; +constexpr uint32_t SWIPE_TIME = 100; + +void BasicTddTest::SetUpTestCase(void) +{ + GraphicStartUp::Init(); + isTickTaskRunning_ = true; + + display_ = new ScreenDevice(); + ScreenDeviceProxy::GetInstance()->SetDevice(display_); + ScreenDeviceProxy::GetInstance()->SetScreenSize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + + WindowConfig config = {}; + uint16_t width = GetHorizontalResolution(); + uint16_t height = GetVerticalResolution(); + config.rect.SetRect(0, 0, width - 1, height - 1); + window_ = Window::CreateWindow(config); + RootView *rootView = RootView::GetInstance(); + rootView->SetPosition(0, 0); + rootView->SetWidth(width); + rootView->SetHeight(height); + window_->BindRootView(rootView); + + if (pthread_create(&tickThread_, nullptr, TickHandler, nullptr) == 0) { + HILOG_DEBUG(HILOG_MODULE_ACE, "[BasicTddTest::SetUpTestCase]: Success to fork tick thread."); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "[BasicTddTest::SetUpTestCase]: Failed to fork tick thread."); + } +} + +void BasicTddTest::TearDownTestCase(void) +{ + isTickTaskRunning_ = false; + if (window_ != nullptr) { + Window::DestoryWindow(window_); + window_ = nullptr; + } + if (display_ != nullptr) { + delete display_; + display_ = nullptr; + } +} + +void BasicTddTest::SetUp() +{ + JsAppEnvironment::GetInstance()->InitJsFramework(); + EventInjector *injector = EventInjector::GetInstance(); + if (!injector->IsEventInjectorRegistered(EventDataType::POINT_TYPE)) { + injector->RegisterEventInjector(EventDataType::POINT_TYPE); + } + injector->SetWindowId(window_->GetWindowId()); +} + +void BasicTddTest::TearDown() +{ + JsAppEnvironment::GetInstance()->Cleanup(); + + EventInjector *injector = EventInjector::GetInstance(); + if (injector->IsEventInjectorRegistered(EventDataType::POINT_TYPE)) { + injector->UnregisterEventInjector(EventDataType::POINT_TYPE); + } +} + +JSValue BasicTddTest::RunJS(const char *bundle, const uint32_t size) const +{ + return jerry_eval(reinterpret_cast(bundle), size, JERRY_PARSE_NO_OPTS); +} + +JSValue BasicTddTest::CreatePage(const char *bundle, const uint32_t size) +{ + JSValue page = RunJS(bundle, size); + if (JSError::Is(page)) { + return JSUndefined::Create(); + } + JSGlobal::Set("$root", page); + CallLifecycle(page, "onInit"); + JSValue rootEl = JSObject::Call(page, "$render"); + if (JSUndefined::Is(rootEl) || JSError::Is(rootEl)) { + HILOG_ERROR(HILOG_MODULE_ACE, "[BasicTddTest::CreatePage]: Failed to render page."); + JSRelease(rootEl); + JSRelease(page); + return JSUndefined::Create(); + } + CallLifecycle(page, "onReady"); + rootComponent_ = ComponentUtils::GetComponentFromBindingObject(rootEl); + if (rootComponent_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "[BasicTddTest::CreatePage]: Failed to get root component."); + JSRelease(rootEl); + JSRelease(page); + return JSUndefined::Create(); + } + uint16_t horizontalResolution = GetHorizontalResolution(); + uint16_t verticalResolution = GetVerticalResolution(); + ConstrainedParameter rootViewParam(horizontalResolution, verticalResolution); + Component::BuildViewTree(rootComponent_, nullptr, rootViewParam); + rootComponent_->OnViewAttached(); + UIView *view = rootComponent_->GetComponentRootView(); + if (view == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "[BasicTddTest::CreatePage]: Failed to get page root view."); + JSRelease(rootEl); + JSRelease(page); + return JSUndefined::Create(); + } + RootView *rootView = RootView::GetInstance(); + rootView->Add(view); + rootView->Invalidate(); + CallLifecycle(page, "onShow"); + return page; +} + +void BasicTddTest::DestroyPage(JSValue page) +{ + RootView *rootView = RootView::GetInstance(); + rootView->RemoveAll(); + rootView->Invalidate(); + CallLifecycle(page, "onHide"); + CallLifecycle(page, "onDestroy"); + ComponentUtils::ReleaseComponents(rootComponent_); + rootComponent_ = nullptr; + JsAppContext::GetInstance()->ReleaseStyles(); + JSGlobal::Del("$root"); + JSRelease(page); +} + +void BasicTddTest::Click(int16_t x, int16_t y) const +{ + Point point = {x, y}; + EventInjector *injector = EventInjector::GetInstance(); + if (injector->SetClickEvent(point)) { + HILOG_DEBUG(HILOG_MODULE_ACE, "[BasicTddTest::Click]: Success to inject CLICK event on (%d, %d)\n", x, y); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "[BasicTddTest::Click]: Failed to inject CLICK event on (%d, %d)\n", x, y); + } + // Waiting for tick breath. + const uint8_t count = 50; + usleep(count * TICK); +} + +void BasicTddTest::LongPress(int16_t x, int16_t y) const +{ + Point point = {x, y}; + EventInjector *injector = EventInjector::GetInstance(); + if (injector->SetLongPressEvent(point)) { + HILOG_DEBUG(HILOG_MODULE_ACE, "[BasicTddTest::LongPress]: Success to inject LONGPRESS event on (%d, %d)\n", x, + y); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "[BasicTddTest::LongPress]: Failed to inject LONGPRESS event on (%d, %d)\n", x, + y); + } + // Waiting for tick breath. + const uint8_t count = 200; + usleep(count * TICK); +} + +void BasicTddTest::Swipe(int16_t startX, int16_t startY, int16_t endX, int16_t endY) const +{ + Point startPoint = {startX, startY}; + Point endPoint = {endX, endY}; + EventInjector *injector = EventInjector::GetInstance(); + if (injector->SetDragEvent(startPoint, endPoint, SWIPE_TIME)) { + HILOG_DEBUG(HILOG_MODULE_ACE, + "[BasicTddTest::Swipe]: Success to inject SWIPE event from (%d, %d) to (%d, %d)\n", startX, startY, + endX, endY); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "[BasicTddTest::Swipe]: Failed to inject SWIPE from (%d, %d) to (%d, %d)\n", + startX, startY, endX, endY); + } + + // Waiting for tick breath. + const uint8_t count = 150; + usleep(count * TICK); +} + +void *BasicTddTest::TickHandler(void *args) +{ + prctl(PR_SET_NAME, "TickTask"); + while (isTickTaskRunning_) { + // Periodically call TaskHandler(). It could be done in a timer interrupt or an OS task too. + TaskManager::GetInstance()->TaskHandler(); + // Just to let the system breathe + usleep(TICK); + } + return nullptr; +} + +void BasicTddTest::CallLifecycle(JSValue page, const char *lifecycle) const +{ + JSValue func = JSObject::Get(page, lifecycle); + if (JSFunction::Is(func)) { + JSRelease(JSFunction::Call(func, page, nullptr, 0)); + } + JSRelease(func); +} +} // namespace ACELite +} // namespace OHOS diff --git a/test/moduletest/common/basic_tdd_test.h b/test/moduletest/common/basic_tdd_test.h new file mode 100755 index 0000000..2d7cf10 --- /dev/null +++ b/test/moduletest/common/basic_tdd_test.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef OHOS_ACELITE_BASIC_TDD_TEST_CONSTANTS_H +#define OHOS_ACELITE_BASIC_TDD_TEST_CONSTANTS_H + +#ifdef TDD_ASSERTIONS +#include +#include +#else +#include +#endif +#include "component.h" +#include "dock/screen_device_proxy.h" +#include "test_common.h" +#include "window/window.h" +#include "wrapper/js.h" + +namespace OHOS { +namespace ACELite { +#ifdef TDD_ASSERTIONS +using namespace std; +using namespace testing::ext; +class BasicTddTest : public testing::Test { +#else +class BasicTddTest { +#endif +public: + BasicTddTest(); + virtual ~BasicTddTest(); + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); + +protected: + JSValue RunJS(const char *bundle, const uint32_t size) const; + JSValue CreatePage(const char *bundle, const uint32_t size); + void DestroyPage(JSValue page); + void Click(int16_t x, int16_t y) const; + void LongPress(int16_t x, int16_t y) const; + void Swipe(int16_t startX, int16_t startY, int16_t endX, int16_t endY) const; + +private: + static void *TickHandler(void *args); + static ScreenDevice *display_; + static Window *window_; + static pthread_t tickThread_; + static bool isTickTaskRunning_; + void CallLifecycle(JSValue page, const char *lifecycle) const; + + Component *rootComponent_; +}; +} // namespace ACELite +} // namespace OHOS +#endif // OHOS_ACELITE_BASIC_TDD_TEST_CONSTANTS_H diff --git a/test/moduletest/common/test_app/ui_auto_test/.gitignore b/test/moduletest/common/test_app/ui_auto_test/.gitignore new file mode 100644 index 0000000..a6f89c2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/.gitignore @@ -0,0 +1 @@ +/target/ \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/config.json b/test/moduletest/common/test_app/ui_auto_test/config.json new file mode 100755 index 0000000..9a67e29 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/config.json @@ -0,0 +1,158 @@ +{ + "app": { + "bundleName": "com.company.ui_auto_test", + "version": { + "code": 1, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 3, + "target": 3 + } + }, + "deviceConfig": { + "default": {} + }, + "module": { + "description": "", + "deviceType": [ + "fitnessWatch", + "smartVision" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "name": "default", + "icon": "res/drawable", + "label": "ui_auto_test", + "type": "page" + } + ], + "js": [ + { + "name": "default", + "pages": [ + "pages/index/index", + "pages/div/01/index", + "pages/div/02/index", + "pages/div/03/index", + "pages/div/33/index", + "pages/div/34/index", + "pages/div/35/index", + "pages/list/list1/index", + "pages/list/list2/index", + "pages/list-item/item1/index", + "pages/list-item/item2/index", + "pages/list-item/item3/index", + "pages/list-item/item4/index", + "pages/scroll/scroll1/index", + "pages/scroll/scroll2/index", + "pages/scroll/scroll3/index", + "pages/scroll/scroll4/index", + "pages/scroll/scroll5/index", + "pages/scroll/scroll6/index", + "pages/canvas/indexAPI/index", + "pages/canvas/indexAPIAttr1/index", + "pages/canvas/indexAPIAttr2/index", + "pages/canvas/indexAPIDraw1/index", + "pages/canvas/indexAPIDraw2/index", + "pages/canvas/indexAPIPerformance/index", + "pages/canvas/indexAPIScenario/index", + "pages/canvas/indexAPIBeginPath/index", + "pages/canvas/indexAPIRect/index", + "pages/canvas/indexAPIStroke/index", + "pages/canvas/indexAPIMoveTo/index", + "pages/canvas/indexAPILineTo/index", + "pages/canvas/indexAPIArc/index", + "pages/canvas/indexAPIClosePath/index", + "pages/div/35/index", + "pages/div/36/index", + "pages/chart/0304/index", + "pages/chart/0506/index", + "pages/chart/1819/index", + "pages/chart/20/index", + "pages/chart/21/index", + "pages/chart/22/index", + "pages/chart/23/index", + "pages/chart/24/index", + "pages/chart/25/index", + "pages/chart/26/index", + "pages/chart/27/index", + "pages/chart/28/index", + "pages/chart/29/index", + "pages/chart/30/index", + "pages/image/01/index", + "pages/image/02/index", + "pages/image/04/index", + "pages/image/05/index", + "pages/image-animator/01/index", + "pages/arc/index", + "pages/picker_view/attr006/index", + "pages/picker_view/attr007/index", + "pages/picker_view/attr008/index", + "pages/picker_view/event001/index", + "pages/picker_view/event002/index", + "pages/picker_view/event003/index", + "pages/picker_view/event004/index", + "pages/picker_view/bind001/index", + "pages/picker_view/bind002/index", + "pages/picker_view/bind003/index", + "pages/picker_view/bind004/index", + "pages/router/01/index", + "pages/router/02/index", + "pages/router/03/index", + "pages/router/04/index", + "pages/router/page2/page2", + "pages/router/page3/page3", + "pages/swiper/SwiperA06/index", + "pages/swiper/SwiperA15/index", + "pages/swiper/SwiperA16/index", + "pages/swiper/SwiperA17/index", + "pages/swiper/SwiperA18/index", + "pages/swiper/SwiperA20/index", + "pages/swiper/SwiperC01/index", + "pages/swiper/SwiperC02/index", + "pages/swiper/SwiperE01/index", + "pages/swiper/SwiperE02/index", + "pages/swiper/SwiperE03/index", + "pages/swiper/SwiperS01/index", + "pages/swiper/SwiperS02/index", + "pages/switch/SwitchA04/index", + "pages/switch/SwitchE01/index", + "pages/switch/SwitchE02/index", + "pages/switch/SwitchE03/index", + "pages/switch/SwitchE04/index", + "pages/switch/SwitchS01/index", + "pages/switch/SwitchS02/index", + "pages/style/StyleBaseTest001/index", + "pages/resource/resource005/index", + "pages/resource/resource007/index", + "pages/data-binding/01/index", + "pages/data-binding/02/index", + "pages/directive/01/index", + "pages/directive/02/index", + "pages/directive/03/index", + "pages/directive/04/index", + "pages/global/index", + "pages/lifecycle/index", + "pages/input/ButtonB023/index", + "pages/input/InputEventTest024/index", + "pages/input/CheckboxB025/index", + "pages/input/CheckboxE026/index", + "pages/input/CheckboxE027/index", + "pages/input/ButtonA028/index", + "pages/input/CheckboxA029/index", + "pages/input/ButtonB30/index", + "pages/input/RadioEventTest031/index", + "pages/switch-radio-width/width_switch_value_test009/index", + "pages/switch-radio-width/width_radio_value_test010/index" + ] + } + ], + "reqPermissions": [] + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/app.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/app.js new file mode 100644 index 0000000..d7175e7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/app.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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. + */ +// for ui_auto_test +export default { + onCreate() { + console.info("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/234.jpg b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/234.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6ebbe6521fa8f6b75d263cf9a6858529fc86fa87 GIT binary patch literal 10591 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/a3.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/a3.png new file mode 100644 index 0000000000000000000000000000000000000000..6ebbe6521fa8f6b75d263cf9a6858529fc86fa87 GIT binary patch literal 10591 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/0.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/0.png new file mode 100644 index 0000000000000000000000000000000000000000..58918fa1663249918c71112a514107b2f2075cf3 GIT binary patch literal 1653 zcmV-*28#KKP)FvyU53Kr_0BB|>0A~OP0$cV$Thl~;20jIz1LjKlVqioP8yZ!BW_B5H0k9*q zK34t!JOx}i8X!jnpqcFt+y?BI0dA*d{v#Xl9oKR{@(AoZ#=kLP_Tp?Bn02I|FEDQ-JG%%{rKvYvQevW|r=&6M$wm z4!8%{ru2mR+IP!5S<>?*`|Jwf3&0TrG#C*k1}u?uR7AL~OmTo_HUqc@*dSq$e*qr@ z?*abz=8ccIMM4`c`Xg|Kq`8Up!s0~%n%OSEg$pYN$5XGv^2okt^vS$!BLI4Z<*O5;1po3V4L3pQzbnVlur^X2CzBPz6R_S9MMni z;z)8WTVpY^U4bWoorCTAUbsNgxk33Pv62AK0&WL3363bd)XeM#;8I}SVA~%72T1Z` z-#|-AfWC*F9kjfzeKRE88JS&k6nq%iE+P+n4_qSY{-AtVtO&qn`Mw40795FN-0_k= z3Cd$;9zbw|5-ETBYLGN7BAg;q3gC&r-9Xgsctq04DFZjNR0H*537@bOz-xi&LF@Y) zaGfLv5-w(z`jM7<^k>lfU@3sUKb;h$;gRMkk{%1nuMlf|%*DV?!Fpc;XG&TUln;rO z0_dUly+b2_&w+_;!t`eLMsq@mbmbQKB1sQMgrhP82WV#d0*?aQ2M6)4qF_o)GBfWd>LC9O%o}vDwFE%F9J&ke+qFpX2=b(e z;82+smbi6aYZ_k(fGO^UAG7Y2bbdzw2ky$00GQ&!WbI34c209#+$i_~T5lI!YGBH~ zlnXF*yQl#BHNnhM0lp&X(4e-4#7ZpT6b<~P37*~*8to9F766w?ik{CyLmF*>SYIMaNSD;HjRsoR9<9`gmn#F9C-IC)?`kV5GK70Q9rwLSXBWI&c2p`m)E&-cQK8 zX?=C@U-K9^K<_MZVqXK3Bs~)ZzCz5*4hB5mC7N^irlf;X`iRJu0_gdG{?;Q>S_Kr$ zEM>1PmLF3JV2X8g$jSbhnRzz;MuHv@3m8cU}=DE zOgv9!&lZFC=MBDpxew>zsz|_~zZ?G$o(tpQu41Jqz(#vKwB=8{O1_U93do@^1tvs{ zQV!kX02_!80H-Cs@5q_gh|eW*8t<>$6+kyAPc)H}(tUc=Wu~NI4bh;$6}Q5xt*Mpo zI~D+*KUfN4r|^7^r6w}$hi;y0`KwJ2H1vKNzAR<9aZ0cH}& ztX?&+0?Z_kS-omt1(-=7vwGFQ3NVvEX7zsnUPLo*>4rFe00000NkvXXu0mjfEF1d_ literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/1.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/1.png new file mode 100644 index 0000000000000000000000000000000000000000..110146afd5d63e603bbc1cb5de2d81ad034632c3 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdoh8U=sFpaSW-5dwXYZmI$MS+r!Tb zTRDWZwY?8o&7B)4sP7QKk&&93DY$XNhL21x(ysakoHmH>W$<2IqI9nzBC&#`+HV;^#L^M%BxKW{OWeRq9eTJTw7&%-14!>%?@Wj*vTis@bWca9wf z5C5>(IJ|lneV{l&Sgqb)e8cYb4E~L;56tAe+RGoQmr$P1XnkO-=mS21>8v;IK5uA0 zQ2W5BASlxcY!w$F@1%J9gh^*xvZr_@2bGAOG&NmVH-$a7UUy{qyEsvjI>F#qM~c;I8HIny8J8uon*?^nHgeSe)lx6P7EcMt39gj{{D zX>P)}Ttl|Fr-7-B>ERtFRvy+vJ6UmrQS^d_g$@?m9T=S(3-TH%($LnRp1W^aeRa_! j0al)PT}Hh2zGqzOVv+EwcG`SkDq-++^>bP0l+XkKiiPX$ literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/2.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/2.png new file mode 100644 index 0000000000000000000000000000000000000000..4a3103f624567dedb15d92c2118cc68e818cd492 GIT binary patch literal 1322 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/4.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/4.png new file mode 100644 index 0000000000000000000000000000000000000000..6c9f0386393f9c52ffd6dd2a8893716ba229bf21 GIT binary patch literal 871 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdoh8VAk_=aSW-5dprAVcYmPBaeH=d zu}_;^PBuAh3@uypX33sb7opVFNgFp#>=jWB3igrESGCsO{8@cQ@7t7a6)}rlJCl#? z`7^J&KK+u<_v-7w(Jboxe>V)VQzxEh=HK`Swn`Y0SnQlXSb8_0PO{ zU{P-Q!M|T$wQ-%Ucha;wWeUErjBDb*+c8c*`{v%0Cztjxb6?*(|3I>_x9VN{#hDGF zvC}5bDc#TU;K-G`%y-zYmA+{>e(B-PnM=d|ZMnFF`E%X+CpnLce)r*wm{n5R%iEJb%-F0WQ#YweK4Y15@PS3^ z1sLCO-)`|>U^Vbi(3sAQm1<^qzPQHm>LDfzc}|x3o_rz)6dD)A;GzDQ2fb`h$ZA;n R9GHO^JYD@<);T3K0RZ^#g%JP% literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/5.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/5.png new file mode 100644 index 0000000000000000000000000000000000000000..ff7fedf85dca29fa694b7b118bf38f1e1b26a5b2 GIT binary patch literal 1291 zcmaKs{Xf$Q0LQ=kez&=1ykhilNQYIPWeSDRq%}EFq0quC+dN!j$+W)Gd8jnz;j9oZ zUO0t?E@9an>WWS&4@KL`%VnWYJ1YxMG#S7@jT+*_M(o>d2{|bUqX96X@@i(Jv4z-lU}(b ztzb!5ULVz-1MWkb^$Au6L40;d9U>s$0$PX&uqtSfIDd=D+khu?reZDofYN>6xy!W^ z(MHkKo75^n6RH`(&P{dp;TF|e8Y($Q7+{8BN9$NkH&_Fzu*u<3UZT-`D218qg`{8s z;{xY-_@fjASp#wN?f0t&Dml$Alc@d)aB1s>UE#gB%)Uk*S{5t|mx(ul=&#tX#$>vI z`U$@@w)IYxz((Uu&_$^rq3OK*E%s7_J=(=zQ~yH{i<6Yw7mz8ORmtQWB45j0_%RO8~Bed}eZW5UNW#h5tK}R9}L1yE~6| zDm-Nmw;*Ubs?NaSX~b!kW$>zCJ!?%Gc$XarTiyYd9;k}pm`NPJSzp0PB+?PsU;9+* zFSeAH1eZ$geC%W;?eo9{XUOeGfcD77(SwQHRHA%rhYn7?1i7?LWvZ**Jd2E?t@O^3*8gTup2DObl5Jjv~ge)=oR$*${2Zj565L4tOpLUSAOIOqqtRm2;d zN!UU^4paF%k#S7nxE2px-Z7VhNfv}wXNsT@YE3N;q}KFhV-!BJrCc66svzZ%k-+=S z?+6!yREGxt=mtu`ypVx5F#TJ06aD{K@Mh zIkM%C&|X1~;Pr^v)RF@|a8FEDEsn-L#f#R1ix>&qb7P!)4E$Lg`?Ru`K4M6GwvZ;f z(OqU6e^AkDfntE=9gDP36XoJmx-5aD8&@Y#(>c{+3l>Kwm~1-SWcQ`2(aOe|Ix$4@bcA^#^0ESy~wX7ty7w+d-xE+mXa+ zd+t~|6EKq;7x&}eiR8tbaNa%UQwtU68$vu5>bA~Cvxt2b{P(?gBQ>W}8>_>Xhd0h_ zMN7YaFqsXj>ZV;gVSYdLc2iJQg`ocun9|bOHhTmPE#x5=%U({LH$GRnaJh`z8Qvxm zA5pJyL^j%HFV$;TJaeTRCtJD}-)QxzossV9)6c);oPfBMi~0Y|@^|9zUu3@TCpcZN rXVDuF0U6u%C{Wq{&4)zP|L1bj(@+*gSto5>Jvo5n7f5XOrCj(IvsqdV literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/6.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/6.png new file mode 100644 index 0000000000000000000000000000000000000000..ae76057560dac86d976feadc4ccd242969a70f7e GIT binary patch literal 1618 zcmV-Y2CeytP)4B!UF}+-46vW z1oj2iN}NkK@y~%%&Fq;9`s&)nKmc_2y@9KM{ejggob2cWboUE@OM#6m1lQ_nbODBg z;TGVOjzghJj-v@Mz`Gwf3|O^FVjX>rEWo+I$(iAa<>&!)_Zh%hHNYD^fbK4E*8&?9 zShjxy-vI9eA9d(&2W$&$)^UoDjs?2=PQW9;_KENmSu6%-nAx){(+zv;nPGd_75H*w z{6KfV7Z?w$5(&_O=YfmO?4?MZ8gvueyJ2xRjrnoIv2o{6IcM>1@=hT?_weAu({dHE{|16mCFS%B?3tubEmAqx}N2sbPN>P(TzBwR2FtvRLOf@qdY?ZcL0A~a8<%%@z ziT424bvnkO=AjpJ4zOuL=h2A{8MB2nS*pvEC0raNfZywmjG4*(>Dda@ zS$@>EVrF;u>^wmr7r@&Al^0|C*AiP`W+x(lZNK#zHeYD(N9X zI3Z~vjn~Xf5l>|;mjx;{uk7;rkt1CpofWCGOw8S5%LWo(YGym9^xsQ17eFOP<;!i^ zYXIT*24E+s#HBUY%qB*{UO_C;0*7M>ho$u>5F3AXP3gw~O?*+qafk$fDe-WjD51b9 zT-egbdYM`FzyL5MsamM4>F!$gDgo$2oL)_(1Jz3^P4(vlsL!)r1Y%CTIwBE$5~h1M z3wn`G`8^xJV1;vlNs<1hCU~})=`Kyr=I-MFWqr2jDg2+n+rU0m*GO^$OugEsO5S)g zTe>nRA+7aLxHb|qhin&@Vjdp(g1d_)x*1x^OMnSu70Cm zDAxf{S(zIWZ|3W3OQp4Dwl6t%pQ6k%utVgwuxuwOlIe*BogHA<3l{=MBuu(Bex;y( z3;)qK!fV7%tWEAyU}CN>HtPbY&`ya=-EXP04QE-i8zFbs?Sp9ri$X=94{u?8tl7G| ztWe*`RryVD*Y~B|A8>5dZcFFGYFWbV53K>BEKj$z|a?;~6T>|Wq>?t~*(<#pgPGt<4q+FIWLwr1$=@)PxMx5(T4?QoPJ zcmtSaX0vLe*7l&j18f7?`co$d2S-`ufOg+cS3LymYv99vUh8dtQ3C_8AJ$XFGaG;< zDK-EbfF%i(RBtS>0a%hiN%h788-OJVlvHmlumM<-KuPt+0vmuO36xa-7q40OV3uB~ Q{Qv*}07*qoM6N<$f^XjQz5oCK literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/7.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/asserts/numbers/7.png new file mode 100644 index 0000000000000000000000000000000000000000..88b8aa00eb2aaba21a002e70d8fbe231e3f3da9c GIT binary patch literal 1120 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/goAhead.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/goAhead.png new file mode 100644 index 0000000000000000000000000000000000000000..92e794f982c5520512248f03d92f016decd2b98b GIT binary patch literal 615 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/icon.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6ebbe6521fa8f6b75d263cf9a6858529fc86fa87 GIT binary patch literal 10591 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/chart.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/chart.js new file mode 100644 index 0000000..7d6a6d3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/chart.js @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2021 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 const datasets = [ + { + fillColor: "#00ff00", + data: [18, 55, 64, 80, 45, 29], + gradient: false + }, + { + strokeColor: "#0000FF", + fillColor: "#00ff00", + data: [20, 50, 30, 35, 40, 76], + gradient: false + } +]; +export const xAxis = { + min: 0, + max: 100, + axisTick: 6, + display: true, + color: "#00ff00" +}; +export const yAxis = { + min: 0, + max: 100, + axisTick: 10, + display: true, + color: "#ff0000" +}; +export const appendDataFunc = function() { + return { + serial: 1, + data: [50, 70, 90, 65, 50, 10, 50] + }; +}; +export const datasetsFor232426 = [ + { + fillColor: "#00ff00", + data: [212, 250, 400, 150, 350, 212], + gradient: false + }, + { + strokeColor: "#0000FF", + fillColor: "#00ff00", + data: [100, 300, 178, 205, 401, 126], + gradient: false + } +]; +export const datasetsFor272829 = [ + { + fillColor: "#00ff00", + data: [212, 250, 400, 150, 350, 212, 300, 222, 190], + gradient: false + }, + { + strokeColor: "#0000FF", + fillColor: "#FFE793", + data: [100, 300, 178, 50, 401, 126, 600, 80], + gradient: false + } +]; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/general.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/general.js new file mode 100644 index 0000000..a69a381 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/general.js @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2021 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 router from "@system.router"; +export const routePage = function(prevUri, nextUri) { + return { + changePrev() { + router.replace({ + uri: prevUri + }); + }, + backMain() { + router.replace({ + uri: "pages/index/index" + }); + }, + changeNext() { + router.replace({ + uri: nextUri + }); + } + }; +}; +export const goPage = function(prevUri, nextUri) { + return { + goPrevious: function() { + router.replace({ uri: prevUri }); + }, + goHome: function() { + router.replace({ uri: "/" }); + }, + goNext: function() { + router.replace({ uri: nextUri }); + } + }; +}; +export const alterPage = function(prevUri, nextUri) { + return { + backMain() { + router.replace({ uri: "pages/index/index" }); + }, + prePage() { + router.replace({ uri: prevUri }); + }, + nextPage() { + router.replace({ uri: nextUri }); + } + }; +}; +export const routeSimplePage = function(page) { + return function changePage() { + router.replace({ uri: page }); + } + ; +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/list.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/list.js new file mode 100755 index 0000000..8325575 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/list.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 const setResource = function() { + for (var i = 0; i < 50; i++) { + this.listData.push("common/left.png"); + this.listData.push("common/right.png"); + this.listData.push("common/music_prev.png"); + this.listData.push("common/music_next.png"); + this.listData.push("common/music_play.png"); + this.listData.push("common/goAhead.png"); + } +}; +export const listData = [ + "common/left.png", + "common/right.png", + "common/music_prev.png", + "common/music_next.png", + "common/music_play.png", + "common/goAhead.png" +]; +export const textData = ["Item0", "Item1", "Item2", "Item3"]; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/picker_view.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/picker_view.js new file mode 100644 index 0000000..7df3cfc --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/js/picker_view.js @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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 const lifeCycleFunc = function() { + return { + onInit: function() { + console.log("onInit called..."); + }, + onDestroy: function() { + console.log("onDestroy called..."); + }, + onReady: function() { + console.log("onReady called..."); + }, + onShow: function() { + console.log("onShow called..."); + } + }; +}; +export const getText = function(e) { + console.log("getText called: new selected=" + e.newSelected); + this.textValue = e.newValue; +}; +export const getTime = function(e) { + console.log("getTime called:hour=" + e.hour + " minute=" + e.minute); + this.textValue = e.hour + ":" + e.minute; +}; +export const data = { + textValue: "time", + rangeList: ["Aa", "Bb", "Cc", "Dd", "Ee", "Ff", "Gg", "Hh", "Ii"] +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/left.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea923f5dd049c09090d1d8a798377a39c7c59c6c GIT binary patch literal 597 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/music_next.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/music_next.png new file mode 100644 index 0000000000000000000000000000000000000000..93ced911b48c2a6c55e211f24a868a1f193db9b5 GIT binary patch literal 1166 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/music_prev.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/music_prev.png new file mode 100644 index 0000000000000000000000000000000000000000..6101ca4c7d2d1c655cab41722a3fcb29032b276b GIT binary patch literal 1195 zcmeAS@N?(olHy`uVBq!ia0vp^9zg8L!3HGfZA^Fsq!^2X+?^QKos)S9a~60+7BevL9R^{>9hE{7QmN2iX@n)hJ|4J*3q%cW%P+8GhP=2c0$qi@XWqXqwxbpxnf9 zy_)&D<>Wu-@0eO|Hr_n*!1^2d#^2`^du-Z0^QPGERIN^fH7@8V$Ew@<_Su8K_ddIF zn>+3JTIPx#ro+n~vKN2*Tx$H~=`;J1HB5&uMPIm>_O0*BjDsH^-bhIM)8N$n@kI=4 z+tSGTSX+q=1HIVCVltWndPfD z9-BK+ym{lnicb`z~mW;qz~^i=XBG7yG=t)Qrzb`T7D|QHf`2-3Kd* zbZ-HTI(&AMZ#i$?=@f%`F_W_b5^fme8A#`RR(~sy!hFuudW{L&^G2t+Yk+RBU1`VKwz8<% zGAn-b38uN)-(2q(|9J6lzA4fx;qUkd-dI*ngP_h$baYlSKY|C?tGB>car{^skD`(i8Ip&N8;75#z^o?+!}C~i|6&U=b|CK zYZ|k{5@yVbVw-yHET>{o{;JT%#8-b7+;L}2S?CwFeS6CZ+m&v>_&)iGZKVJta*Hc@ zyxuvQY8vFsxUk^f_uM0C%bnNxZq+czu`pked-(UOU1!Z*)_Iz07@YBy`tF?lBx=ic zro(qq4K;SMyWUQ@-U+P`$GsDxNt zMnL?wbu(@;HgV)i??m+nK7oUWPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D15imsK~z{r&6rzA zl|c~4Ewc+&ND@d$SF*^!E)+%=ip(e@kiZIxg2I>R@?sP{gw#Wk(2Ed76jBjMkzq+x zf)Z(|NSTr#l1PatC6*znxiyE~`7Y0;-D*W9qSyI;7Y=jX84{ivRE=B&?wwE_aAgXM)q-0bM{W-&HCE=RGV zw7HXWHkX!*35kiYRsf)MFeN2bY`8{TQ{mSb2kJUS*0JZFn-ML2gK`Wj+WLPuazd;WD1EW7lvC9$atvo&sB7n(5Gw^r zUm{#7PzEBRl>%iTB3da>2FAWp=#~CG_D7Clg?**aYd52XCwKKJ?as+3PS2>iA>S%yc3w=`6 zh@fx69rTUabLbmIwKPBpp)){dK{cW?;to1Xbf#1eoi$X;11KSMOH?DeJ#>rQLAOoi z&@H6fh-!HNWgPT=&^w}<(fi^KdWYyeQaSWap;|sb8Ak*wLI;!%B3cnTpmY$?iqHWi z6XA-`0VQK!5kUyCB6L6*!@VMc5Mo8>fHFqd|EvnRB6L7$5-3dqrAeSP36v&*(j-ut d1WH3Bh`-DlB?@Wko^t>I002ovPDHLkV1jOwq|E>T literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/preRow.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/preRow.png new file mode 100644 index 0000000000000000000000000000000000000000..c9bf0b5af12681a6069c4c49d46c966290c23138 GIT binary patch literal 1130 zcmV-w1eN=VP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1OG`xK~z{r?U-9g z)LRtBKW7@V4Aa!ow6U^D(@H9c9zu|UiWA-FhFOsj6a~>+&{L1~R8SN}bvl*jbT2y4 zg&+`uh%Bfy%e$GDm$FQ zQ-IF*4eb44>4a>KNMx+vCJtCKY22VNZqHAgFRd2`)ZM*q8iueGXwuSkh>9P}I@&P| z`B|x~johqkLhCm->+a64sJI+>cKXl`Ub)z_->c%+^ zrGj=K*P5*yibxm{iRDw0SsN)TYv52sS6ee`{=djt1+75QNvTL%v{D>UknQAwHq!L9 z3%6@Nhyz~#cajHM6|F$7wOe_hiOI3i$a5yJHd6Gefd`tPEB>zd4r^7E1I0{qAtiT_ zIAHU1C+rclHGEXJcj7^Pi#VYC!ZGxCJmS<)4wSWJwe1Dp$%aS2-`U?8IL;eC9rDrZd#@YIVs)<$wCB)}Ed`y}B-x@i|{E0_i% zUj1`K6!56=Bg$Gk#Q7+kktPaAnwyI;nK|P0Pzppv*Y;^^61$ookZ ztw2Qets=NP+F8@)zV^n~Wqquinv9s?y}d`9d$MOy6?U zsTA!%L?|o8QlL;)N>D#o%|CD&qti3RnPc{26=CUw`Y=|C3bZI=r)G;AnxFzvrO>C= w!R$w_puVzD5Y!2Uf^Z-+!hy^P2MP@E3%~q-V*2pn%>V!Z07*qoM6N<$g7Y96J^%m! literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/right.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/right.png new file mode 100644 index 0000000000000000000000000000000000000000..0b6229a6897bea531937509888779cd4b36cf7d2 GIT binary patch literal 746 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/xinlvBg.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/xinlvBg.png new file mode 100644 index 0000000000000000000000000000000000000000..bb615ed103863bcc418c77f7a4e99095db080635 GIT binary patch literal 3313 zcmeHKX;72r7EUtZN(eC!kVH`l$Px-8rXY)@39`DR4A>T7t`JJlZ~=t~3dk0;SRkx7 zs30hdwzeZ;01+sQ5lo5}2)z!QN=4#Lr~*bKB1^)3Un-6ZooVm1Kkm%UpZ862&hwn- zoacNqU#5?@7fx%976O65ZQtg;3xPn2!TqA<-@uI*ubl_JAY*oUxgx52*8YM(XkXm! zzV)+sa=Vj>Lewjc0Y{?~lZ!^=ppqU+3n@VuP)X(iDG$kH4pR*|7 z`!qBApGcogu1@e;5H~bRXR?X{N?5A+YCIlkbx_0@Y|Y`k$dg;mmeo7;=gDUkI*NU4 z@N+pX^Bx&v^*y=3O5Y*O&BS3_d)CHnKm+bhekbmqf=Vo*$(3`=-t^!x)2gwf?$ti` z-cIQ_B{MXwxPl!zH2~<^DwT`0YFx5n!yyj?-rf8gqv$G4n@lVHKYmwe#B)%$I@nC} zyeXgv8M;3goDR>g=iOcvV12-iz|#|$w0z7-AGK&Gn6QETA>*(4rLq4T{Pg;qaiyPM zYIdURG@CZ03TUP6`QFxVpzkTAnSSvU&pcJ);JwZa{X$RiV&ApWG2c&-yqbTE;u7gd ze8%*Tnd^05MxlmQJgZV?*vE9&1?`Z+iPNojiQ69kk8ie_tY z9lJAFUs24_=Xj6YM%PLZ0V?Xx#Sv$lLf=o@mtD65lV*Y}Tg@9uH`}D;pM5SP2EZ7w zbXx>yPb3ebly4J;SRW;x6jFkzxh6dreT;v$hoYT8(y$i$-f#lxyc*3Qf7Cgy$T7>& z!pC%kD1vYT26;|&ze+vU*|k}+rF6Kg?{UZ1AF&PvuFI>Pt2@%9;Ei(pER8|D?JK&n z)n2-CH0=}eoOXVnk@QTHta#_)RKLskQ2m;dEnp1pRpo$;SwaoeM zM|rtjdz4ij?+pukjk12ZR=;jiAs2raZ@zNvBvv-8yv`OkUuB`vK|_t(deM`hmcR~b znk(p-4l@iDhvYr2eo*960cy*zu}f>_isA>N8Rb4gw*}Xv3e0)bla$7USTe7mPjaOI zX9v#59cIo;Eu4+&OmFy(6GSogF$t!g6kvCd!32MD$D|Pe!IyzPC?Gc5e1~SCrhm5C z_)$Uz>a4A&9x$5jn1Uhi?GYD4+`XIM#oZnAV1Ia5CIMvz3db~;qbs>0(kGzjx&qS9 zK@Bq*-z?04W#{W!?hc#=09^D1q;qf4%NJ!OqqjKUcDho>*#~h0-ox$N6JN3> zX1T(w#e~CKG44nn_4IPx!mFUHO_qwuuS&ceYDobqhT%|j9SLq~`|C|zI1cgU>A$}( zBTi6OuuSp54--t_>E9^JMxYRAT1t^Q5)iU=$_EV0vryu>c zr~N%}f|XIcUYTpg5I><}nSuRAU*db{%$63Lms(bgfWcPin*_sgo3+ zhj(2dK%Ow`U{+*llA8t0qy)3zibBpBz{z=rI|DH)xjE3PFhY#77mIH?#KP1Ja0i8)5fy^6KyjldD5{MhAPEZPasR;~*RX~>d3G~5Db?+)&-@^XM{ zmP*wDcks-G5q1Uws=aqxg&s`R7c4#$LH~OFh2lZSnd9D&(pM;kyY**+8+~wK$xTF! s`K|pc$Ux86q5s#j=-%HmpAqK5-EZ&Co;M1& literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/xinlvMargin.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/common/xinlvMargin.png new file mode 100644 index 0000000000000000000000000000000000000000..5d969793488cd2af27b4b094319fa5d489a8ed33 GIT binary patch literal 8761 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.css new file mode 100644 index 0000000..b8726ff --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.css @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.hml new file mode 100644 index 0000000..0f51f13 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.hml @@ -0,0 +1,38 @@ + + +
+
+ arc +
+
+ + + {{text}} + +
+
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.js new file mode 100644 index 0000000..6cf52cb --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/arc/index.js @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../common/js/general" +var progresses = [10, 20, 30, 40, 50, 60, 70, 80, 90, 100]; +export default { + data: { + text: 100, + progress: 100, + index: 0 + }, + updateProgress() { + this.progress = progresses[this.index % 10]; + this.text = this.progress; + this.index++; + }, + onInit() { + console.log("init called..."); + }, + longPressTest: function() { + console.log("long press trigger"); + }, + ...routePage('pages/index/index', 'pages/index/index') +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.css new file mode 100644 index 0000000..d8bffb9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.css @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 200px; + margin-top: 0px; +} + +.buttonContainerStyle { + width: 454px; + height: 80px; +} + +.buttonStyle { + width: 200px; + height: 60px; + margin-left: 130px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.hml new file mode 100755 index 0000000..4786755 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.hml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + API + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.js new file mode 100755 index 0000000..9451e2f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPI/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 { goPage, routeSimplePage } from "../../../common/js/general"; +export default { + ...goPage("pages/index/index"), + changePage1: routeSimplePage("pages/canvas/indexAPIAttr1/index"), + changePage2: routeSimplePage("pages/canvas/indexAPIAttr2/index"), + changePage3: routeSimplePage("pages/canvas/indexAPIDraw1/index"), + changePage4: routeSimplePage("pages/canvas/indexAPIDraw2/index"), + changePage5: routeSimplePage("pages/canvas/indexAPIPerformance/index"), + changePage6: routeSimplePage("pages/canvas/indexAPIScenario/index") +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.hml new file mode 100644 index 0000000..c76a4ea --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.hml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.js new file mode 100644 index 0000000..186e63d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIArc/index.js @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPIDraw2/index"), + arc001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + }, + arc002Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.arc(32768,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + }, + arc003Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,-32769,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + }, + arc004Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,32768,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + }, + arc005Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(32768/360),Math.PI*2*(90/360),false); + ctx.stroke(); + }, + arc006Func: function () { + var canvasRef = this.$refs.canvas6; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(-32769/360),false); + ctx.stroke(); + }, + arc007Func: function () { + var canvasRef = this.$refs.canvas7; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360)); + ctx.stroke(); + }, + arc008Func: function () { + var canvasRef = this.$refs.canvas8; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + }, + arc009Func: function () { + var canvasRef = this.$refs.canvas9; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),true); + ctx.stroke(); + }, + arc010Func: function () { + var canvasRef = this.$refs.canvas10; + var ctx = canvasRef.getContext("2d"); + ctx.arc(100,70,50,Math.PI*2*(10/360),Math.PI*2*(1000/360),false); + ctx.lineTo(100,100); + ctx.stroke(); + }, + arc011Func: function () { + var canvasRef = this.$refs.canvas11; + var ctx = canvasRef.getContext("2d"); + ctx.arc(100,70,50,Math.PI*2*(32412/360),Math.PI*2*(32052/360),false); + ctx.lineTo(100,100); + ctx.stroke(); + }, + arc012Func: function () { + var canvasRef = this.$refs.canvas12; + var ctx = canvasRef.getContext("2d"); + ctx.arc(100,70,50,Math.PI*2*(1000/360),Math.PI*2*(10/360),true); + ctx.lineTo(100,100); + ctx.stroke(); + }, + arc013Func: function () { + var canvasRef = this.$refs.canvas13; + var ctx = canvasRef.getContext("2d"); + ctx.arc(100,70,50,Math.PI*2*(-32412/360),Math.PI*2*(-32052/360),true); + ctx.lineTo(100,100); + ctx.stroke(); + } +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.hml new file mode 100644 index 0000000..a865433 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.hml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + canvas属性接口1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.js new file mode 100644 index 0000000..4c4fd53 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr1/index.js @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPI/index"), + fillStyle1Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.fillStyle = "#000000"; + ctx.fillRect(20,20,100,150); + }, + fillStyle2Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.fillStyle = "#FFFFFF"; + ctx.fillRect(20,20,100,150); + }, + fillStyle3Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.fillStyle = "abcdef"; + ctx.fillRect(20,20,100,150); + }, + strokeStyle1Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.fillStyle = "#000000"; + ctx.fillRect(20,20,100,150); + }, + strokeStyle2Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.fillStyle = "#FFFFFF"; + ctx.fillRect(20,20,100,150); + }, + strokeStyle3Func: function () { + var canvasRef = this.$refs.canvas6; + var ctx = canvasRef.getContext("2d"); + ctx.fillStyle = "#ghijkl"; + ctx.fillRect(20,20,100,150); + }, + lineWidth1Func: function () { + var canvasRef = this.$refs.canvas7; + var ctx = canvasRef.getContext("2d"); + ctx.strokeStyle = "#ff0000"; + ctx.lineWidth = "-32768"; + ctx.strokeRect(20,20,100,150); + }, + lineWidth2Func: function () { + var canvasRef = this.$refs.canvas8; + var ctx = canvasRef.getContext("2d"); + ctx.strokeStyle = "#ff0000"; + ctx.lineWidth = "32767"; + ctx.strokeRect(0,0,100,100); + }, + lineWidth3Func: function () { + var canvasRef = this.$refs.canvas9; + var ctx = canvasRef.getContext("2d"); + ctx.strokeStyle = "#ff0000"; + ctx.lineWidth = "abcdef"; + ctx.strokeRect(0,0,100,100); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.hml new file mode 100644 index 0000000..9ff8847 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.hml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + canvas属性接口2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.js new file mode 100755 index 0000000..589b15c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIAttr2/index.js @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPI/index"), + font1Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.font = "30px"; + ctx.fillText("Hello JS", 10, 50); + }, + font2Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.font = "38px"; + ctx.fillText("Hello JS", 10, 50); + }, + font3Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.font = "0px"; + ctx.fillText("Hello JS", 10, 50); + }, + font4Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.font = "255px"; + ctx.fillText("Hello JS", 10, 50); + }, + font5Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.font = "abcpx"; + ctx.fillText("Hello JS", 10, 50); + }, + font6Func: function () { + var canvasRef = this.$refs.canvas6; + var ctx = canvasRef.getContext("2d"); + ctx.font = "30px abcd"; + ctx.fillText("Hello JS", 10, 50); + }, + font7Func: function () { + var canvasRef = this.$refs.canvas7; + var ctx = canvasRef.getContext("2d"); + ctx.font = "30px SourceHanSansSC-Regular"; + ctx.textAlign = "abcd"; + ctx.fillText("Hello JS", 10, 50); + } +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.hml new file mode 100644 index 0000000..ee5e721 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.hml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.js new file mode 100644 index 0000000..d79c62e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIBeginPath/index.js @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPIDraw2/index"), + beginPath001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.rect(10,10,50,50); + ctx.rect(70,70,30,30); + ctx.stroke(); + }, + beginPath002Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.rect(10,10,50,50); + ctx.moveTo(70,10); + ctx.lineTo(80,60); + ctx.stroke(); + }, + beginPath003Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.rect(10,10,50,50); + ctx.lineTo(80,60); + ctx.stroke(); + }, + beginPath004Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.rect(10,10,50,50); + ctx.arc(100,50,50,Math.PI*2*(30/360),Math.PI*2*(150/360),false); + ctx.stroke(); + }, + beginPath005Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.moveTo(20,10); + ctx.lineTo(100,50); + ctx.stroke(); + }, + beginPath006Func: function () { + var canvasRef = this.$refs.canvas6; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.rect(20,10,50,50); + ctx.stroke(); + }, + beginPath007Func: function () { + var canvasRef = this.$refs.canvas7; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.arc(100,50,50,Math.PI*2*(30/360),Math.PI*2*(150/360),false); + ctx.stroke(); + }, + beginPath008Func: function () { + var canvasRef = this.$refs.canvas8; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.arc(100,50,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + }, + beginPath009Func: function () { + var canvasRef = this.$refs.canvas9; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.moveTo(20,10); + ctx.lineTo(100,10); + ctx.stroke(); + }, + beginPath010Func: function () { + var canvasRef = this.$refs.canvas10; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.lineTo(50,10); + ctx.stroke(); + }, + beginPath011Func: function () { + var canvasRef = this.$refs.canvas11; + var ctx = canvasRef.getContext("2d"); + ctx.beginPath(); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.rect(10,10,50,50); + ctx.stroke(); + }, + beginPath012Func: function () { + var canvasRef = this.$refs.canvas12; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.stroke(); + ctx.beginPath(); + ctx.lineTo(80,60); + ctx.stroke(); + }, + beginPath013Func: function () { + var canvasRef = this.$refs.canvas13; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.stroke(); + ctx.beginPath(); + ctx.arc(100,50,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + }, + beginPath014Func: function () { + var canvasRef = this.$refs.canvas14; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.stroke(); + ctx.beginPath(); + ctx.arc(100,50,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + }, + beginPath015Func: function () { + var canvasRef = this.$refs.canvas15; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + ctx.beginPath(); + ctx.arc(100,40,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + }, + beginPath016Func: function () { + var canvasRef = this.$refs.canvas16; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + ctx.beginPath(); + ctx.lineTo(50,10); + ctx.stroke(); + }, + beginPath017Func: function () { + var canvasRef = this.$refs.canvas17; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.arc(100,50,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + ctx.beginPath(); + } +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.hml new file mode 100644 index 0000000..ef4aafd --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.hml @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.js new file mode 100644 index 0000000..3598bbb --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIClosePath/index.js @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPIDraw2/index"), + closePath001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.closePath(); + ctx.rect(10,10,50,50); + ctx.rect(70,70,30,30); + ctx.stroke(); + }, + closePath002Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.closePath(); + ctx.rect(10,10,50,50); + ctx.moveTo(70,10); + ctx.lineTo(80,60); + ctx.stroke(); + }, + closePath003Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.closePath(); + ctx.rect(10,10,50,50); + ctx.lineTo(80,60); + ctx.lineTo(100,60); + ctx.stroke(); + }, + closePath004Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.closePath(); + ctx.lineTo(80,60); + ctx.lineTo(100,60); + ctx.stroke(); + }, + closePath005Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(80,60); + ctx.lineTo(80,100); + ctx.closePath(); + ctx.lineTo(100,60); + ctx.stroke(); + }, + closePath006Func: function () { + var canvasRef = this.$refs.canvas6; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.closePath(); + ctx.moveTo(70,10); + ctx.lineTo(80,60); + ctx.stroke(); + }, + closePath007Func: function () { + var canvasRef = this.$refs.canvas7; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.closePath(); + ctx.lineTo(80,60); + ctx.stroke(); + }, + closePath008Func: function () { + var canvasRef = this.$refs.canvas8; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.closePath(); + ctx.arc(100,100,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + }, + closePath009Func: function () { + var canvasRef = this.$refs.canvas9; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.closePath(); + ctx.arc(100,100,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + }, + closePath010Func: function () { + var canvasRef = this.$refs.canvas10; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.closePath(); + ctx.arc(150,70,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.stroke(); + }, + closePath011Func: function () { + var canvasRef = this.$refs.canvas11; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.closePath(); + ctx.lineTo(50,10); + ctx.stroke(); + }, + closePath012Func: function () { + var canvasRef = this.$refs.canvas12; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(80,60); + ctx.closePath(); + ctx.stroke(); + }, + closePath013Func: function () { + var canvasRef = this.$refs.canvas13; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(80,60); + ctx.lineTo(100,60); + ctx.closePath(); + ctx.stroke(); + }, + closePath014Func: function () { + var canvasRef = this.$refs.canvas14; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.moveTo(70,10); + ctx.lineTo(80,60); + ctx.closePath(); + ctx.stroke(); + }, + closePath015Func: function () { + var canvasRef = this.$refs.canvas15; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.lineTo(80,60); + ctx.closePath(); + ctx.stroke(); + }, + closePath016Func: function () { + var canvasRef = this.$refs.canvas16; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.arc(120,70,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.closePath(); + ctx.stroke(); + }, + closePath017Func: function () { + var canvasRef = this.$refs.canvas17; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.arc(120,70,50,Math.PI*2*(30/360),Math.PI*2*(150/360),false); + ctx.closePath(); + ctx.stroke(); + }, + closePath018Func: function () { + var canvasRef = this.$refs.canvas18; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.arc(150,70,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + ctx.closePath(); + ctx.stroke(); + }, + closePath019Func: function () { + var canvasRef = this.$refs.canvas19; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.lineTo(50,10); + ctx.closePath(); + ctx.stroke(); + }, + closePath020Func: function () { + var canvasRef = this.$refs.canvas20; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.arc(150,70,50,Math.PI*2*(30/360),Math.PI*2*(150/360),false); + ctx.closePath(); + ctx.stroke(); + } +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.hml new file mode 100644 index 0000000..8346f9a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.hml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.js new file mode 100644 index 0000000..8fa7e1d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw1/index.js @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPI/index"), + fillRect1Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.fillRect(-32769,32768,-32769,32768); + }, + fillRect2Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.fillRect(10,10); + }, + strokeRect1Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.strokeRect(-32769,32768,-32769,32768); + }, + strokeRect2Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.strokeRect(10,10); + }, + fillText1Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.font = "30px SourceHanSansSC-Regular"; + ctx.fillText("Hello JS", -32769, 32768); + }, + fillText2Func: function () { + var canvasRef = this.$refs.canvas6; + var ctx = canvasRef.getContext("2d"); + ctx.font = "30px SourceHanSansSC-Regular"; + ctx.fillText("Hello JS"); + } +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.css new file mode 100644 index 0000000..d8bffb9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.css @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 200px; + margin-top: 0px; +} + +.buttonContainerStyle { + width: 454px; + height: 80px; +} + +.buttonStyle { + width: 200px; + height: 60px; + margin-left: 130px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.hml new file mode 100644 index 0000000..43e111a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.hml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + API + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.js new file mode 100644 index 0000000..76270d0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIDraw2/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 { routePage, routeSimplePage } from "../../../common/js/general"; +export default { + ...routePage("pages/index/index"), + changePage1: routeSimplePage("pages/canvas/indexAPIBeginPath/index"), + changePage2: routeSimplePage("pages/canvas/indexAPIRect/index"), + changePage3: routeSimplePage("pages/canvas/indexAPIStroke/index"), + changePage4: routeSimplePage("pages/canvas/indexAPIMoveTo/index"), + changePage5: routeSimplePage("pages/canvas/indexAPILineTo/index"), + changePage6: routeSimplePage("pages/canvas/indexAPIArc/index"), + changePage7: routeSimplePage("pages/canvas/indexAPIClosePath/index") +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.hml new file mode 100644 index 0000000..132a9b8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.hml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.js new file mode 100644 index 0000000..a8569f3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPILineTo/index.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPIDraw2/index"), + lineTo001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.stroke(); + }, + lineTo002Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(32768,50); + ctx.stroke(); + }, + lineTo003Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(10,-32769); + ctx.stroke(); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.hml new file mode 100644 index 0000000..1d749e8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.hml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.js new file mode 100644 index 0000000..f41a435 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIMoveTo/index.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPIDraw2/index"), + moveTo001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.stroke(); + }, + moveTo002Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(32768,10); + ctx.lineTo(10,50); + ctx.stroke(); + }, + moveTo003Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,-32769); + ctx.lineTo(10,50); + ctx.stroke(); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.css new file mode 100755 index 0000000..0b58e21 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 80px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.hml new file mode 100755 index 0000000..847d46a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.hml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + canvas绘图接口性能测试 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js new file mode 100755 index 0000000..ce379cf --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPI/index"), + performance001Func: function () { + var myDate = new Date(); + var myTime=myDate.toLocaleTimeString(); + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + console.log("stroke 1 time contains 100 times moveTo+lineTo begin =========" + myTime); + // 画101条线 + var i; + var x = 0; + // 红色 + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 5; + for(i = 0; i< 100; i++) { + x = x + 10; + ctx.moveTo(10,x); + ctx.lineTo(30,x); + if(i === 99) { + ctx.stroke(); + console.log("stroke 1 time contains 100 times moveTo+lineTo end =========" + myTime); + ctx.beginPath(); + // 蓝色 + ctx.strokeStyle = "#0000FF"; + ctx.lineWidth = 3; + ctx.moveTo(10,x+10); + ctx.lineTo(30,x+10); + ctx.stroke(); + } + } + + // 画101个矩形 + console.log("stroke 1 time contains 100 times rect begin =========" + myTime); + ctx.beginPath(); + var y = 0; + for(i = 0; i< 100; i++) { + y = y + 10; + ctx.rect(40,y, 20,4); + if(i === 99) { + ctx.stroke(); + console.log("stroke 1 time contains 100 times rect end =========" + myTime); + ctx.beginPath(); + // 红色 + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 2; + ctx.rect(40,y+10, 20,4); + ctx.stroke(); + } + } + + // 画101个圆 + console.log("stroke 1 time contains 100 times arc begin =========" + myTime); + ctx.beginPath(); + var z = 0; + for(i = 0; i< 100; i++) { + z = z + 10; + ctx.arc(80,z,5,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + if(i === 99) { + ctx.stroke(); + console.log("stroke 1 time contains 100 times arc end =========" + myTime); + ctx.beginPath(); + // 蓝色 + ctx.strokeStyle = "#0000FF"; + ctx.lineWidth = 2; + ctx.arc(80,z+10,5,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + } + } + + // 画101条线 + x = 0; + // 红色 + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 1; + console.log("stroke 100 times contains 100 times moveTo+lineTo begin =========" + myTime); + for(i = 0; i< 100; i++) { + x = x + 10; + ctx.beginPath(); + ctx.moveTo(100,x); + ctx.lineTo(130,x); + ctx.stroke(); + } + console.log("stroke 100 times contains 100 times moveTo+lineTo end =========" + myTime); + + // 画100个矩形 + y = 0; + // 红色 + ctx.strokeStyle = "#FF0000"; + console.log("stroke 100 times contains 100 times rect begin =========" + myTime); + for(i = 0; i< 100; i++) { + y = y + 10; + ctx.beginPath(); + ctx.rect(140,y, 20,4); + ctx.stroke(); + } + console.log("stroke 100 time contains 100 times rect end =========" + myTime); + + // 画100个弧 + z = 0; + // 红色 + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 1; + console.log("stroke 100 times contains 100 times arc begin =========" + myTime); + for(i = 0; i< 100; i++) { + z = z + 10; + ctx.beginPath(); + ctx.arc(170,z,5,Math.PI*2*(0/360),Math.PI*2*(140/360),false); + ctx.stroke(); + } + console.log("stroke 100 times contains 100 times arc end =========" + myTime); + }, + performance002Func: function() { + var myDate = new Date(); + var myTime=myDate.toLocaleTimeString(); + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + // 画10条线 + var i = 0; + // 红色 + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 1; + console.log("stroke 10 times contains 10 times moveTo+lineTo begin =========" + myTime); + for(i = 0; i< 10; i++) { + ctx.beginPath(); + ctx.moveTo(10,30); + ctx.lineTo(60,30); + ctx.stroke(); + } + console.log("stroke 10 times contains 10 times moveTo+lineTo end =========" + myTime); + + // 画10个矩形 + // 红色 + ctx.strokeStyle = "#FF0000"; + console.log("stroke 10 times contains 10 times rect begin =========" + myTime); + for(i = 0; i< 10; i++) { + ctx.beginPath(); + ctx.rect(80,30,50,10); + ctx.stroke(); + } + console.log("stroke 10 time contains 10 times rect end =========" + myTime); + + // 画10个弧 + // 红色 + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 1; + console.log("stroke 10 times contains 10 times arc begin =========" + myTime); + for(i = 0; i< 10; i++) { + ctx.beginPath(); + ctx.arc(160,30,10,Math.PI*2*(0/360),Math.PI*2*(360/360),false); + ctx.stroke(); + } + console.log("stroke 10 times contains 10 times arc end =========" + myTime); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.hml new file mode 100644 index 0000000..7448926 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.hml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.js new file mode 100644 index 0000000..805da2f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIRect/index.js @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPIDraw2/index"), + rect001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.stroke(); + }, + rect002Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.rect(32768,10,50,50); + ctx.stroke(); + }, + rect003Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,-32769,50,50); + ctx.lineTo(80,60); + ctx.stroke(); + }, + rect004Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,32768,50); + ctx.stroke(); + }, + rect005Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,-32769); + ctx.stroke(); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.css new file mode 100755 index 0000000..0b58e21 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 80px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.hml new file mode 100755 index 0000000..1f5942b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.hml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + canvas绘图接口SR场景测试 + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.js new file mode 100755 index 0000000..3ca0b6c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIScenario/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPI/index"), + scenario001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.arc(150,70,50,Math.PI*2*(30/360),Math.PI*2*(150/360),false); + ctx.moveTo(30,30); + ctx.lineTo(60,90); + ctx.closePath(); + ctx.stroke(); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.css new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.css @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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. + */ + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 170px; + margin-top: 0px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.hml new file mode 100644 index 0000000..0b84333 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.hml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + canvas绘图接口 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.js new file mode 100644 index 0000000..67dd289 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIStroke/index.js @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage("pages/canvas/indexAPIDraw2/index"), + stroke001Func: function () { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + ctx.stroke(); + ctx.rect(10,10,50,50); + ctx.arc(100,70,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + }, + stroke002Func: function () { + var canvasRef = this.$refs.canvas2; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.stroke(); + ctx.lineTo(80,60); + }, + stroke003Func: function () { + var canvasRef = this.$refs.canvas3; + var ctx = canvasRef.getContext("2d"); + ctx.rect(10,10,50,50); + ctx.stroke(); + ctx.arc(100,70,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + }, + stroke004Func: function () { + var canvasRef = this.$refs.canvas4; + var ctx = canvasRef.getContext("2d"); + ctx.moveTo(10,10); + ctx.lineTo(10,50); + ctx.stroke(); + ctx.arc(100,70,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + }, + stroke005Func: function () { + var canvasRef = this.$refs.canvas5; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + ctx.arc(100,70,50,Math.PI*2*(150/360),Math.PI*2*(30/360),false); + }, + stroke006Func: function () { + var canvasRef = this.$refs.canvas6; + var ctx = canvasRef.getContext("2d"); + ctx.arc(50,50,30,Math.PI*2*(0/360),Math.PI*2*(90/360),false); + ctx.stroke(); + ctx.lineTo(50,10); + } +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.css new file mode 100644 index 0000000..4dacb35 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.css @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:55px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.hml new file mode 100644 index 0000000..c0a7ed8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.hml @@ -0,0 +1,35 @@ + + +
+
+ Component_chart_AttributeSet_Test_0304 +
+
+ + + + + + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.js new file mode 100644 index 0000000..714ca64 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0304/index.js @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +export default { + data: { + options: { + xAxis: { + min: 0, + max: 5, + axisTick: 6, + display: true + }, + yAxis: { + min: 0, + max: 5, + axisTick: 4, + display: true + }, + labels: ["00:00", "02:00", "04:00", "06:00"] + }, + datasets1: [ + { + backgroundColor: "#000000", + data: [1, 2, 3, 4] + } + ], + datasets2: [ + { + backgroundColor: "#ff0000", + data: [1, 2, 3, 4] + } + ], + datasets3: [ + { + backgroundColor: "ff0000", + data: [1, 2, 3, 4] + } + ], + datasets4: [ + { + backgroundColor: 21474836483, + data: [1, 2, 3, 4] + } + ], + ...routePage("pages/index/index", "pages/chart/0506/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.css new file mode 100644 index 0000000..4dacb35 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.css @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:55px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.hml new file mode 100644 index 0000000..9957a71 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.hml @@ -0,0 +1,36 @@ + + +
+
+ Component_chart_AttributeSet_Test_0506 +
+
+ + + + + + + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.js new file mode 100644 index 0000000..a64dbba --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/0506/index.js @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +export default { + data: { + labels: ["00:00", "02:00", "04:00", "06:00"], + options: { + xAxis: { + min: 0, + max: 5, + axisTick: 6, + display: true + }, + yAxis: { + min: 1000, + max: 2500, + axisTick: 4, + display: true + } + }, + datasets1: [ + { + backgroundColor: "#ff0000", + data: [2323, 847, 2000] + } + ], + datasets2: [ + { + backgroundColor: "#00ff00", + data: ["kjk", "jke"] + } + ], + datasets3: [ + { + backgroundColor: "#0000ff", + data: [-2147483690, 2147483980] + } + ], + ...routePage("pages/chart/0304/index", "pages/chart/1819/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.css new file mode 100644 index 0000000..4dacb35 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.css @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:55px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.hml new file mode 100644 index 0000000..7ee3f9d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.hml @@ -0,0 +1,39 @@ + + +
+
+ Component_chart_AttributeSet_Test_1819 +
+
+ + + + + + + + + + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.js new file mode 100644 index 0000000..59ded96 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/1819/index.js @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +export default { + data: { + labels: ["00:00", "02:00", "04:00", "06:00"], + options: { + xAxis: { + min: 0, + max: 10, + axisTick: 6, + display: true + }, + yAxis: { + min: 0, + max: 6000, + axisTick: 10, + display: false + } + }, + datasets1: [ + { + strokeColor: "#ff0000", + data: [2478, 2600, 3e3, 3200, 3500, 3888, 4023, 4501, 4999, 5267] + } + ], + datasets2: [ + { + backgroundColor: "#00ff00", + data: [1, 2, 3], + dgs: "jdkllk" + } + ], + datasets3: [ + { + backgroundColor: "#ff0000" + } + ], + datasets4: "not array", + ...routePage("pages/chart/0506/index", "pages/chart/20/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.hml new file mode 100644 index 0000000..aeede09 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.hml @@ -0,0 +1,30 @@ + + +
+
+ Component_chart_AttributeSet_Test_020 +
+
+ + +
+
+ + + +
+
diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.js new file mode 100644 index 0000000..77f1147 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/20/index.js @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + flag:true, + options:{ + xAxis: { + min: 0, + max: 10, + axisTick: 10, + display: false + }, + yAxis: { + min: 2000, + max: 6000, + axisTick: 10, + display: true + } + }, + datasets:[{ + fillColor:"#ff0000", + data:[2478, 2600, 3e3, 3200, 3500, 3888, 4023, 4501, 4999, 5267] + } + ] + }, + changeData() { + if (this.flag === true) { + this.datasets = [{ + fillColor:"#00ff00", + data:[2000, 3000, 4000], + dgs:"jdkllk" + },{ + fillColor:"#0000ff", + data:[2478, 2600, 3e3, 3200, 3500, 3888, 4023, 4501, 4999, 5267] + } + ]; + } else { + this.datasets = [{ + fillColor:"#ff0000", + data:[2478, 2600, 3e3, 3200, 3500, 3888, 4023, 4501, 4999, 5267] + } + ]; + } + this.flag = this.flag === true ? false : true; + }, + ...routePage('pages/chart/1819/index', 'pages/chart/21/index') + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.hml new file mode 100644 index 0000000..35fe306 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.hml @@ -0,0 +1,42 @@ + + +
+
+ Component_chart_AttributeSet_Test_021 +
+
+ + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.js new file mode 100755 index 0000000..61fc75e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/21/index.js @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + image: "common/left.png", + index: 0, + datasets: [ + { + backgroundColor: "#FF6364", + data: [2478, 2600, 3e3, 3200, 3500, 3888, 4023, 4501, 4999, 5267] + }, + { backgroundColor: "#00FF00", data: [1000, 2, 800, 700, 433] }, + { backgroundColor: "#0000FF", data: [100, 200, 300, 400, 500, 600, 550, 450, 350] } + ], + options: { + xAxis: { min: 0, max: 10, axisTick: 10, display:true }, + yAxis: { min: 100, max: 5267, axisTick: 10, display: true } + } + }, + updateData: function updateData() { + console.log("update data..."); + this.datasets = [ + { backgroundColor: "#FFFF00", data: [400, 200, 800, 400, 200, 800] }, + { backgroundColor: "#FF6364", data: [300, 200, 750] } + ]; + this.options = { + xAxis: { min: 0, max: 10, axisTick: 10, display:true }, + yAxis: { min: 400, max: 800, axisTick: 10, display: true } + } + }, + onInit() { + console.log("init called..."); + }, + onDestroy() { + console.log("destroy called..."); + }, + ...routePage('pages/chart/20/index', 'pages/chart/22/index') +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.hml new file mode 100644 index 0000000..77f25db --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.hml @@ -0,0 +1,29 @@ + + +
+
+ Component_chart_AttributeSet_Test_022 +
+
+ + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.js new file mode 100644 index 0000000..6c624c9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/22/index.js @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { datasets, xAxis, yAxis,appendDataFunc } from "../../../common/js/chart"; +export default { + data: { + datasets: datasets, + options: { + xAxis: xAxis, + yAxis: yAxis, + series: { + lineStyle: { + width: "5", + smooth: false + }, + headPoint: { + shape: "circle", + size: "3px", + strokeColor: "#ff0000", + fillColor: "#090E14" + }, + topPoint: { + shape: "circle", + size: "3px", + strokeColor: "#00ff00", + fillColor: "#090E14", + strokeWidth: "1px" + }, + bottomPoint: { + shape: "circle", + size: "3px", + strokeColor: "#ffffff", + fillColor: "#090E14" + }, + loop: { + margin: 5, + gradient: false + } + } + }, + updateData: function updateData() { + var appendData = appendDataFunc(); + this.$refs.chart.append(appendData); + }, + ...routePage("pages/chart/21/index", "pages/chart/23/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.hml new file mode 100644 index 0000000..f85f75a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.hml @@ -0,0 +1,31 @@ + + +
+
+ Component_chart_AttributeSet_Test_023 +
+
+ + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.js new file mode 100644 index 0000000..82a92e2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/23/index.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import {datasetsFor232426} from "../../../common/js/chart" +export default { + data: { + datasets: datasetsFor232426, + options: { + yAxis: { + min: 0, + max: 450, + axisTick: 10, + display: true, + color: "#ff0000" + } + }, + options2: { + xAxis: { + min: 0, + max: 450, + axisTick: 10, + display: true, + color: "#ff0000" + } + }, + ...routePage("pages/chart/22/index", "pages/chart/24/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.hml new file mode 100644 index 0000000..ac56ad3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.hml @@ -0,0 +1,47 @@ + + +
+
+ Component_chart_AttributeSet_Test_024 +
+
+
+ margin:5 + + +
+
+ margin:0 + + +
+
+ margin:-1 + + +
+
+ margin:无 + + +
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.js new file mode 100644 index 0000000..84f9077 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/24/index.js @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { appendDataFunc, datasetsFor232426 } from "../../../common/js/chart" +var xAxis = { + min: 0, + max: 50, + display: true, + color: "#00ff00" +}; +var yAxis = { + min: 0, + max: 450, + display: true, + color: "#ff0000" +}; +export default { + data: { + datasets: datasetsFor232426, + options1: { + xAxis: xAxis, + yAxis: yAxis, + series: { + loop: { + margin: 5 + } + } + }, + options2: { + xAxis: xAxis, + yAxis: yAxis, + series: { + loop: { + margin: 0 + } + } + }, + options3: { + xAxis: xAxis, + yAxis: yAxis, + series: { + loop: { + margin: -1 + } + } + }, + options4: { + xAxis: xAxis, + yAxis: yAxis, + series: { + loop: {} + } + }, + index: 0, + sourceData: [62, 60, 58, 57, 56, 56, 56], + updateData: function updateData(count) { + var appendData = { + serial: 0, + data: appendDataFunc().data + }; + if (count == 1) { + this.$refs.chart1.append(appendData); + } else if (count == 2) { + this.$refs.chart2.append(appendData); + } else if (count == 3) { + this.$refs.chart3.append(appendData); + } else if (count == 4) { + this.$refs.chart4.append(appendData); + } + }, + ...routePage("pages/chart/23/index", "pages/chart/25/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.hml new file mode 100644 index 0000000..48d0c89 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.hml @@ -0,0 +1,29 @@ + + +
+
+ Component_chart_AttributeSet_Test_025 +
+
+ + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.js new file mode 100644 index 0000000..e67bf1c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/25/index.js @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import {datasets,xAxis,yAxis,appendDataFunc} from "../../../common/js/chart"; +export default { + data: { + datasets: datasets, + options: { + xAxis: xAxis, + yAxis: yAxis + }, + sourceData: [50, 70, 90, 65, 50, 10, 50], + updateData: function updateData() { + var appendData = appendDataFunc(); + this.$refs.chart.append(appendData); + }, + ...routePage("pages/chart/24/index", "pages/chart/26/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.hml new file mode 100644 index 0000000..bfde618 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.hml @@ -0,0 +1,29 @@ + + +
+
+ Component_chart_AttributeSet_Test_026 +
+
+ + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.js new file mode 100644 index 0000000..fcb7517 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/26/index.js @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { datasetsFor232426, appendDataFunc } from "../../../common/js/chart"; +export default { + data: { + datasets: datasetsFor232426, + options: { + xAxis: { + min: 0, + max: 100, + axisTick: 10, + display: false, + color: "##c0c0c0" + }, + yAxis: { + min: 0, + max: 450, + axisTick: 10, + display: true, + color: "#ff0000" + }, + series: { + lineStyle: { + width: "5", + smooth: false + }, + headPoint: {}, + topPoint: {}, + bottomPoint: {}, + loop: { + margin: 5, + gradient: false + } + } + }, + index: 0, + sourceData: [62, 60, 58, 57, 56, 56, 56], + updateData: function updateData() { + var appendData = appendDataFunc(); + this.$refs.chart.append(appendData); + }, + ...routePage("pages/chart/25/index", "pages/chart/27/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.hml new file mode 100644 index 0000000..9150d23 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.hml @@ -0,0 +1,31 @@ + + +
+
+ Component_chart_AttributeSet_Test_027 +
+
+ + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.js new file mode 100644 index 0000000..e999528 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/27/index.js @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { datasetsFor272829, appendDataFunc } from "../../../common/js/chart"; +export default { + data: { + datasets: datasetsFor272829, + options: { + xAxis: { + min: 2, + max: 6, + axisTick: 11, + display: true, + color: "#00ff00" + }, + yAxis: { + min: 126, + max: 500, + axisTick: 11, + display: true, + color: "#ff0000" + } + }, + index: 0, + sourceData: [62, 60, 58, 57, 56, 56, 56], + updateData: function updateData() { + var appendData = appendDataFunc(); + this.$refs.chart.append(appendData); + }, + ...routePage("pages/chart/26/index", "pages/chart/28/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.hml new file mode 100644 index 0000000..03c585a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.hml @@ -0,0 +1,47 @@ + + +
+
+ Component_chart_AttributeSet_Test_028 +
+
+
+ x min:-1,max:6 + + +
+
+ x min:5,max:1 + + +
+
+ x min:5,max:-1 + + +
+
+ no min/max + + +
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.js new file mode 100644 index 0000000..7f58add --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/28/index.js @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { datasetsFor272829 } from "../../../common/js/chart"; +var yAxis = { + min: 0, + max: 450, + display: true, + color: "#ff0000" +}; +export default { + data: { + datasets: datasetsFor272829, + options1: { + xAxis: { + min: -1, + max: 6, + display: true, + color: "#00ff00" + }, + yAxis: yAxis + }, + options2: { + xAxis: { + min: 5, + max: 1, + display: true, + color: "#00ff00" + }, + yAxis: yAxis + }, + options3: { + xAxis: { + min: 5, + max: -1, + display: true, + color: "#00ff00" + }, + yAxis: yAxis + }, + options4: { + xAxis: { + display: true, + color: "#00ff00" + }, + yAxis: yAxis + }, + ...routePage("pages/chart/27/index", "pages/chart/29/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.hml new file mode 100644 index 0000000..e4e9a18 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.hml @@ -0,0 +1,42 @@ + + +
+
+ Component_chart_AttributeSet_Test_029 +
+
+
+ head size:-1 + + +
+
+ bottom shape: aaa size:3 strWid:5 + + +
+
+ top strWid:5 strCol:0x0000ff fillCol:0x00ff00 + + +
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.js new file mode 100644 index 0000000..a8231ca --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/29/index.js @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { datasetsFor272829 } from "../../../common/js/chart"; +var yAxis = { + min: 0, + max: 450, + display: true, + color: "#ff0000" +}; +var xAxis = { + min: 0, + max: 20, + display: true, + color: "#00ff00" +}; +export default { + data: { + datasets: datasetsFor272829, + options1: { + xAxis: xAxis, + yAxis: yAxis, + series: { + headPoint: { + shape: "circle", + size: "-1px" + } + } + }, + options2: { + xAxis: xAxis, + yAxis: yAxis, + series: { + bottomPoint: { + shape: "aaa", + size: "3px", + strokeWidth: "5px" + } + } + }, + options3: { + xAxis: xAxis, + yAxis: yAxis, + series: { + topPoint: { + shape: "circle", + size: "10px", + strokeColor: "#0000ff", + fillColor: "#0xff00", + strokeWidth: "5px" + } + } + }, + ...routePage("pages/chart/28/index", "pages/chart/30/index") + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.css new file mode 100644 index 0000000..a7b5c54 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + align-items: center; +} + +.divBlock { + width:454px; + height:54px; +} + +.chart { + width:400px; + height:220px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.hml new file mode 100644 index 0000000..f47b76a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.hml @@ -0,0 +1,29 @@ + + +
+
+ Component_chart_AttributeSet_Test_030 +
+
+ + + click to change datasets and options +
+
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.js new file mode 100644 index 0000000..d63ea88 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/chart/30/index.js @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { datasetsFor272829 } from "../../../common/js/chart"; +var yAxis = { + min: 0, + max: 450, + display: true, + color: "#ff0000" +}; +var xAxis = { + min: 0, + max: 20, + display: true, + color: "#00ff00" +}; +export default { + data: { + datasets1: [ + { + fillColor: "#00ff00", + data: [300, 250, 400, 150, 350, 212, 300, 222, 190], + gradient: false + }, + { + strokeColor: "#FBD140", + fillColor: "#0000ff", + data: [300, 300, 178, 50, 401, 126, 600, 80], + gradient: true + } + ], + options1: { + xAxis: xAxis, + yAxis: yAxis, + series: { + headPoint: { + shape: "circle", + size: "5px", + strokeColor: "#ff0000", + fillColor: "#ff0000" + }, + bottomPoint: { + shape: "circle", + size: "3px", + strokeColor: "#FEFEFE", + fillColor: "#A1928F" + }, + topPoint: { + size: "10px", + strokeWidth: "3px", + strokeColor: "#FEFEFE", + fillColor: "#007DFF" + } + } + }, + ...routePage("pages/chart/28/index", "") + }, + changeParam() { + this.datasets1 = [ + { + fillColor: "#00ff00", + data: [280, 230, 380, 130, 330, 192, 280, 202, 170], + gradient: false + }, + { + strokeColor: "#FBD140", + fillColor: "#0000ff", + data: [280, 280, 158, 30, 381, 106, 580, 60], + gradient: false + } + ], + this.options1 = { + xAxis: xAxis, + yAxis: yAxis, + series: { + headPoint: { + display: false, + shape: "circle", + size: "5px", + strokeColor: "#ff0000", + fillColor: "#ffffff" + }, + loop: { + + } + } + } + }, + ...routePage("pages/chart/29/index", "") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.hml new file mode 100644 index 0000000..53403fe --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.hml @@ -0,0 +1,52 @@ + + + + + 属性绑定：{{count}} + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.js new file mode 100644 index 0000000..024e011 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/01/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + count: 1 + }, + ...routePage("", "pages/data-binding/02/index"), + handleIncrease() { + ++this.count; + }, + handleDecrease() { + --this.count; + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.hml new file mode 100644 index 0000000..b288fc3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.hml @@ -0,0 +1,41 @@ + + + + + 样式绑定：{{align}} + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.js new file mode 100644 index 0000000..d05cbd5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/data-binding/02/index.js @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + align: "center" + }, + ...routePage("pages/data-binding/01/index", ""), + changeNext() {}, + handleSetLeft() { + this.align = "left"; + }, + handleSetCenter() { + this.align = "center"; + }, + handleSetRight() { + this.align = "right"; + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.hml new file mode 100644 index 0000000..e11d6d9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.hml @@ -0,0 +1,53 @@ + + + + + if指令 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.js new file mode 100644 index 0000000..901d2c0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/01/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + visible: true + }, + ...routePage("", "pages/directive/02/index"), + handleShow() { + this.visible = true; + }, + handleHide() { + this.visible = false; + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.hml new file mode 100644 index 0000000..803150b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.hml @@ -0,0 +1,57 @@ + + + + + + + for指令 + +
+ {{$item}} +
+ + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.js new file mode 100644 index 0000000..a278de9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/02/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + list: ["item1", "item2"] + }, + ...routePage("pages/directive/01/index", "pages/directive/03/index"), + handleIncrease() { + this.list.push("item" + (this.list.length + 1)); + }, + handleDecrease() { + this.list.splice(this.list.length - 1, 1); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.hml new file mode 100644 index 0000000..64ab78c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.hml @@ -0,0 +1,64 @@ + + + + + + + + if指令嵌套for指令 + +
+ {{$item}} +
+ + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.js new file mode 100644 index 0000000..f86616f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/03/index.js @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + visible: true, + list: ["item1", "item2"] + }, + ...routePage("pages/directive/02/index", "pages/directive/04/index"), + handleToggle() { + this.visible = !this.visible; + }, + handleIncrease() { + this.list.push("item" + (this.list.length + 1)); + }, + handleDecrease() { + this.list.splice(this.list.length - 1, 1); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.hml new file mode 100644 index 0000000..bd2fb61 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.hml @@ -0,0 +1,65 @@ + + + + + + + for指令嵌套if指令 + +
+
+ {{$item.title}} +
+
+ + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.js new file mode 100644 index 0000000..130a303 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/directive/04/index.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + list: [ + { title: "item1", visible: true }, + { title: "item2", visible: true } + ] + }, + ...routePage("pages/directive/03/index", ""), + handleIncrease() { + this.list.push({ title: "item" + (this.list.length + 1), visible: true }); + }, + handleDecrease() { + this.list.splice(this.list.length - 1, 1); + }, + handleToggle(index) { + this.list[index].visible = !this.list[index].visible; + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.css new file mode 100644 index 0000000..c609d91 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.css @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + } + +.divBlock { + width:125px; + height:125px; + border-width: 1px; + border-color: #dc143c; +} + +.innerDivBlock { + width:20px; + height:20px; + border-width: 1px; + border-color:#daa520; + background-color: #1e90ff; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.hml new file mode 100644 index 0000000..1410a84 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.hml @@ -0,0 +1,37 @@ + + +
+
+ Component_Div_StyleSet_Test_001 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.js new file mode 100644 index 0000000..a3e30cc --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/01/index.js @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage('pages/index/index', 'pages/div/02/index') +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.css new file mode 100644 index 0000000..515c8f7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.css @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + } + +.divBlock { + width:100px; + height:100px; + border-width: 1px; + border-color: #dc143c; +} + +.innerDivBlock { + width:20px; + height:20px; + border-width: 1px; + border-color:#daa520; + background-color: #1e90ff; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.hml new file mode 100644 index 0000000..16c1717 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.hml @@ -0,0 +1,54 @@ + + +
+
+ Component_Div_StyleSet_Test_002 +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.js new file mode 100644 index 0000000..eb1a7ba --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/02/index.js @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + }, + ...routePage('pages/div/01/index', 'pages/div/03/index') +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.css new file mode 100644 index 0000000..515c8f7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.css @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + } + +.divBlock { + width:100px; + height:100px; + border-width: 1px; + border-color: #dc143c; +} + +.innerDivBlock { + width:20px; + height:20px; + border-width: 1px; + border-color:#daa520; + background-color: #1e90ff; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.hml new file mode 100644 index 0000000..2f57fef --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.hml @@ -0,0 +1,44 @@ + + +
+
+ Component_Div_StyleSet_Test_003 +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.js new file mode 100644 index 0000000..5732041 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/03/index.js @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + }, + ...routePage('pages/div/02/index', 'pages/div/33/index') +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.css new file mode 100644 index 0000000..78a251b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.stackBlock { + width:320px; + height:50px; + border-width: 1px; + border-color: #dc143c; +} + +.divBlock { + width:125px; + height:125px; + border-width: 1px; + border-color: #dc143c; +} + +.innerDivBlock { + width:20px; + height:20px; + border-width: 1px; + border-color:#daa520; + background-color: #1e90ff; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.hml new file mode 100755 index 0000000..d80afd8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.hml @@ -0,0 +1,51 @@ + + +
+
+ Component_Div_StyleSet_Test_033 +
+
+ +
+ this is text + + + + + listItem + + + listItem + + + + + +
+ +
+ +
+ this is text + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.js new file mode 100644 index 0000000..b1b83f7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/33/index.js @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + }, + ...routePage('pages/div/03/index', 'pages/div/34/index') + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.css new file mode 100644 index 0000000..344ec70 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.css @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:50px; + height:50px; + border-width: 1px; + border-color: #dc143c; +} + +.divSmallBlock { + width:8px; + height:8px; + border-width: 1px; + border-color:#ffd700; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.hml new file mode 100644 index 0000000..6053dd9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.hml @@ -0,0 +1,109 @@ + + +
+
+ Component_Div_StyleSet_Test_034 +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.js new file mode 100644 index 0000000..9dc99c5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/34/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + loop:[1, 2, 3] + }, + ...routePage('pages/div/33/index', 'pages/div/35/index') +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.css new file mode 100644 index 0000000..cf02dd9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.css @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:50px; + height:50px; + border-width: 1px; + border-color: #dc143c; +} + +.divSmallBlock { + width:8px; + height:8px; + border-width: 1px; + border-color:#ffd700; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.stackBlock { + width:320px; + height:50px; + border-width: 1px; + border-color: #dc143c; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.hml new file mode 100755 index 0000000..996359e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.hml @@ -0,0 +1,53 @@ + + +
+
+ Component_Div_StyleSet_Test_035 +
+
+
+
+ this is text + + + + + listItem + + + listItem + + + + + +
+ +
+ +
+
+
+ + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.js new file mode 100644 index 0000000..74f4dcb --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/35/index.js @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + loop:[1, 2, 3], + flexDirection: "row", + flexDirectionList: ["row", "column"], + flexDirectionIndex:1, + justifyContent: "flex-start", + justifyContentList: ["flex-start", "center", "flex-end"], + justifyContentIndex:1, + alignItems: "flex-start", + alignItemsList: ["flex-start", "center", "flex-end"], + alignItemsIndex:1 + }, + ...routePage('pages/div/34/index', 'pages/div/36/index'), + changeFlexDirection() { + this.flexDirection = this.flexDirectionList[this.flexDirectionIndex]; + this.flexDirectionIndex = (this.flexDirectionIndex + 1) % 2; + }, + changeJustifyContent() { + this.justifyContent = this.justifyContentList[this.justifyContentIndex]; + this.justifyContentIndex = (this.justifyContentIndex + 1) % 3; + }, + changeAlignItems() { + this.alignItems = this.alignItemsList[this.alignItemsIndex]; + this.alignItemsIndex = (this.alignItemsIndex + 1) % 3; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.css new file mode 100644 index 0000000..c609d91 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.css @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; + } + +.divBlock { + width:125px; + height:125px; + border-width: 1px; + border-color: #dc143c; +} + +.innerDivBlock { + width:20px; + height:20px; + border-width: 1px; + border-color:#daa520; + background-color: #1e90ff; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.hml new file mode 100644 index 0000000..caa0b7b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.hml @@ -0,0 +1,44 @@ + + +
+
+ Component_Div_StyleSet_Test_036 +
+
+
+ + + click button above or div to change focus +
+
+ + + + + + + + +
+
+
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.js new file mode 100644 index 0000000..a233fd2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/div/36/index.js @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data:{ + divWidth: 410, + divHeight: 190, + divPadding: 10, + divBorder: 1, + buttonWidth: 300, + buttonHeight: 90, + buttonPadding: 5, + buttonBorder: 5, + focusView: "div" + }, + changeFocusToDiv() { + this.focusView = "div"; + }, + changeFocusToButton() { + this.focusView = "button"; + }, + increaseWidth() { + if (this.focusView === "div") { + this.divWidth = this.divWidth + 50; + } else if (this.focusView === "button") { + this.buttonWidth = this.buttonWidth + 10; + } + }, + reduceWidth() { + if (this.focusView === "div") { + this.divWidth = this.divWidth - 50; + } else if (this.focusView === "button") { + this.buttonWidth = this.buttonWidth - 10; + } + }, + increaseHeight() { + if (this.focusView === "div") { + this.divHeight = this.divHeight + 50; + } else if (this.focusView === "button") { + this.buttonHeight = this.buttonHeight + 10; + } + }, + reduceHight() { + if (this.focusView === "div") { + this.divHeight = this.divHeight - 50; + } else if (this.focusView === "button") { + this.buttonHeight = this.buttonHeight - 10; + } + }, + increasePadding() { + if (this.focusView === "div") { + this.divPadding = this.divPadding + 10; + } else if (this.focusView === "button") { + this.buttonPadding = this.buttonPadding + 10; + } + }, + reducePadding() { + if (this.focusView === "div") { + this.divPadding = this.divPadding - 10; + } else if (this.focusView === "button") { + this.buttonPadding = this.buttonPadding - 10; + } + }, + increaseBorder() { + if (this.focusView === "div") { + this.divBorder = this.divBorder + 10; + } else if (this.focusView === "button") { + this.buttonBorder = this.buttonBorder + 10; + } + }, + reduceBorder() { + if (this.focusView === "div") { + this.divBorder = this.divBorder - 10; + } else if (this.focusView === "button") { + this.buttonBorder = this.buttonBorder - 10; + } + }, + ...routePage('pages/div/35/index') +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.css new file mode 100644 index 0000000..9bc89c6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.css @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} +.title { + font-size: 30px; + text-align: center; + width: 300px; + height: 100px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.hml new file mode 100644 index 0000000..5cf1bcd --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.hml @@ -0,0 +1,29 @@ + + +
+ + Global + + + is exist $root?{{!value}} + + +
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.js new file mode 100644 index 0000000..f16f1d6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/global/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../common/js/general"; +export default { + data: { + value: true + }, + onInit() { + this.value = typeof $root === "undefined"; + }, + ...routePage('', '') +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.css new file mode 100644 index 0000000..38f34d7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.css @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + justify-content: center; + flex-wrap: wrap; + align-items: center; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} +.animator-box { + width: 100px; + height: 100px; + flex-direction: column; + align-items: center; + justify-content: center; +} +.animator-title { + font-size: 20px; + text-align: center; +} +.animator { + width: 80px; + height: 80px; +} +.btn-box { + width: 400px; + height: 120px; + flex-wrap: wrap; + justify-content: space-around; + align-items: center; +} +.btn { + border-radius: 2px; + width: 180px; + margin-top: 8px; +} +.btn--big { + width: 373px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.hml new file mode 100644 index 0000000..bd53a8e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.hml @@ -0,0 +1,62 @@ + +
+
+ + + null + +
+
+ + + none + +
+
+ + + forwards + +
+
+ + + null + +
+
+ + + none + +
+
+ + + forwards + +
+
+ + + +
+
diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.js new file mode 100644 index 0000000..170b71a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image-animator/01/index.js @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021 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 router from '@system.router'; + +export default { + data: { + frames: [{ + src: 'common/asserts/numbers/0.png' + }, { + src: 'common/asserts/numbers/2.png' + }, { + src: 'common/asserts/numbers/3.png' + }, { + src: 'common/asserts/numbers/4.png' + }, { + src: 'common/asserts/numbers/5.png' + }, { + src: 'common/asserts/numbers/6.png' + }, { + src: 'common/asserts/numbers/7.png' + }, { + src: 'common/asserts/numbers/8.png' + }, { + src: 'common/asserts/numbers/9.png' + }] + }, + handleStart() { + execCommand(this, "start"); + }, + handleStop() { + execCommand(this, "stop"); + }, + handleGoHome() { + router.replace({ + uri: '/' + }); + } +} + +function execCommand(vm, command) { + const keys = Object.keys(vm.$refs); + keys.forEach((key) => vm.$refs[key][command]()); +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/hellopng.png b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/hellopng.png new file mode 100644 index 0000000000000000000000000000000000000000..6ebbe6521fa8f6b75d263cf9a6858529fc86fa87 GIT binary patch literal 10591 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.css new file mode 100644 index 0000000..15a3f75 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.css @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.imageBlock { + width:75px; + height:75px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.hml new file mode 100644 index 0000000..2868f1c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.hml @@ -0,0 +1,32 @@ + + +
+
+ Component_Image_AttributeSet_Test_001 +
+
+ + + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.js new file mode 100644 index 0000000..b3e43d5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/01/index.js @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2021 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 { routePage, routeSimplePage } from "../../../common/js/general"; +export default { + nextPage: routeSimplePage("pages/image/02/index"), + ...routePage("pages/index/index", "pages/image/02/index") +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.css new file mode 100644 index 0000000..15a3f75 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.css @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.imageBlock { + width:75px; + height:75px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.hml new file mode 100755 index 0000000..e54397c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.hml @@ -0,0 +1,30 @@ + + +
+
+ Component_Image_AttributeSet_Test_002 +
+
+ + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.js new file mode 100644 index 0000000..72275da --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/02/index.js @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +export default { + ...routePage("pages/image/01/index", "pages/image/04/index") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.css new file mode 100644 index 0000000..af249d0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.css @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.imageBlock { + width:75px; + height:75px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.hml new file mode 100755 index 0000000..d9497a6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.hml @@ -0,0 +1,30 @@ + + +
+
+ Component_Image_AttributeSet_Test_004 +
+
+ + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.js new file mode 100644 index 0000000..f98594c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/04/index.js @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage('pages/image/02/index', 'pages/image/05/index') +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.css new file mode 100644 index 0000000..af249d0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.css @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.imageBlock { + width:75px; + height:75px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.hml new file mode 100755 index 0000000..5737116 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.hml @@ -0,0 +1,27 @@ + + +
+
+ Component_Image_AttributeSet_Test_005 +
+
+ +
+
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.js new file mode 100644 index 0000000..1e807d9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/image/05/index.js @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + ...routePage('pages/image/04/index', '') +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000..5bfa218 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.css @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} + +.listItem { + width: 454px; + height: 80px; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 140px; + margin-top: 0px; +} + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.buttonContainerStyle { + width: 454px; + height: 80px; +} + +.buttonStyle { + width: 240px; + height: 60px; + margin-left: 110px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.hml new file mode 100644 index 0000000..30d412e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.hml @@ -0,0 +1,87 @@ + + + + + + + + UI自动化测试 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.js new file mode 100644 index 0000000..730c550 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/index/index.js @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2021 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 { routePage, routeSimplePage } from "../../common/js/general"; +export default { + changeSwiper: routeSimplePage("pages/swiper/SwiperA06/index"), + changeSwitch: routeSimplePage("pages/switch/SwitchA04/index"), + changeResource: routeSimplePage("pages/resource/resource005/index"), + changeDiv: routeSimplePage("pages/div/01/index"), + changeList: routeSimplePage("pages/list/list1/index"), + changeListItem: routeSimplePage("pages/list-item/item1/index"), + changeScroll: routeSimplePage("pages/scroll/scroll1/index"), + changeCanvas: routeSimplePage("pages/canvas/indexAPI/index"), + changeChart: routeSimplePage("pages/chart/0304/index"), + changeImage: routeSimplePage("pages/image/01/index"), + changeImageAnimator: routeSimplePage("pages/image-animator/01/index"), + changeArc: routeSimplePage("pages/arc/index"), + changeRouter: routeSimplePage("pages/router/01/index"), + changePickerView: routeSimplePage("pages/picker_view/attr006/index"), + changeDataBinding: routeSimplePage("pages/data-binding/01/index"), + changeDirective: routeSimplePage("pages/directive/01/index"), + changeGlobal: routeSimplePage("pages/global/index"), + changeLifecycle: routeSimplePage("pages/lifecycle/index"), + changeInput: routeSimplePage("pages/input/ButtonB023/index"), + changeStyle: routeSimplePage("pages/style/StyleBaseTest001/index"), + changeWidth: routeSimplePage("pages/switch-radio-width/width_switch_value_test009/index") +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.css new file mode 100644 index 0000000..27c345d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.css @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 600px; + flex-direction: column; +} + +.button { + width: 200px; + height: 60px; + margin-left: 80px; + margin-top: 10px; +} + +.bottom { + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} + +.bottom { + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.hml new file mode 100644 index 0000000..427f9dc --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.hml @@ -0,0 +1,26 @@ + + +
+ + + + +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.js new file mode 100644 index 0000000..33ffb8a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonA028/index.js @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data:{ + ifStatus:true, + showStatus:true, + data:["data1","data2"] + }, + changeIf:function() { + if(this.ifStatus) { + this.ifStatus = false; + } else { + this.ifStatus = true; + } + console.log("ifStatus:" + this.ifStatus); + }, + changeStatus:function() { + if(this.showStatus) { + this.showStatus = false; + } else { + this.showStatus = true; + } + console.log("showStatus:"+this.showStatus); + }, + changeFor:function() { + if(this.data.length == 2) { + this.data = ["data1"]; + } else { + this.data = ["data1", "data2"]; + } + }, + ...goPage("pages/input/CheckboxE027/index", "pages/input/CheckboxA029/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.css new file mode 100644 index 0000000..2b161dd --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.css @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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. + */ +.container{ + width: 454px; + height: 600px; + flex-direction: column +} + +.button{ + width:200px; + height:60px; + margin-left: 100px; + margin-top: 20px; +} + +.bottom { + width: 454px; + height:150px; +} + +.pagePrevious{ + width: 100px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:100px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.hml new file mode 100644 index 0000000..beeed5c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.hml @@ -0,0 +1,27 @@ + + +
+ + + + + +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.js new file mode 100644 index 0000000..5d3e9dc --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB023/index.js @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data:{ + value:"中文", + fontSize:30, + fontFamily:"HYQiHei-65S", + color: 220 + }, + changeValue:function() { + if(this.value == "chinese") { + this.value = "中文"; + } else { + this.value = "chinese"; + } + }, + changeFontSize:function() { + if(this.fontSize == 30) { + this.fontSize = 38; + } else { + this.fontSize = 30; + } + }, + changeFontFamily:function () { + if(this.fontFamily == "HYQiHei-65S") { + this.fontFamily = ""; + } else { + this.fontFamily = "HYQiHei-65S"; + } + }, + changeColor:function() { + if(this.color == 220) { + this.color = 80; + } else { + this.color = 220; + } + }, + ...goPage("pages/index/index", "pages/input/InputEventTest024/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.css new file mode 100644 index 0000000..f243397 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.css @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2021 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. + */ +.divClass { + width: 452px; + height: 452px; + margin: 0px; + margin-left: 5px; + margin-right: 5px; + margin-top: 5px; + margin-bottom: 5px; + border-width: 1px; + border-color: #0000ff; + border-radius: 226px; + background-color:black; + display: flex; + left: 0px; + top: 0px; + + flex-direction: row; + flex-wrap: wrap; + display: flex; + justify-content: center; + align-items: center; +} +.div2Class { + width: 300px; + height: 300px; + padding: 1px; + margin: 0px; + margin-left: 5px; + margin-right: 5px; + margin-top: 5px; + margin-bottom: 5px; + border-width: 1px; + border-color: #0000ff; + border-radius: 20px; + background-color:#77C054; + display: flex; + flex-direction: row; + flex-wrap: wrap; + display: flex; + justify-content: center; + align-items: center; +} +.textClass { + width: 300px; + height: 40px; + margin: 3px; + margin-left: 5px; + margin-right: 5px; + margin-top: 5px; + margin-bottom: 5px; + border-width: 1px; + border-color: #0000ff; + border-radius: 50px; + background-color: black; + display: flex; + left: 100px; + top: 20px; + + color: yellow; + font-size: 30px; + letter-spacing: 1px; + text-align: center; + text-overflow: ellipsis; + font-family: HYQiHei-65S; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} + +.bottom { + width: 454px; + height:150px; +} + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.hml new file mode 100644 index 0000000..8a3c142 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.hml @@ -0,0 +1,53 @@ + + +
+ 绑定性能测试 +
+ + 内联样式全面变化 +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.js new file mode 100644 index 0000000..6ff141e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/ButtonB30/index.js @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data: { + btnValue1: "属性变化", + color: 0x3366ff, + fontSize: 30, + width: 300, + height: 40, + padding: 10, + borderRadius: 50, + borderWidth: 1, + margin: 3, + marginleft: 5, + marginright: 5, + margintop: 5, + marginbottom: 5, + borderwidth: 1, + bordercolor: 0x0000ff, + backgroundcolor: 0x004E8C + }, + onInit: function() { + console.info("----- bindTest3 page onInit-------"); + }, + Test1: function() { + this.color = 0xffcc33; + this.fontSize = 38; + this.width = 150; + this.height = 100; + this.padding = 100; + this.borderRadius = 100; + this.borderWidth = 5; + this.padding = 50; + this.margin = 13; + this.marginleft = 15; + this.marginright = 15; + this.margintop = 15; + this.marginbottom = 15; + this.borderwidth = 10; + this.bordercolor = 0X00ACAC; + this.backgroundcolor = 0xFEF102; + }, + Test2: function() { + this.color = 0x3366ff; + this.fontSize = 30; + this.width = 300; + this.height = 40; + this.padding = 10; + this.borderRadius = 50; + this.borderWidth = 1; + this.padding = 10; + this.margin = 3; + this.marginleft = 5; + this.marginright = 5; + this.margintop = 5; + this.marginbottom = 5; + this.borderwidth = 1; + this.bordercolor = 0x0000ff; + this.backgroundcolor = 0x004E8C; + }, + ...goPage("pages/input/CheckboxA029/index", "pages/input/RadioEventTest031/index") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.css new file mode 100644 index 0000000..ffd29ce --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.css @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021 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. + */ +.container{ + width: 454px; + height: 600px; + flex-direction: column; +} + +.checkbox { + margin-left: 100px; + margin-top: 10px; +} + +.button { + width: 200px; + height:60px; + margin-left: 80px; + margin-top: 10px; +} + +.bottom{ + width:454px; + height:200px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top:10px; +} + +.page { + width:120px; + height:60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.hml new file mode 100644 index 0000000..b3179dc --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.hml @@ -0,0 +1,29 @@ + + +
+
+ +
+ + + + +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.js new file mode 100644 index 0000000..853040f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxA029/index.js @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data:{ + ifStatus:true, + data:[true, false], + showStatus:true + }, + changeIf:function() { + if(this.ifStatus) { + this.ifStatus = false; + } else { + this.ifStatus = true; + } + }, + changeShow:function() { + if(this.showStatus) { + this.showStatus = false; + } else { + this.showStatus = true; + } + }, + changeFor:function() { + if(this.data.length == 2) { + this.data =[true]; + } else { + this.data = [true, false]; + } + }, + ...goPage("pages/input/ButtonA028/index", "pages/input/ButtonB30/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.css new file mode 100644 index 0000000..b8fbe8f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.css @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column +} + +.checkbox { + margin-left: 150px; + margin-top: 40px; +} + +.text { + margin-left: 100px; + margin-top: 20px; + text-align:center; + width: 250px; + height: 60px; +} + +.bottom { + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height:60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml new file mode 100644 index 0000000..331f456 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml @@ -0,0 +1,24 @@ + + +
+ + {{show}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js new file mode 100644 index 0000000..a40291e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data:{ + checked:true, + show:"show" + }, + changeEvent:function(e) { + if(e.checked) { + this.show = "false"; + } else { + this.show = "true"; + } + }, + changeChecked:function() { + this.checked = !this.checked; + }, + ...goPage("pages/input/InputEventTest024/index", "pages/input/CheckboxE026/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.css new file mode 100644 index 0000000..7096378 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.checkbox { + margin-left: 100px; + margin-top: 20px; + flex-direction: column; +} + +.text { + width: 300px; + height: 60px; + margin-left:100px; + margin-top:30px; + text-align: center; +} + +.bottom { + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height:60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.hml new file mode 100644 index 0000000..18be652 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.hml @@ -0,0 +1,26 @@ + + +
+ + {{click}} + {{press}} + {{change}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.js new file mode 100644 index 0000000..6503fc8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE026/index.js @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data:{ + click:"click", + press:"press", + change:"change" + }, + ...goPage("pages/input/CheckboxB025/index", "pages/input/CheckboxE027/index"), + clickEvent:function() { + if(this.click == "click") { + this.click = "clicked"; + } else { + this.click = "click"; + } + }, + changeEvent:function(e) { + if(e.checked) { + this.change = "true"; + } else { + this.change = "false"; + } + }, + pressEvent:function() { + if(this.press = "press") { + this.press = "pressed"; + } else { + this.press = "press"; + } + } + +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.css new file mode 100644 index 0000000..9737a02 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.css @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021 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. + */ +.container{ + width: 454px; + height: 454px; + flex-direction: column; +} + +.checkbox { + margin-left: 100px; + margin-top: 20px; +} + +.text { + width: 250px; + margin-left:100px; + margin-top: 40px; + text-align: center; +} + +.bottom { + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top:10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml new file mode 100644 index 0000000..879ba2f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml @@ -0,0 +1,24 @@ + + +
+ + {{show}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js new file mode 100644 index 0000000..a4ddd19 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data:{ + checked:true, + show:"show" + }, + changeEvent:function(e){ + this.checked = !this.checked; + if(e.checked) { + this.show = "true"; + } else { + this.show = "false"; + } + }, + ...goPage("pages/input/CheckboxE026/index", "pages/input/ButtonA028/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.css new file mode 100644 index 0000000..74273bb --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container{ + width: 454px; + height: 454px; + flex-direction: column +} + +.button{ + width:200px; + height:60px; + margin-left: 100px; + margin-top: 20px; +} + +.bottom { + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} + +.text { + width: 300px; + height:60px; + margin-top: 10px; + margin-left: 50px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml new file mode 100644 index 0000000..c4aefe4 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml @@ -0,0 +1,25 @@ + + +
+ + + {{show}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js new file mode 100644 index 0000000..0411ca1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data:{ + show:"show" + }, + clickOneArg:function() { + this.show = "clickOne"; + }, + pressOneArg:function() { + this.show = "pressOne"; + }, + clickNoArg:function() { + this.show = "clickNo"; + }, + pressNoArg:function() { + this.show = "pressNo"; + }, + ...goPage("pages/input/ButtonB023/index", "pages/input/CheckboxB025/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.css new file mode 100644 index 0000000..7a16423 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.css @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + display: flex; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} +.title { + left: 120px; + top: 100px; + font-size: 30px; + text-align: center; + width: 300px; + height: 100px; +} +.input { + left: 155px; + top: 190px; + width: 110px; + /* height: 50px; */ + color: blue; + font-size: 30px; + font-family: HYQiHei-65S; +} +.input1 { + left: 170px; + top: 260px; + width: 110px; + height: 50px; + color: blue; + font-size: 30px; + font-family: HYQiHei-65S; +} +.input2 { + left: 170px; + top: 330px; + width: 110px; + height: 60px; + color: blue; + font-size: 30px; + font-family: HYQiHei-65S; +} +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} + +.bottom { + left:50px; + top:400px; + width: 454px; + height:150px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.hml new file mode 100644 index 0000000..9c15af5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.hml @@ -0,0 +1,49 @@ + + + + + Hello {{title}} + + + + + + + +
+ + +
+ \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.js new file mode 100644 index 0000000..f5ba015 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/RadioEventTest031/index.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 {goPage} from "../../../common/js/general"; +export default { + data: { + title: 'World' + }, + clickbutton(){ + this.title="12331" + }, + buttonpress(){ + this.title="zhongguo" + }, + changecheckbox(){ + this.title=this.title+11 + }, + changeradio(){ + this.title=this.title+"!" + }, + ...goPage("pages/input/ButtonB30/index", "") +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.css new file mode 100644 index 0000000..78e29ea --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.css @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} +.title { + font-size: 30px; + text-align: center; + width: 400px; + height: 50px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.hml new file mode 100644 index 0000000..67c61d2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.hml @@ -0,0 +1,27 @@ + + +
+ + Lifecycle + + {{$item}} + +
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.js new file mode 100644 index 0000000..46c40a1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/lifecycle/index.js @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../common/js/general"; +export default { + data: { + lifecycles: [] + }, + onInit() { + console.log("onInit triggered."); + this.lifecycles.push("onInit triggered."); + }, + onReady() { + console.log("onReady triggered."); + this.lifecycles.push("onReady triggered."); + }, + onShow() { + console.log("onShow triggered."); + this.lifecycles.push("onShow triggered."); + }, + onDestroy() { + console.log("onDestroy triggered."); + this.lifecycles.push("onDestroy triggered."); + }, + ...routePage("", "") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.hml new file mode 100755 index 0000000..aa62328 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.hml @@ -0,0 +1,38 @@ + + + + list-item1 + + + + + mytext0 + + + + + mytext1 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.js new file mode 100644 index 0000000..d7045a5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item1/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {alterPage} from "../../../common/js/general"; +export default { + ...alterPage("", "pages/list-item/item2/index"), + listClick() { + console.log("list onclick is triggered"); + }, + scrollEnd(endState, endComponentIndex) { + console.log("list onscrollend is triggered, end component index=" + endComponentIndex); + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.hml new file mode 100755 index 0000000..2520e64 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.hml @@ -0,0 +1,53 @@ + + + + list-item2 + + + + + + + + + + + + + + + text1 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.js new file mode 100644 index 0000000..6644123 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item2/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {alterPage} from "../../../common/js/general"; +export default { + ...alterPage("pages/list-item/item1/index", "pages/list-item/item3/index"), + listClick() { + console.log("list onclick is triggered"); + }, + scrollEnd(endState, endComponentIndex) { + console.log("list onscrollend is triggered, end component index=" + endComponentIndex); + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.hml new file mode 100755 index 0000000..4cc1e30 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.hml @@ -0,0 +1,34 @@ + + + + list-item3 + + + + + + first--{{$idx}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.js new file mode 100644 index 0000000..0aa9552 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item3/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {alterPage} from "../../../common/js/general"; +export default { + data: { + listData: [] + }, + ...alterPage("pages/list-item/item2/index", "pages/list-item/item4/index"), + listClick() { + console.log("list onclick is triggered"); + }, + scrollEnd(endState, endComponentIndex) { + console.log("list onscrollend is triggered, end component index=" + endComponentIndex); + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.hml new file mode 100755 index 0000000..0ad9c94 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.hml @@ -0,0 +1,34 @@ + + + + list-item4 + + + + + + item--{{$idx}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.js new file mode 100755 index 0000000..36d4011 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list-item/item4/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {alterPage} from "../../../common/js/general"; +export default { + data: { + listData: ["common/left.png"] + }, + ...alterPage("pages/list-item/item3/index", ""), + listClick() { + console.log("list onclick is triggered"); + }, + scrollEnd(endState, endComponentIndex) { + console.log("list onscrollend is triggered, end component index=" + endComponentIndex); + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.hml new file mode 100755 index 0000000..3cce92c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.hml @@ -0,0 +1,30 @@ + + + + list1 + + + + + + item-{{$idx}} + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.js new file mode 100644 index 0000000..7557f62 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list1/index.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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 { alterPage } from "../../../common/js/general"; +import { listData } from "../../../common/js/list"; +export default { + data: { listData: listData }, + ...alterPage("", "pages/list/list2/index"), + listClick() { + console.log("list onclick is triggered"); + }, + scrollEnd(endState, endComponentIndex) { + console.log( + "list onscrollend is triggered, end component index=" + endComponentIndex + ); + }, + clickSplice() { + console.log("delete last 3 item"); + this.listData.splice(3, 3); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.css new file mode 100644 index 0000000..6220000 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:250px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.hml new file mode 100755 index 0000000..6840ce8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.hml @@ -0,0 +1,64 @@ + + + + list2 + + + + + + item--{{$idx}} + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.js new file mode 100755 index 0000000..3b79076 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/list/list2/index.js @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2021 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 { alterPage } from "../../../common/js/general"; +import { listData } from "../../../common/js/list"; +export default { + data: { + listData: listData + }, + ...alterPage("pages/list/list1/index", ""), + listClick() { + console.log("list onclick is triggered"); + }, + scrollStart(startState, startComponentIndex) { + console.log( + "list onscrollstart is triggered, start component index=" + + startComponentIndex + ); + }, + scrollEnd(endState, endComponentIndex) { + console.log( + "list onscrollend is triggered, end component index=" + endComponentIndex + ); + }, + itemSelected(passState, passComponentIndex) { + console.log( + "list onitemselected is triggered, pass component index=" + + passComponentIndex + ); + }, + clickSplice() { + console.log("delete first item and add new item at current position"); + this.listData.splice(0, 1, "common/leftHead.png"); + }, + clickPush() { + console.log("add new item after last item"); + this.listData.push("common/leftHead.png"); + }, + clickPop() { + console.log("delete the last item"); + this.listData.pop(); + }, + clickShift() { + console.log("delete the first item"); + this.listData.shift(); + }, + clickUnShift() { + console.log("add new item before the first item"); + this.listData.unshift("common/leftHead.png"); + }, + onInit() { + console.log("on init called..."); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.hml new file mode 100644 index 0000000..1db9abd --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.hml @@ -0,0 +1,43 @@ + + + + attr006 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.js new file mode 100644 index 0000000..0e72f0b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr006/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getText, getTime, data} from "../../../common/js/picker_view" +export default { + data: data, + getText: getText, + getTime: getTime, + ...routePage("pages/index/index", "pages/picker_view/attr007/index"), + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.hml new file mode 100644 index 0000000..af25bda --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.hml @@ -0,0 +1,42 @@ + + + + attr007 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.js new file mode 100644 index 0000000..aeba621 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr007/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getText, getTime, data} from "../../../common/js/picker_view" +export default { + data: data, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/attr006/index", "pages/picker_view/attr008/index"), + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.hml new file mode 100644 index 0000000..0d92f6e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.hml @@ -0,0 +1,43 @@ + + + + attr008 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.js new file mode 100644 index 0000000..e8ab2e8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/attr008/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getText, getTime, data} from "../../../common/js/picker_view" +export default { + data: data, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/attr007/index", "pages/picker_view/event001/index"), + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.hml new file mode 100644 index 0000000..775eec6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.hml @@ -0,0 +1,44 @@ + + + + bind001 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.js new file mode 100644 index 0000000..a7cec1b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind001/index.js @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../../common/js/general"; +import { + lifeCycleFunc, + getText, + getTime +} from "../../../common/js/picker_view"; +export default { + data: { + textValue: "text", + rangeList: ["Aa", "Bb", "Cc", "Dd", "Ee", "Ff", "Gg", "Hh", "Ii"], + selectedIndex: 1 + }, + getText: getText, + getTime: getTime, + ...routePage( + "pages/picker_view/event004/index", + "pages/picker_view/bind002/index" + ), + changeAttrs() { + this.selectedIndex++; + this.rangeList = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]; + }, + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.hml new file mode 100644 index 0000000..8278d85 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.hml @@ -0,0 +1,45 @@ + + + + bind002 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.js new file mode 100644 index 0000000..021322e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind002/index.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getTime, getText} from "../../../common/js/picker_view" +export default { + data: { + textValue: "text", + rangeList: ["Aa", "Bb", "Cc", "Dd", "Ee", "Ff", "Gg", "Hh", "Ii"], + fontcolor: 255, + selectedfontcolor: 8386312, + fontsize: 30, + selectedfontsize: 38 + }, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/bind001/index", "pages/picker_view/bind003/index"), + changeStyles() { + this.fontcolor = 8386312; + this.selectedfontcolor = 255; + this.fontsize = 38; + this.selectedfontsize = 30; + }, + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.hml new file mode 100644 index 0000000..c2eda23 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.hml @@ -0,0 +1,43 @@ + + + + bind003 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.js new file mode 100644 index 0000000..822797e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind003/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getTime, getText} from "../../../common/js/picker_view" +export default { + data: { + textValue: "time", + selectedTime: "0:0" + }, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/bind002/index", "pages/picker_view/bind004/index"), + changeAttrs() { + this.selectedTime = "11:11"; + }, + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.hml new file mode 100644 index 0000000..4316a5d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.hml @@ -0,0 +1,44 @@ + + + + bind004 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.js new file mode 100644 index 0000000..198a77d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/bind004/index.js @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getTime, getText} from "../../../common/js/picker_view" +export default { + data: { + textValue: "time", + fontcolor: 255, + selectedfontcolor: 8386312, + fontsize: 30, + selectedfontsize: 38 + }, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/bind003/index", "pages/index/index"), + changeStyles() { + this.fontcolor = 8386312; + this.selectedfontcolor = 255; + this.fontsize = 38; + this.selectedfontsize = 30; + }, + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.hml new file mode 100644 index 0000000..ae7bbe0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.hml @@ -0,0 +1,43 @@ + + + + event001 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.js new file mode 100644 index 0000000..c8d58e7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event001/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getTime, getText} from "../../../common/js/picker_view" +export default { + data: { + textValue: "text", + rangeList: ["Aa", "Bb", "Cc", "Dd", "Ee", "Ff", "Gg", "Hh", "Ii"] + }, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/attr008/index", "pages/picker_view/event002/index"), + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.css new file mode 100644 index 0000000..a86744c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.pickStyle { + color:blue; + font-size:30px; + font-family:HYQiHei-65S; + selected-color:#7ff708; + selected-font-size:38px; + selected-font-family:HYQiHei-65S; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.hml new file mode 100644 index 0000000..5a60c62 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.hml @@ -0,0 +1,44 @@ + + + + event002 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.js new file mode 100644 index 0000000..6e19c6b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event002/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getText, getTime} from "../../../common/js/picker_view" +export default { + data: { + textValue: "text", + rangeList: ["Aa", "Bb", "Cc", "Dd", "Ee", "Ff", "Gg", "Hh", "Ii"] + }, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/event001/index", "pages/picker_view/event003/index"), + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.hml new file mode 100644 index 0000000..594c913 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.hml @@ -0,0 +1,42 @@ + + + + event003 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.js new file mode 100644 index 0000000..833378a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event003/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getText, getTime, data} from "../../../common/js/picker_view" +export default { + data: data, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/event002/index", "pages/picker_view/event004/index"), + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.css new file mode 100644 index 0000000..a86744c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.pickStyle { + color:blue; + font-size:30px; + font-family:HYQiHei-65S; + selected-color:#7ff708; + selected-font-size:38px; + selected-font-family:HYQiHei-65S; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.hml new file mode 100644 index 0000000..296b6b4 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.hml @@ -0,0 +1,43 @@ + + + + event004 + {{textValue}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.js new file mode 100644 index 0000000..c24199e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/picker_view/event004/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +import {lifeCycleFunc, getText, getTime, data} from "../../../common/js/picker_view" +export default { + data: data, + getText: getText, + getTime: getTime, + ...routePage("pages/picker_view/event003/index", "pages/picker_view/bind001/index"), + ...lifeCycleFunc +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.hml new file mode 100644 index 0000000..01ab347 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.hml @@ -0,0 +1,38 @@ + + + + resource005 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.js new file mode 100644 index 0000000..322aa37 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource005/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + imgSrc: "common/test.png" + }, + ...routePage('', "pages/resource/resource007/index") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.hml new file mode 100644 index 0000000..b856d99 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.hml @@ -0,0 +1,38 @@ + + + + resource007 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.js new file mode 100644 index 0000000..e39a1e1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/resource/resource007/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + imgSrc: "abc/test.png" + }, + ...routePage("pages/resource/resource005/index", "") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.css new file mode 100644 index 0000000..2066c1a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.css @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:454px; + height:54px; +} + +.buttonBlock { + width: 300px; + height: 50px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.hml new file mode 100644 index 0000000..0ba03e3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.hml @@ -0,0 +1,39 @@ + + +
+
+ Router_Replace_Test_001 +
+
+
+ + this is the first page + +
+ + + + + +
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.js new file mode 100644 index 0000000..df75ecd --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/01/index.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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 router from "@system.router"; +import { routePage, routeSimplePage } from "../../../common/js/general"; +export default { + data: {}, + button1() { + router.replace(); + }, + button2() { + router.replace({}); + }, + button3() { + router.replace({ uri: "pages/page2/" }); + }, + button4() { + router.replace({ uri: 123 }); + }, + button5() { + router.replace({ uri: "" }); + }, + ...routePage("pages/index/index", "pages/router/02/index") +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.css new file mode 100644 index 0000000..761fc5f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.css @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:454px; + height:54px; +} + +.buttonBlock { + width: 454px; + height: 75px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.hml new file mode 100644 index 0000000..27b20e2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.hml @@ -0,0 +1,31 @@ + + +
+
+ Router_Replace_Test_002 +
+
+ + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.js new file mode 100644 index 0000000..782261e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/02/index.js @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021 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 router from "@system.router"; +import { routePage } from "../../../common/js/general"; +export default { + data: {}, + button1() { + router.replace({ + uri: "pages/router/page2/page2", + xyz: "1" + }); + }, + button2() { + router.replace({ + uri: "/" + }); + }, + button3() { + router.replace({ + uri: "pages/router/page2/page2", + params: { xyz: 123 } + }); + }, + button4() { + router.replace({ + uri: "pages/router/page2/page2", + params: { xyz: "1" } + }); + }, + ...routePage("pages/router/01/index", "pages/router/03/index") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.css new file mode 100644 index 0000000..4aebbb8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.css @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.buttonBlock { + width: 454px; + height: 75px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.hml new file mode 100644 index 0000000..31b1345 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.hml @@ -0,0 +1,34 @@ + + +
+
+ Router_Replace_Test_002 +
+
+ + this is the first page + +
+ + +
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.js new file mode 100644 index 0000000..784f736 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/03/index.js @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021 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 router from "@system.router"; +import { routePage } from "../../../common/js/general"; +export default { + data: {}, + button1() { + router.replace({ + uri: "/" + }); + }, + button2() { + router.replace({ + uri: "pages/router/page3/page3" + }); + }, + ...routePage("pages/router/02/index", "pages/router/04/index") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.css new file mode 100644 index 0000000..2066c1a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.css @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:454px; + height:54px; +} + +.buttonBlock { + width: 300px; + height: 50px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.hml new file mode 100644 index 0000000..ea5920d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.hml @@ -0,0 +1,36 @@ + + +
+
+ Router_Replace_Test_004 +
+
+
+ + this is the first page + +
+ + + +
+
+
+
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.js new file mode 100644 index 0000000..c330c8d --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/04/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 router from "@system.router"; +import { routePage } from "../../../common/js/general"; +export default { + data: {}, + button1() { + router.replace(""); + }, + button2() { + router.replace({ uri: 1 }); + }, + button3() { + router.replace({ path: "123" }); + }, + ...routePage("pages/router/03/index", "") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.css new file mode 100644 index 0000000..817f9f2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.css @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.hml new file mode 100644 index 0000000..1b2a4f9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.hml @@ -0,0 +1,25 @@ + + +
+
+ + this is the second page, click to return to first page + + + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.js new file mode 100644 index 0000000..615c10f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page2/page2.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 { routePage, routeSimplePage } from "../../../common/js/general"; +export default { + data: { + xyz: "" + }, + onInit() { + this.xyz = $page.xyz; + }, + switchToFirst: routeSimplePage("pages/router/02/index") +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.css new file mode 100644 index 0000000..817f9f2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.css @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.hml new file mode 100644 index 0000000..a6bea5c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.hml @@ -0,0 +1,24 @@ + + +
+
+ + this is the second page + + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.js new file mode 100644 index 0000000..b6f9be7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/router/page3/page3.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 { routePage, routeSimplePage } from "../../../common/js/general"; +export default { + data: {}, + button1: routeSimplePage("pages/router/page3/page3"), + button2: routeSimplePage("pages/router/03/index") +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.hml new file mode 100755 index 0000000..babaa46 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.hml @@ -0,0 +1,21 @@ + + + +scroll1 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.js new file mode 100644 index 0000000..b7b2ca1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll1/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 { alterPage } from "../../../common/js/general"; +export default { + ...alterPage("", "pages/scroll/scroll2/index"), + onInit() { + console.log("on init called..."); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.hml new file mode 100755 index 0000000..1f796a6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.hml @@ -0,0 +1,21 @@ + + + +scroll2 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.js new file mode 100644 index 0000000..a3bf161 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll2/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 { alterPage } from "../../../common/js/general"; +export default { + ...alterPage("pages/scroll/scroll1/index", "pages/scroll/scroll3/index"), + onInit() { + console.log("on init called..."); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.hml new file mode 100755 index 0000000..2ce2a4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.hml @@ -0,0 +1,21 @@ + + + +scroll3 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.js new file mode 100644 index 0000000..04e2d45 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll3/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 { alterPage } from "../../../common/js/general"; +export default { + ...alterPage("pages/scroll/scroll2/index", "pages/scroll/scroll4/index"), + onInit() { + console.log("on init called..."); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.hml new file mode 100755 index 0000000..0c084c1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.hml @@ -0,0 +1,21 @@ + + + +scroll4 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.js new file mode 100644 index 0000000..58389e5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll4/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 { alterPage } from "../../../common/js/general"; +export default { + ...alterPage("pages/scroll/scroll3/index", "pages/scroll/scroll5/index"), + onInit() { + console.log("on init called..."); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.hml new file mode 100755 index 0000000..14d4f75 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.hml @@ -0,0 +1,22 @@ + + + + scroll5 + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.js new file mode 100644 index 0000000..ce8e22e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll5/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 { alterPage, routeSimplePage } from "../../../common/js/general"; +export default { + ...alterPage("pages/scroll/scroll4/index", ""), + go: routeSimplePage("pages/scroll/scroll6/index"), + onInit() { + console.log("on init called..."); + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.hml new file mode 100755 index 0000000..050808b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.hml @@ -0,0 +1,22 @@ + + + + scroll6 + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.js new file mode 100644 index 0000000..8503154 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/scroll/scroll6/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 { alterPage, routeSimplePage } from "../../../common/js/general"; +export default { + ...alterPage("pages/scroll/scroll4/index", ""), + back: routeSimplePage("pages/scroll/scroll5/index"), + onInit() { + console.log("on init called..."); + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.css new file mode 100644 index 0000000..6b5ad26 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.css @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2021 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. + */ +#container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} +#testTitle { + font-size: 30px; + text-align: center; + width: 300px; + height: 65px; +} +.title { + font-size: 30px; + text-align: center; + border-color: aqua; + border-width: 2px; + width: 200px; + height: 30px; +} +.title2 { + margin: 20px; + font-size: 38px; + border-color: aqua; + border-width: 2px; + text-align: center; + width: 350px; + height: 30px; +} +#secDiv { + display: flex; + justify-content: center; + flex-direction: row; + left: 0px; + top: 200px; + width: 454px; + height: 60px; +} +.button { + width: 150px; + height: 50px; +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.hml new file mode 100644 index 0000000..243da60 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.hml @@ -0,0 +1,35 @@ + + +
+ 测试ID/Class选择器及内联样式 + + Hello {{title}} + + + {{title}} {{title2}} + +
+ +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.js new file mode 100644 index 0000000..7cbf233 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/style/StyleBaseTest001/index.js @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2021 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 { routePage, routeSimplePage } from "../../../common/js/general"; +export default { + data: { + title: "World", + titleIndex: 0, + textColor: 16645886, + title2: "World", + title2Index: 0, + text2Color: 16645886 + }, + exitPage: routeSimplePage("pages/index/index"), + // change second title + changeTitle2() { + this.title2Index++; + if (this.title2Index % 2 > 0) { + this.title2 = "冲冲"; + this.text2Color = 6749952; + } else { + this.title2 = "你好"; + this.text2Color = 16750848; + } + }, + // change first title + changeTitle() { + this.titleIndex++; + if (this.titleIndex % 2 > 0) { + this.title = "JS"; + this.textColor = 13321031; + } else { + this.title = "世界"; + this.textColor = 16645886; + } + } +}; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.hml new file mode 100644 index 0000000..41ef326 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.hml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + attr006 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.js new file mode 100644 index 0000000..0d92b53 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA06/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + index: 2 + }, + updateIndex() { + this.index = 0; + }, + showPage(e) { + this.index = e.index; + }, + ...routePage('', "pages/swiper/SwiperA15/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.hml new file mode 100644 index 0000000..9649ba7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.hml @@ -0,0 +1,51 @@ + + + + + + + + + attr015 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.js new file mode 100644 index 0000000..22bde47 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA15/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0, + vert: true + }, + showPage(e) { + this.index = e.index; + }, + updateVert() { + this.vert = false; + console.log(this.vert); + }, + ...routePage("pages/swiper/SwiperA06/index", "pages/swiper/SwiperA16/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.hml new file mode 100644 index 0000000..e593052 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.hml @@ -0,0 +1,46 @@ + + + + + + + + + attr016 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.js new file mode 100644 index 0000000..d8ea98e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA16/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0 + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperA15/index", "pages/swiper/SwiperA17/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.hml new file mode 100644 index 0000000..d709bc6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.hml @@ -0,0 +1,50 @@ + + + + + + + + + attr017 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.js new file mode 100644 index 0000000..d9d7c98 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA17/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0 + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperA16/index", "pages/swiper/SwiperA18/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.hml new file mode 100644 index 0000000..459b454 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.hml @@ -0,0 +1,50 @@ + + + + + + + + + attr018 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.js new file mode 100644 index 0000000..91e75a3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA18/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0, + loop: 100 + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperA17/index", "pages/swiper/SwiperA20/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.hml new file mode 100644 index 0000000..5e06763 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.hml @@ -0,0 +1,65 @@ + + + + + + + + + attr020 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.js new file mode 100644 index 0000000..34a746f --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperA20/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0, + loopVal: true + }, + showPage(e) { + this.index = e.index; + }, + updateLoop() { + this.loopVal = false; + console.log(this.loopVal); + }, + ...routePage("pages/swiper/SwiperA18/index", "pages/swiper/SwiperE01/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.hml new file mode 100644 index 0000000..9d2f0eb --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.hml @@ -0,0 +1,49 @@ + + + + + + + + + children001 + + + + + + + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.js new file mode 100644 index 0000000..4538ece --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC01/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0 + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperS02/index", "pages/swiper/SwiperC02/index") +} diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.hml new file mode 100644 index 0000000..ba99d1a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.hml @@ -0,0 +1,51 @@ + + + + + + + 第{{$item}}页 + + + children002 + + + + + 第{{$item}}页 + + + + + 第7页 + + + + + + + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.js new file mode 100644 index 0000000..b17d636 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperC02/index.js @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + listData0: [ + 1, + 2, + 3 + ], + listData1: [ + 4, + 5, + 6 + ], + indexVal: 6, + ifStatus: true + }, + ...routePage("pages/swiper/SwiperC01/index", ""), + changeIf() { + this.ifStatus = false; + this.indexVal = 6; + }, + changeIndex() { + this.indexVal = 5; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.hml new file mode 100644 index 0000000..51f9692 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.hml @@ -0,0 +1,50 @@ + + + + + + + + + event001 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.js new file mode 100644 index 0000000..3bfddd6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE01/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0, + text1: "change事件触发引起页面标号改变" + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperA20/index", "pages/swiper/SwiperE02/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.hml new file mode 100644 index 0000000..b1db8ab --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.hml @@ -0,0 +1,50 @@ + + + + + + + + + event002 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.js new file mode 100644 index 0000000..0dac421 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE02/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0 + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperE01/index", "pages/swiper/SwiperE03/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.hml new file mode 100644 index 0000000..b558df8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.hml @@ -0,0 +1,67 @@ + + + + + + + + + + + event003 + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.js new file mode 100644 index 0000000..0014160 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperE03/index.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0, + text2: "longpress", + text3: "click" + }, + textChange2() { + this.text2 = "triggered"; + }, + textChange3() { + this.text3 = "triggered"; + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperE02/index", "pages/swiper/SwiperS01/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.hml new file mode 100644 index 0000000..0f3e3e9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.hml @@ -0,0 +1,52 @@ + + +
+ + + + + + style001 + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.js new file mode 100644 index 0000000..f58ac2a --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS01/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0 + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperE03/index", "pages/swiper/SwiperS02/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.hml new file mode 100644 index 0000000..35eecf8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.hml @@ -0,0 +1,50 @@ + + + + + + + + + style002 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.js new file mode 100644 index 0000000..13e7f71 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/swiper/SwiperS02/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + index: 0 + }, + showPage(e) { + this.index = e.index; + }, + ...routePage("pages/swiper/SwiperS01/index", "pages/swiper/SwiperC01/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.css new file mode 100644 index 0000000..4d58560 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.css @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ + +.container { + width:454px; + height: 454px; + flex-direction: column; +} + +.radio { + margin-left: 150px; + margin-top: 50px; +} + +.page { + width: 454px; + height: 120px; + flex-direction: row; +} + +.button { + width: 120px; + height: 80px; + margin-top: 20px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.hml new file mode 100644 index 0000000..8278eea --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.hml @@ -0,0 +1,22 @@ + + +
+ +
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.js new file mode 100644 index 0000000..693b6ce --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_radio_value_test010/index.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 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 router from "@system.router" +export default { + data : { + width:80, + height:90 + }, + changeArea: function() { + if (this.width == 80) { + this.width = 40; + } else { + this.width = 80; + } + if (this.height == 90) { + this.height = 50; + } else { + this.height = 90; + } + }, + goHome: function() { + router.replace({uri: "pages/index/index"}); + }, + goPrevious: function() { + router.replace({uri: "pages/switch-radio-width/width_switch_value_test009/index"}); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.css new file mode 100644 index 0000000..cfc67d2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.css @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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. + */ + +.container { + width : 454px; + height : 454px; + flex-direction : column; +} + +.switch { + margin-top : 50px; + margin-left : 150px; +} + +.button { + width : 100px; + height : 60px; +} + +.page { + width : 454px; + height : 120px; + flex-direction : row; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.hml new file mode 100644 index 0000000..5766921 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.hml @@ -0,0 +1,22 @@ + + +
+ +
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.js new file mode 100644 index 0000000..1eb6dd7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch-radio-width/width_switch_value_test009/index.js @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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 router from "@system.router" + +export default { + data : { + width : 80, + height : 90 + }, + changeArea : function() { + if (this.width == 80) { + this.width = 40; + } else { + this.width = 80; + } + if (this.height == 90) { + this.height = 50; + } else { + this.height = 90; + } + }, + goHome : function() { + router.replace({uri : "pages/index/index"}); + }, + changeNext : function() { + router.replace({uri : "pages/switch-radio-width/width_radio_value_test010/index"}); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.hml new file mode 100644 index 0000000..859c3eb --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.hml @@ -0,0 +1,30 @@ + + + + + + {{state}} + + + attr004 + + + + + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.js new file mode 100644 index 0000000..52d2b1c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchA04/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; +export default { + data: { + state: false + }, + changeState() { + this.state = !this.state; + }, + ...routePage('', "pages/switch/SwitchE01/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.hml new file mode 100644 index 0000000..635da86 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.hml @@ -0,0 +1,30 @@ + + + + + + {{state}} + + + event001 + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.js new file mode 100644 index 0000000..063e750 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE01/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + state: false + }, + changeState() { + this.state = !this.state; + }, + ...routePage("pages/switch/SwitchA04/index", "pages/switch/SwitchE02/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.hml new file mode 100644 index 0000000..b77a52e --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.hml @@ -0,0 +1,30 @@ + + + + + + {{state}} + + + event002 + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.js new file mode 100644 index 0000000..a81fdee --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE02/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + state: false + }, + changeState() { + this.state = !this.state; + }, + ...routePage("pages/switch/SwitchE01/index", "pages/switch/SwitchE03/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.hml new file mode 100644 index 0000000..594d540 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.hml @@ -0,0 +1,40 @@ + + + + + + {{text1}} + + + {{text2}} + + + event003 + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.js new file mode 100644 index 0000000..032c689 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE03/index.js @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + text1: "click", + text2: "longpress" + }, + changeText1() { + this.text1 = "triggered"; + }, + changeText2() { + this.text2 = "triggered"; + }, + ...routePage("pages/switch/SwitchE02/index", "pages/switch/SwitchE04/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.hml new file mode 100644 index 0000000..4a07c6b --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.hml @@ -0,0 +1,40 @@ + + + + + + {{text1}} + + + {{text2}} + + + event004 + + + + + diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.js new file mode 100644 index 0000000..b008643 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchE04/index.js @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + data: { + text1: "click", + text2: "change" + }, + changeText1() { + this.text1 = "triggered"; + }, + changeText2() { + this.text2 = "triggered"; + }, + ...routePage("pages/switch/SwitchE03/index", "pages/switch/SwitchS01/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.hml new file mode 100644 index 0000000..4070d87 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.hml @@ -0,0 +1,28 @@ + + +
+ + + style001 + + + + + + +
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.js new file mode 100644 index 0000000..8281713 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS01/index.js @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + ...routePage("pages/switch/SwitchE03/index", "pages/switch/SwitchS02/index") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.css b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.hml new file mode 100644 index 0000000..3e69013 --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.hml @@ -0,0 +1,28 @@ + + + + + + style002 + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.js new file mode 100644 index 0000000..009ec0c --- /dev/null +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/switch/SwitchS02/index.js @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general" +export default { + ...routePage("pages/switch/SwitchS01/index", "") +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/res/drawable/icon.png b/test/moduletest/common/test_app/ui_auto_test/src/main/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6ebbe6521fa8f6b75d263cf9a6858529fc86fa87 GIT binary patch literal 10591 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/res/drawable/icon_small.png b/test/moduletest/common/test_app/ui_auto_test/src/main/res/drawable/icon_small.png new file mode 100644 index 0000000000000000000000000000000000000000..c69db787b2744937e1d88b67c8c1349bce9e5f3d GIT binary patch literal 6371 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_052.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_052.png new file mode 100755 index 0000000000000000000000000000000000000000..ec68bde7cb5ff8b6427fac4d94357d9f2868e6f9 GIT binary patch literal 2015 zcmeAS@N?(olHy`uVBq!ia0vp^cR-kf4M<8yoo{4dU|;6x;uum9_xASQRXP!(t`9>q z6q>e7oVYL{CoOGt2fu;_hm@qG)D{Ve89x{nbuQvhP?*te*RXKn%np48H@E1%8wC^J z*@Zq&zdCpF`(?4A*>4TMC4A?vm8=(VNa#I~nmfsnL&2b_m{TA^MPY~Q4L3yvi*klW zSEi=umRu30regL{i9sJEe$nkCi#3$dHS=xGk<;(cB-zQ^&s!bzK?|ma|8Az9kYBMZ2bA}%%AVh z)YPTfl^wlq_e!~`TJ6B~AG;pJHNWEBUwQ85w=*@_Y5Po!-{1Lg^|+nZj^iA6AFk(q z$9F;AZC-Jmsqy_8GyU&>(09ta8CJ0ULe#G{52iW%|39PnoP64|)$1+d3f6OcUumzq zWBH`&XWv=A`!p8XE`@4NzL%M0I8duyI{SKy9)`m^W8pRdpSdGw6UpYOY}|8cyN@;W_V@Q%@k@5f^W z@9a-|_TBjN;?qw*^%tKjXDL^Y)VByL(C7F(ZT_zb59Iz``}p4Y^X-{GZ#rk>vuN#z zX4t=Uz9`Tsdw^QgpXD2WUOw~Z*{4N6KeMlW(z<){3UN8@9pY?NZ_m#ymix!wuro%l ze$O-Orrm9qZvU4&xc6`0zugNTIJwwvTK2%nhD*<7$^$DG&UJ?ui|ZX(3>2??I6}F= zAP8;|5Qyo}$Swm??e5Dt6cu&|1YUcips<6l-%rrVp+IrbnwyRe1+sE;m0B8rffc#A zx#5A8jg>10C`M)7MAM|FKRk* qZ~(*H)S821)WXpqMM*UO8Kt}|-fT_Se-2o2GkCiCxvXYIQEca#RtkwmZHr?N&hmrjQ-*kK6nGgLhruTULIG;EM4y^VdIcw*2dc-0il7 zth#Vboc2k(t7fF|;b7ay>}u{jy-D*~7Aa;J(a&#nLE^AC^6SEDQMy-1I}wiFQB z3F}RDQ8>i+*rq74l993g@v5=%P1cqpi;od;s~74l2ktpM161eiMv!+W1S*|2q*? zmFen0Jgpr>;AuaCUdJixfs*5P>#-8GNa;>YAx9g*SpD+9wiUI#CrUQ4xsHm>Y)h=7 z9kW#cb`m~c1}$tan8K1y5G|SHXI5 zMO|VRB`e{>+yV#2qvA&63 zQ#uAkyu0C7eD0udf@6Dc9!s|nu7^kvqH~Xu8ythR57*dWU~y(`<8!63`}Fn>CLnCe z=P&*qD(snV_DId`f2;Lw)l9xLR#3m1nGJBIzv;>@;6csj2y^z#MXN5nRE+NkwdbM&LrZ}psa@P#!7wYqQgxBc+xc~lsEdsv0dLHGO-Ngc{HMt3 z^Fg#JoEOp^NV!&nv7`n=R%7)GrO~##Asa&?u16c76S);9c#TXsI;uKe zw&;&H#>~vP@0KD9GgvY zy#rEj4HqJACd?2Zs?qV6AIsJ=)8^55HD+cy@?~b)H#v-Yj$kfhu8{A-x^-hlV~3I^S=pyjwQbHr0V0UBPk$* zf3c;-976mCLYz{IUvMgSYSr8W2X7A#mVH+zvWFTl zsr<>7FJOhFSU7a0i#=*|c1h|qtEwW<8bFN;*ku^Mjrs2LUe>$YGX)FB8cMA0 zl1$w`=gdvG?H?H)>3z;TXpq!fh}Xz^8C3FvpQ4JmvcP~l4MnNQhm_@pz4H@Zyq%()Ta zBlz}|*NtjMoaQ>X&3UCyJF)Oq+%Vl0(;0f_Xd4^SovxrqUUqKqXfft+4ny7hO3PlH zRP>uzwt5_K&efrOPj{Z%F^*FGb7#GmU0#I57ZJ5W4C>>TTzXYx z5Gc6BB&)OQyA}|6uQpDv_4JDlUpVouJO&TQBjC~LD?)n7Z<*(+I4AECJ{=-L0)ch6 z(AOp%R5qS!Gvnmz)JMf)@BFj_(3(njR$02MuJ)gsI{a|4lg-=r%NBN2ozzGdMMC_* zcdu)EdV@Z8cCJM^PKlDDWU19bv?_1`-ESRjGW0@E zXjiZ=hDIp`z3eLe1=h_b&YnoB_EpCCn~A=pJx}e=q@&v(+ra|`enbAmUD2oZLi@HY z*`7r-(37JRwmDrUU+spruClfc<-Bh@i^z(3U@9~-EOG?)^LvC^O$?$LC$Vj*CZ$Chc)290F7eP5{yMK>34o42UMn;5}17A{qA^d-l*_ttt W$y8?RFf5?IE`awB_TwFiXZ{E8^YHNi literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_054.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_054.png new file mode 100755 index 0000000000000000000000000000000000000000..dfb035b37daa6d59ecce703e62c73b2b3aa19e1a GIT binary patch literal 2969 zcmeH}{Xf%tAIHBNbxn++LT<~=;S{PVWep*G-K3?HLgI8~8IJXl9*OAIyaiZDBfey!?ca2~ zvR~ROHn2axSG*0K=rb4OAG^P-Ba+oqz`J8Bt1c=}TBvmD$Dx+(WDcOU+w&Bw9c4L% zwiH6@ldwPDD;KdG zKx0Sq>J{S}bufv^RE=V0x|Vb7j>Y3^MxaQSqk#al9v+?c%@Z0tZk*#J^8h2PzmQ9L zUZ5CbkHv}280WM4goBLD4SAYqZ2iQabbul+gvq@y#DIU9hB7EBtE9|$sK-*<=vo2&I$fqqB>hkKTiUWvE)Bc2unioF-Tz& zxcHDsev_mR;qx|N^&o#^No=F+QC>=DP6)jlCU|r2g}{^=1^ci*JR`f6LWrWin?1V)}JD zt-Dq)B8W65tj}?f!7HyYQ~a)SI$MMj^*GBbKB^Hm(bhFR{st%(wnL)WS>GufX^Olb(r_6NI1Ahr<1m5z z%#^ZwRq$V1?r&eE_Jm%lw=?7E)!jDO0u5BR$p$ob7i_FRsf^w0t@GaS-`B zW&3kiWCA@t!-hh@ct=eXmE>dIrjfTu&)`)ZJ9_`T9boLuxo?(#ZP)k(B@ZNBW|9NB zqw~;L)b6qXQi(Kbb(~Z zG64{FZd;Z6@?QSzl zBPcK3mlHddSem|IUd0QWDuulJ>zS*s`*QZ$kgHM`T!XlAG}qWYPYQTVK?l_#@=7#0 zJ`81nejd?jA$khaMkNESBTmCh>LRO+vQkxDbFflXrf~aqt{o?>p7dgOm%o`g!CyjW zXTlL|43ANBn~FJAK2}rI=z*n6v}Z{2bFL>J&)R~b_qtdv!PV*-;i{o3>}eRs*!YF@ zY&Mz^Jck6`Ei-_wdFhJEq~o(4gWqCSGTbn1J#=F;DjCt%2=PNYrk*#V;t#a>Esj8^03 z(0J82vNW{AGF$bpK>%*9vrq%Rr0E@jhtC93GC7vb&h<%JP%@2JLg#0LqtU$E8tb0w z$NJtSSQPd#I=Ln`!`v)`+vgW&X2vZIfb#BC<7!6d*?Rgh4=KE@RYQ2w&P!Jo(m>HI zqJkLQE8a6Gv6cI=!sr9FNSeRQ7qJCt`t$-KBw&=`DtlXGwTI#L>jN2@%|9;gAK?#5 zoaC=D*=%XcTt>8y`eJy@6%GH!38$;AVARJnr_Dhj0AzH@H}Q)mYy6O-xS!z&+AfR8 z#{mHJ;pAVx8EJyh3Ux(d;fM&=@WaI#CfMs=>iuBo%^}gB{kv5|megG@4i^G~p4Y|e z>>VhCD=qixNZKe?Ow|*|Z7^!Eg?@F9hNNG%pWOF-^>@MlN1H9{ZcHejnLZHjtod>S N;J*ESET7oCe*nKVGK2sC literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_055.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_055.png new file mode 100755 index 0000000000000000000000000000000000000000..3942ba62b2896fe01882c411cffdab2c67903175 GIT binary patch literal 2453 zcmeH}`!|#c7{}j1dPgoZ+E#KoGsC2o*zJObk-K?KE}LSR$q=!-!x$PFjf5TMRUt#H zHN&Zt+8R>fH7?a8wUtqGwz14aZ)zQf*m8+jR{z2NxO+}NJkN8!=RD8%hwu6P@Dzpy z2N)S_G5`R;2%`D!TbSU_0KhUKU$6cA=(p0|tFpL_q7x?ihOgsbF(&`e zuTM5sK???BwDYG!)AsI-C;1ireq}^Bav?t9^^+y6vU?`}q^&+OoA9hj+NoZg)v{MO z{l83pI6k@9mEG4o+^Ig+KN#dr0CIQgY?GPh695d+vKr7S)WbRAoi7q{xDy!A*3=X6 z{i8e&P&BP2oS^}zX>6E*4*0-2$CHE+(uF}=L4u{=^U?ny2+4vq47=G{mGK7PZzLBK-bQQq zJ-a54%U13E&Yl!qI&;2`o>=aKm_Jp!uR+yy1DP@y@l%^h9N*X@P$hlOTAbB38k@A2<$)%DvRY>S}^89+)=SeruT)ik{cpITNILVnS8 z{R_o5J!FO_WCVVVF2SzEu~f*+$w9| zE<&%RCEUzwCd=lobL~*J);-0dD|R8zM5qaacRV6}!a%b9y~l4pwXM=&U4^WarrZQp z-dlM2Jo!nr=H6m53z9cB&()45gRP>M;adv1_MVa(-9j^HxhjH@7E6;}(vpdQ-eI53T@mo?i7zMQ|^Sj3fP z0E%?|q!xEYy0IZj(RF65+OI9(N-@>jO1M&8A4HkcTM>XLbBU{jBs{iZj^4pF?1;Jf z2H$WbrrIf;y7>ow{dE>`ye~0B4f362bR>v+iA5H6~SZ*%^6uo*G<-sG-k1mw= z%thmrc2|Ae{9J2sc%_}a(EiK@#Rjm{UJ?R>qh%W+5S>UOGZ)vUSP;TokI2;gf4hLs s0tu3ka9&gn@X7GA{G7&r5QZgekeO)W@W?^d>bnI%e!;#C-Z6Rq0KWmrAOHXW literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_056.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_056.png new file mode 100755 index 0000000000000000000000000000000000000000..8a3e96b2e8977c6c477182e0344e0c47fba96edf GIT binary patch literal 2752 zcmeHJYc!kL8vX>4x+bNa66(@~b`(8~(uN8rLaL(ew1d)2Gc*`P#+|w(6@hueI0vKJVJkdY@yA!QMVrb`A-KC@*g0~fxF~$ zb}rQnyY`K5dd2H&Y87v;ZYN9?rc{NuwXW8_vXZ*>6tA?pzp->2FaSZ@V33I2zECO^ zT47J6-T?UKL{nWY`akt-E+MEC>;%RakiFG{?Av8i2RnKOiuTL~Kv)nYh8}FD1FhKq zspS8WF*3y@dM*Odk?#O!Ernrn25JNTjR9ofEkR3-yqICK9kZU_vEcr%W8SJe3rjVfQ z?V`(GcJe^XR@#5%`IGX_j*T$!lSlNVpSKipqXuooy{7lkoMO9|^Ryu315+)!LMM6T z3xfu;^>9oi*S;Vs{TiTwwT5^=w{OML;X2)qNOL9#Ue@E??@JhKf_;P6tsJNn?T|mN z2BdUbz*N?pb3dS9Xb#@y#i=T`(r*>+VJRXjHj*(plwk1S{9Y|OJoAKW%4iixx&3

iHDnvA`9Wkw^4J<)bDiH@?B-B#r1;wp)Q9T~;md zm=S>*ksC2K>|spsnfaQTXDg3_Eh<*VDbX$<$ct;Q`B{6t4z*F{w2OV7k!`OrgsZh> z$DW&_IVOjfRb=?sCJ%^yJ7M~P#N^?=4Rtm{%X0~Hg>Eq^7zEi zPn!T;QIRU4YiO+XkljDCQ@zY)#Ez+5ccVQI%=6B$C-Zt=DVbBNyFyNGD3^CCt>YaF z1>93-MRJ7^li(n~%zWO^FU38eW*ke>{@FWRa-NxPLlflOZHln}(9jP3a`SM872MRR zDSb!=$q1xAq-2sh6D`Qsm$|x%xURD4k;_+g2aX&1bBv)G#8Salb(6`+L<>=stg2)L zr4v7%e@>-146#QAozDnYHfF@S$Y0X>L1ErSc9ABfDA&Q|=GkCo11beK4?b#ou9f%~ zsm6jTHY;d@*)&daE;b^?Tz%(mD9gSfre%F4hL%(2)I}O4h{_^t#ZkBN#d9>EOF<+w$DJhafm~2?8S$@erW`Z5~;5O*`v$kgLfbT+o91@5S)0uU= zkX4tJ2-sr9#qj*XG#l}*b2NWDR$dy}mKuP?{mAb5!~@9O+`lOF7V zReS%wi9&#%*2hU;MtS9IsN|EJ&id((%)H$&y>4}|6iay85EHRb{#xR{eRAx!mqFJ& zcV%BW#rvRhT~yz=Br#xib@uVoP}J8-Slw-5xAG$K%EZbPgOeeO_T}J~Dkcax<5*(u==E6xLo=J-0fPH(Pj;gpAzF9NgsY*}L`nmeq?2^pdq2_VRu z+29M`fgqt=t%K4aK*r_b9Pxmx)B~8kqIqyx9&wL$*+edaZ{@gX(bY@#_dK=ejuN0+ zg``pllBPWxw|NAoF7b4rqr*3UeW?R&$<#jG{U4jG`l=4#?@0oltZ9Vik~CJTQT$6I k^oLJPKhgU?25H-%Ydd9L)-&@?^D_l-{&-A_-=(X60-wOX^8f$< literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_057.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_057.png new file mode 100755 index 0000000000000000000000000000000000000000..4f95746dfe9d62337577f6ac1d78ccb347c51e71 GIT binary patch literal 3053 zcmeHJ=U3C&77bXI2oD5|biu(WEeth5VFCmd zGb28!20{~5U?`HHM4A$UK@dYnssZuE|KhFn=EJ$?!(IEFv-UcB-<#=*bCi*WN`pWk z84McbF3Q}W0qhf<%3g17gFpxBF(_M)1iwYv)e5ru7&$|;8_JpS{EoU zzzk->+2}=3=*2^WkXs%x+6qp(4aToc9;N{I{&WEULaRVqxH;_qLZsz+xSTe%WR|qO zh-Vj5lQu`&_qD63B~`_~Nn%HzTpOtT^%_Y=T)q|zcq`b-6N&PVO0&{vww8 zXdld9lSptFL)n7(6=J{0!D<)4i9=|0VJw0J-s?j77cG{6 zMulx!9rZ>veHI#I-*hx2aYTaQFrFazWFjtfR9?S=wJOX1`Nj<4oKT#qkq zfS~$d_RAeYv}>u61DCv2sm^Lzvo<4_}b?6F_8;;+O+%DxuZSW|`ucDjC^&w%o z1jOwHRc*u>m>>v)3{%n2`pu8i51+#3{I)k5o2Z+$ocbfPUZv-B+|}IxOpoZ~tq_*lgh5?sb|}(h|CQWstrNZ^O`M-wI3~9F_H*6FI3BzjhKxH>z$O76DiypNB!o6nMJqU zuwR#(tFuMjta+&KEGzNz3f-wW(;~((W=t2862=C6S*%2f=e(k)j2T+`@*PKv@F_jf zZ_5%hNnQ`dC^>eyu+<8htN>VPvx)KA`Ob6R`h7|cU5rL3{xd_f4eic;5pEUNknmPV zt1V60P`|e*;$7m~!ig*ilSF*-c}^SD`s<`t+j027QEl_l;4gO@oaZVpDbg-affCl->O6j5v(1NdY3`KIBYH{qZjX`DniIY<+^&H&366wRx8@d8 zUC8SL-F>e&glz29@@MqKKk?N$r>N27g(Lg<77sS!AU86erS4SIcXGDdM_R7NM$bfm zSN}62TVIj^>R@-)h2AA2oQk_k-;%yj6+dpooo(`qQvJS3C75Q-{7y>n>2Z9B)e%db zmmGbkkC@aIq$yr<+Z(T)yU4bCQg!sfB+lI`L%H?41Ls$;8!~F_prrf&=*9^+!Z6?C z4JVN)#BC*Gu5rJ?k~|r7RB}6gJo`v#bFqd$d+-qd^Mf(-Zb^Q!HS0;`hRY^5eKfh- z+Rk6-`DwM}5u}4{TX#Jh$4~ZtaZ(<KUaUl_Wb-YT+~X#OdRdIQ)-rmD zDW%N>9@e~{nI;9}b`TroCe^u(@GI+j1>|M!uz}xUaGp`Qd951|a(Z1gq^w_KYSpUM z{0b#T=0^jm0-_&&K(wi8V$0^8!|qZWo16O3z-udsxWM~AOqA=g?M+{p!Iw_qZ+_SW z+ca56`nDM}{Ish=LgW9f0^&n$RSnqk12^doesjKuz>hZ;rg{-7MR%?8Erl?j{q@Iv zjn_U=yk-rTTDt78d+566P>y(Px*33!=sIbiUF!1Q^Z@;nLGTteh86NSVn@Q$la2D9 z##Z?DPY2_D(?=)=drTJM^k-b>X|?Ni5|vM!%{!g7%%A-*8r;sJcr8g=;ER3E>_)x{ z);J^0wgi4QeIjaVhk1;|t?H_mDSn62*qq2CvT$>vushqfFLOZBePGhU0rB| z)k|NnML2O_R4OtzveTm`ag~v*_OiLosjOg=sh8?4wR^Nbo!dc)b2^u&{jQB`NHMtK?EZiTV04x zm|pR3EesjkTc|3uHhh(=CCJ!itprVH$r1@!Q^5p)E3#uZu)L9ijk!j6IgCgc0!e0z zBngxp17IqqATbTGR78iiv^d}>WAhRX;%C=p-Vs40{(=0TGq#PawBK47zFVXw`o@DW MXK|=%JO4ZX1^;&h00000 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_058.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_058.png new file mode 100755 index 0000000000000000000000000000000000000000..54d4b2ced6c8dfcf3dcded537c6ab7c00859a006 GIT binary patch literal 2422 zcmeHJTU3%+6y{cK{Dx^#Vop~pnh4PxOuX?MwS>&jp_h4>=XvbmoU_*6YwvUR_pP(PT^vRW zw6s`dfj}TEgM<8cna;ki3p?MmTkn2afIygg1^fF%=Iqm|;vTe&+H~vYY>VxFMf*NU zIpvY@gIkbYdVa8?BE*k!>5xa+@cttXiCd1G*_%W%Ydf-wWky@OBmB?dd~`9|(P5zw z-pc6j&(YkjjvW_^YBe`XnzD_esXLqjSkpS0J<#xQ0TPpd@vLybA~C0!JMyVzh{5B{ z+t*M%2vlNFKGWy*WgM|`5fSG=g@`HPSRBm^hh0kCgS)jBgRMnlG3GcIY}|4b?*$Tb z9D}vut+zl*M-eC=6mNlaB_A=Eg(x5*rSlG)_RVK{eoOzqfnzmx7q9*f$leKfc`v6} zXL5nPqwu;L3|III2FvEKB>fZ_R1da?0ilX1nR@YT9-vaFY&|%?V5EFcDuf&9qGPSz z5T$(ThSh%1v-wM0Fu6Lsl)w2TbIr5U-8h$pFrsWM(JPA{@Ki5Ogj$>1kFnN2b70lcykyts8Bn`Q7?Mz^Hk zkWvD6$l`^73^#(&(Q>qQybj#JHY7*K7!r5iL#IAUOh~WUHjY;}0xcJlj!xV+n?45I zxgzP6~D#itT@`D0%9DJ7=N><_3dhmAk z2mhX?hOuFIcGl@tu40opyVKfLmJXwIKs5}rLj-O^SQE&Yx*n%)yfU`u zuV}d+DT5mhG)=(Ow12(zCU4W5k{Do$SNw<@Deso#Ndh$4b|xg2eDb?rLT--&HdI3k zo4Y8t38>G7m4(d3OW)S_d&{6!(3>(XSRN>jNPU^z%8NT_uXmvfbd6x{;Lr>w3TPUE zt3ylNCxT4RaA@wXWNEgi1&ZluvL~(P;$^Qb?sek_8bK{wcwRWCI<%HA!?|EShmq+5 zt)hY*CBH%%&QhhKc4c4(&)i&G*79*=IL^^*Kj(oHmK}5(vK`Zw#DOwqO17sK=Ze0Wd~j?ILDV7Z#Ux z-LjQKp$iOvT(3+mJ+}uecPzg|BMX?dm)h+!HGEjxDH3NJSesuYn;KIbGeYE&B)IPN zAx+Ymr9XU1wW9ewCvB&FpVa#1$AiU;3g-Z({F^Ge#ocAe5$SE#io(A69SV`t$0CARqb*3vh-Bd_Qp$u;;0!_c}9!aQw2mB|ezvETxl#?>;LX>VTppX=g9iftg?C^hz+7&gN#;lpb($Cz|*jBg>#aj3crV zN8?pVwS?YQ^F4_QEo0nm(a{CA(eg}|bB}pBp*ae_16siv+{UG~L!fs&5PD(HbJm?uL~_aFZUNS5Y$ literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_059.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_059.png new file mode 100755 index 0000000000000000000000000000000000000000..7816eb773bd0d471fe40b990a82020f56baf3936 GIT binary patch literal 3256 zcmeH~`8(U$8o*PGhM}aJi8TndlujE4wPiHuca+jaOGtHEN%K^LN<%~iRi)FatxW7w zsikVGS}N!WMu%7`c9MurYa%4Ig-XlK+nH9;9jdysFaK5U5dNF6W~OP6c`wZ1iM3!zn=v0AJnEK zfS5k=>fi50+8TyDfyIT5fD|4ms1JbiOu#U0YtSykU5N;$v9cW4UG?jc|F?=^jLi^g z*~Cyl7G_J^tFzbk0hdyeFIi@Gv{xRA3#-IAnCc_M<^l!aQ94lru;G@LWUb)e&;4S}&4Szr{lNf^7<>951+v_I zAb9A;?p=w(xR<@gG{2ljWhYxcnML^XZk>Jq4P+U5;vfXAj%>EhcE#!*67**fE^8|e zLoXk3)1S$mZQ_OGoNN(lCVl({xVM@&a9WrDnN{P#V)emwO!2)(%XwFCA^wU>k?x!r zhC-Het-pMdhAd{?X&Yqb3e`fJwg(>*E90F!UWiXdQ&1zcI(i$8t}!ZpK`Pa@D|AjH zUPJ{TzE{k(1cLqoSwOo*S_;QjU4TIyTl>+;MP{;XxcPn0Ry80xfv!c&*k;hj-MY~B z)9esMIk1gt+4A{ol$m3zCV)7D*tay*xbxb~K*XEO#v){;fWlIVZ*^}LSqMsX zq@&`-4Y#gU`zg#g9P#?FfM2jAgmm~o!h>;?Tnhli&sMN)pGI5XE13MzD%{R%Id z@;W?vFL@j{HgK{T+Ia)b^616XA{tIK(~uGpB8pAtik$TgoNR}7lEZkZ$y>#b`%xhN zsbZU-74^Oy(b8XcoW{3xvREEQjwK~usPF;}$U5cGe{wWpdmcJ$wjVRleT!hRT5*o( zOkz!{WL;W2P-tY5mjYtakVn9g*EpgaqA+!{qk#eI7N^#}2{DfpLoM-A~_>Gekpn z4_fwrE}$2AY|-cpj~4Vi+Wdgek;CKTiZvou$s|iQ?bzZHPB6C3A>j3($f`vgBy|R& z_g&hpawhMU9kXAB_){d!4{@u&NDwbyw7BLr>bLBkfq_7Z7C9-TN_`od{Npp%DNYv< zkvfj=5?!ci#B};un%CvcwC7iMC!&?c1O<&LcfE8r1DhDN)Umbs3@#L6y$>;sk@ZoM zaL4<^8`f4rap?~=S|$;?IW6?h1cu-6m-`c#gy0_4D+BV3ceA$J#jKbZ=@(KF%@wU3 z+h#0zD_P%#_}+ex=pYo_Wc+dIIjM!713bgwQ>z9@ye#5gp{i}z4pos^b&nG0GNzi5 z(^w&zDJl10;as~K**`SzZe*{j6I9)85vQ}yMYu>>p)Zayqf;eDfL;yt*7#9`o<)Tv zaJ?|g-@bYyYK&G*D0fI_Q)Dz`!Os-ugfixI=WfUPe(00 zn6!`gUYBmCe>!u#$D`g+9cdduzKXr=v`QbS_Zi<$)}k^K8YQxNLB{nP4cruf2npbPG?$qej-E|6vpt*D6r4TH)i{Mqis74Cq1U5|u7f z%>)9-^22oPDKEpgFm|)&lsQ5un*DM-vig>SuH8-2G+gqg)%X;dOGbXUmJ}A@z4*5w zLhpi&DV)<-Lbk5Z((EBMwqfd7&(D(=C{6PAlA6BWRl~WvIydky{*8N(ScZGPL|Qek zzwsJgpaVG~UZO@YNQc(sGYGs_JMSSrk2EHHPl5QpDp7O6+%v)^Pj%7#-Ywc%18o7tKqMAFfjUNNU@+qBH;k?aKA3omZk7j*}fX<|0?X;-*yDSrBgm$OxceF1h{&k Js$GH-{sju;hHd}= literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_060.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_060.png new file mode 100755 index 0000000000000000000000000000000000000000..3fc64f681cf7aefc4f781b5ed23f640fb0036b54 GIT binary patch literal 3161 zcmeH~`#;m|AIHbU9Cour4mpjbx|6aT%1xtXeUhz0C8rMLxS1T5&2EP#L}mZfJc zv6!9&E>HZYm^$qz>sfs1L*dI>r7^QVNaEH(wOSXDqMhOecQ`~*ORM9glGfhMC0w5#5EYy<7*LeVNC*V(gx63P=6y+4Q@%g&PB+7lCJMCT+;8tn zZ6s#_vC-0u^sAIIb;G+PWZct&itZ~pQ;$z-+YdM94;5ZU!ca{Nlr%Pt>f}JkKO;aKiVAD_2N*a87lk!l&P(!Hmz87 z>=D66l13L;Rw(CJ^TH#CGhws6-cZsy^~AK${h%4#`2h2ASsfn=pcW-S3W7!HQ7-%u`v#!wRnT=>@QCi+`n1|vco;})-&dsGOzi?@69vfZU z)r4GcU3}G}mq2WJ$N4(Bb_8fNzI&o)Owh{pwPY-3+oi4sfY%7NYr)-mx-i=vh4@Z6 z%+BOSlJIrsKq5R>FS{x_`pmJFI#$-P9L{55YMf)6pfPc*J$bOCclEmAANo`KF->vb zJwDkZHS1wQ`#Vo$+v8oDJWlZM(r9$JgfcPoiuj7lB-{ z!;aUTaVRERwWAw|>3(4&silW|xj^An?>Vg>a8$>Ea|(g5Bm+!{JabMRvJ?$<}v;;_b^PT_#=zit*^;0!6@Y`qiK7^;-UF1CWPQd;v_Nz{MKoM)g4K3z# z4D~YC5}F{5hkD+Rl^OgMDaGMa@|aL&w_KLT?;7pHXJD-^B%(3KomUQ;cJq}+$G111 zPhu?Z18g^fdw83+x}l*{7m)uv*V7(u(CSi8?e5YoFxxJ*;#;5&{R>gM9^GWiTq&RU zG1xY1(Z1b|&nu91lr|^Jt|Tvu-(YVzx$fjYCv3c*``e&Ng4Ymx>z-->@9>PlW>2;; zcZ*tngS7i}QJU=}W#CeBl}4dqDVkDRqD3&yIo$d*&1o`z)fVqJGF0{@cpN$WW>!T* zBdAKhB%)%JnOBHcP=qvs=BIpshlGoMdql3lR&hh3m+z$?dH}8!? zr{n6kf8uY+cW>m}uM98upc>+Zzlr@M_(t4(4A8aDk*jFAZL}~=U^X(Mab6TE_E|tc^2)!Ue(2xbH)+x z3}Vzx5A2m6)m|ZZLX5MoQ!Y2Yk-^-c<4xrDx(WMQ?jp}T1fEk{vz@uVpw5(RbW<9Z zLLvIccp4AvOL`lC@yXSyrpK1DMpeG6Q&+);Swz|AkBurkj5|4lWj=hhq0?eu1-uZ2 zkE>V;0T%X*)mZrZYraKLqh(62vd>?M5Q-Mc;T>4fO%W18^Vp)Km1B^c{NMZ1-lRY) zQ#L(skt`P&T3$-I0z^;M^ft`yq&y@X^ef~SF?qwRLj}Pr)2|A2wB=t05O4&Gu68}2 F`X8r*I~)K2 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_061.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_061.png new file mode 100755 index 0000000000000000000000000000000000000000..09af081646ceb17337be9b6701fddc62b8e01a5f GIT binary patch literal 3463 zcmeHK`BxHX7gj%~&~ncKH5C)59QQCScO@63v@9(Xms~5AMV(aK4cy2yoJ7K<6l zK|u}fcRWab&wf9EU2~97&u@m`h*fLl!4P6YDAb7JhF0$IQ8e6G@u+9*#^uIjo>fsisjS(ma>ng1UW4^g9Z6(%*<$qcl#OFY#m6vE zgFsYqORNO1Af*A}#Wrub>n8QIhmdD{wxk@Llbc7T)jY1*qZ#>}uSN*Yc`l`i_@ zx@f!oost$F?7)J=83~k`X;W!i;-n^ug;*7#E7NY%ob5$)BBtNCfCzDIyX%f@Te`cz{9@t!z7Fn6*GGXQAtI z_JD+HSRQxi?zWeMFTt?}dT4+0GeR1fI`d)#b%`ep)Zk!#C{DPe1945w5Io+Q&V)(m zCI~ImMiXWb(=r{C^r|mp!U!t!NMxa|!x+h}%pPO&C0CNsyDvl76I+%D1_I)ZhDuH@ z)TEZy8vEm_DO=gg>Q`|_tYn+nc}Td!^H708F1T>4=_?)+~1L*F+ z%UWnPz?t^J6~2sZ8T&590LL6d;9^GtifbOSmsLtP!gb0pld95mxce>f`ytia%X+AR z74+9feA_wDeCApbr+v$30)7JL2GV7nG(|p5+aS<5YV)afUukjFAO_TIaH_r9gqVkL z;TDU~oA>H2^%DPt|AmGbOK+)j`AF2NNR;ZmPb{A*tgO`8jD_Ur-lgC=vr$WzOI zc(#TXC|#;UdY{L{2!uy7_x#473>uuFt0`-uYB6g-m!Vo~hYq5nC|X@mw8jebWBSJY zlE-Bq9*bQoUdSA`@MoTkF>rV2*a%iKV0BGDFIsG@A%dQr-c(<%B1vwCij#IHLsg`k zo<-FOEuU`9YYZaZ9hwCl@%qdkdf!9IIW{>OP|;k>?JXv@{RSfT+*|i0Lsfu%yE203 z1JT04(J;1Ukwy@;Cl4`Us$aFOKO7rxjJnR(y$Enzi>rq-0*9kg=O1jIoemS(U zLwF(^h8S{chKW_Md@sh(=gVqTIOBZQf=T%>2w^smJ-q5Lgx+T@6E0{&vo6x>>h@P) zbRv0ktS7P@$l!tFZCCwA=woaVUz>4khzEsf+}zfK61&3R?ot9cV$IoLc-9JBJv<6wv@vQD6w z<-zz5W*~b~hrLYIiHYFyOlAkj>H>9zmk1q{`9X*4KQv1W3Zhsyf0AQg1Z_D zd)$#hE$~dK&tdmUF(@|!XKRIH45?mGqn>84KaXIYIDSs_IPc5peWxaf2JQ=XpY_^q ztulw@wK<3J5!|R2Yr)f#T$&9a;i&k7XyB@74D>OOuHJGVea@gF-53A8h*)bu5%(oK zHH0>>STF|da5Pfw$5>>Zjy?o-+n3Tz>9Q_%v)h{Hf0wU3{zq$B`RY+wM$?8GTs|u} zyRb2LIU7g+vd}p*bYNZDpT0-92bNSUUr%(%gS9NR_5pB4i!tRHecU~>B zB`Asz?T6n#q8=3J`Thbti*1=(`;xAvh^I1KLOdCs%=4tpVs;M0D5!JH zi=3D!b=`ryTs`a5AWwAw#?f$kWiA@h@i zc85ma_$dhVJ-dn?kub7~8Q%P>iznQA7fZUy)IirFt>}&Sd!aqdTYIpM^6jkD;-W5r z`6=wmlDqv(aXif8wrUygG zCCH@GEFTjZJpjAop&(HG;z#hPR$#@IYH1Ywo8Vs!{#W~8dylEdT~$tvLyr7|r2zL1 KINs_NRrp_>o%MqN literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_062.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_062.png new file mode 100755 index 0000000000000000000000000000000000000000..4c21e58a71aa5b864293b8553c0616602010bc34 GIT binary patch literal 2334 zcmeAS@N?(olHy`uVBq!ia0vp^cR-kf4M<8yoo{4d;CSlk;uum9_x84b$G*QJ$3GTN zO>s1{;a-!H`p`dU+N3G1H*TEhS`raBNk?bGl88v#oC}+S#3qSK&rZ))b`4vjBRc8V zt5ww|b?5Vs)t)VVcIM@mS-;+{`(1smvi@B4zVCPT&(y6^Y;cflT)SqH6NiF8%Vri1 z5g~;b#hj%A3Ug!~7EEAx$d#zw%JA?F15+ytM>t2cCJRS8yMTs@!w#n#UWyJD)(sAd zjE6)Ig>f++y2;4G#VN2(U|SG}z&SpJ0FQ=()(umg8Vbr78l9M0v|HASFtu!E9<_q% z0p;GZ_ga;=OO3J8y;Ap?``wS2Z_E9CRC!zBix*q3EmwXNEco%3b=;3n+j8gImaJ(1 z@7++)zlA4zZNJ-*a-~PPf`#JG_q!f>zCHK%N9C=BUpHp2z3zIXT=~&t!H=`5<9@8p zy=_Zf9dV)M4HcR3RM{^zp-=dJ?vvbF;C2e!X2 zZM`;K`BAsv$3s((+pR3fUi;nk$aUpMe+56T(yms!Gj+kd?-CFF4(zUc`LykalgpmJ zUDA)rj;ag3E8?!#R{FMm@9*f7%JD7MPOoRCbCxsRi+WuwxbeTW)-B(wK@YD*RnL#_ z?dZ30Fv-{Se{<@rH)pxPqtwjr+k1as+V}B6@3)+-LO@mXJ3Ic~w^n|1mEFDWTcP~_2J zwWoNeS0DbXtW+m2_vst~dIHbz%H7bNFBzU>6SnLIs%jI^vq}>_{4l|kh@edkny1+d-2 N;OXk;vd$@?2>?R66CwZr literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_063.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_063.png new file mode 100755 index 0000000000000000000000000000000000000000..1a5854ecba9e4a94a536956fb3c778165dc40176 GIT binary patch literal 3045 zcmeHJ`%}_s7pK%D%hYtURZ~gK+7ZlURFZVPmS0P3yJ(7c3)etIMKN7#bwSO$c*|7W zHa2&2)09oVh?f>GR4Q&*sR{C;rAr2+sZ`!x{U_d;ccz*1oacu#=X}oj%;(JW+&F_h zsjFk61A#zv0Uxiko40uDKzD3<)8OGu2xQlvfS3FE)G$RI?(ucGk)S(2cUPgQQ6Aj* zHSwvI2p#(5Om8pR+tBdYduscB!|C#Kx>l&NgJmH3aO6>|B==IYD~FM0DzC(Sl`p&3 z-qukk)oY5F4W^VmDGjR+-DuoccNq?@f9R@mRmDYRLNv1t9z>$-4Kyt+X?J#79xZ|J zb!kKA_1(~EknI{fEyZqQr?s}x?r47r{ok{(Cz7|aX5D#CbO(ELCY~`Fi4UKQ+;6kT zrBAI1sLL180M+HM1%K-`UyyS9RlFVQx9#qal&>$ZTZY%v0`NmysI0&B(_QjGc) z*~#itaPN@fQp$G#wfK?V45k zS5mmF2H*ByJli)IiyDB+fjvy!-~3!3I@%&uUc-v!tR?9)4={#8NjO}d%rJ+^g{bM+ zAcd6Cg_Kv|mnSMM0>X@C&gZ3)a90Plr~i1yanfBSpSyyBha%*qn7xW0%)3h{^y-Wj zji)d4GRe5|F-f@fk@bgpDMtx`GV$6C2C3Z0hHwJeLg$&u9j#7+Lj^_5R46x!GhfY6 zz5u;3&bW9PlCk(iPV|&5AD8j)m45~6ZFi9QQ8y7O7D@@919~v}wq`vW;gN0bgqBsa8nA$_hKq`+{ zv)_4u#lYu#)tz`Oq~>LHTcWh|`N4lw@X)6YT#U#YRM0SJ*F4O>QbSMf$`YfMmY&Pf zz8NH*9*av*H~R?^lLTI%p$|;_t!%33lLgQ&9BjfQipvg(LrjB539D9nd#ud(58K8+ z-GA}-6&a*JDO>5Y5$jj;3AFe&SX~?h3sz8Y4I1qixShV(|(zB{? zh-=4xs65->b8i^M24@6`xe$IbDW^h59S!KkyDb@_@@L;)EYf!ag@_hMnb?Jympd)u z>b=C{)N?xM^1 zWv=jtKzlQOGIIJUEx*j#pU{!{DFBszHs;U9ulLBDs}d1>ZhD75ib<3%&b0JsZrHo% zshfls15sN^Z%k-OYA4^cfvnND^S0vbYaVDC??5Kv(n=Z2sV1oQQslABt>z0eCb!C% zz({G#l@l`>X&a@Bv8eQfnA%3uEfk6cy@m<>_|Iawnqds@qt6=;cA7Sz7CKF~q68_e zChU**-vbHw1mL^gk=OIfZ<;A5xKCx3kTC1qFhEg8R+_62S9vUL#9+PgBgZUH@I*vS zfK*#{H}o+&d81WJK+uL>J0M8!h`W03qIrGGqvaaQh>_<-;Y<)avAqoky)acn0L{_me|h4(Qy5W-tf8$vNo_Q zrG(I7DgPX%@|724#Akbg!rz?pH}~CPBt0OQG~#^v5Vj~J7Vkvqzd%CM=0X)^6JLn7yv|YhzX4^9q`L-!dzdy9CF>j^#B?! zm9w!;x9iF)uHBw3pornD%@K&eyvJDO=t0dJWAu(2suU_I&$9;>64N%mMf>h$_J~s# zt~Ebqob(?nGsNRpquyW&zF~c8H`F)=Zbw+1^6O|)t>O1^uC~0}d|i{XYmSKd)RNvO zrHw)`RO9`x6AGt}DMqjdc5_l~woITMSrkC(4|E#u_P28B9?L_Q!mT zD`9CkTRIr(pyaLgwpsjKiy3#lzd3Yc1+11Ajt=xETrk!(*iZPQGBAe%KP zJbMdGbgYM-n`J%3#&3b(rb&ldhTM)SyW+ZyHqgAy!06ylWO|<8y-%9@$nG6pXErzY zt8X0tm@#w%S55TYVcVgBzmKtQ`9ox1lD`o4zYxi)9`XD4E3F-ld7IyN2;hzNYVwH4 F`Y#?YS{eWV literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_064.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_064.png new file mode 100755 index 0000000000000000000000000000000000000000..b505054cea32f1bc50ed7118d5b4db15e4263985 GIT binary patch literal 3128 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_066.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/A094_066.png new file mode 100755 index 0000000000000000000000000000000000000000..4efaf070af4301440f35581a9e81f4877c6fe9ea GIT binary patch literal 3028 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/goAhead.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/goAhead.png new file mode 100644 index 0000000000000000000000000000000000000000..92e794f982c5520512248f03d92f016decd2b98b GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0vp^Zb0nA!3HERY(4l0NHG=%xjQkeJ16rJ$YDu$^mSxl z*x1kgCy^D%=PdAuEM{QfI}E~%$MaXD05$yaba4!+hMD>(0MbuR_Gw`%dP%tu)}1nS86~ z(*-;0sYe@=jWkY`@3sW7gmk=qCokV*QP7hYFA^LmW8rqyylbTjpUh%OsiPqR?0tbP zZicOo4-{_M80d4*qCiG9Oe9!?Pp0{3UlP}m#^ebhfj-ZG!aAiQlMVS~*iVWcP3dAj zey_;gQ1a1%jnjhyeI8j9+*w^BG8yQE@>Qx`o+9jhA-RD*O%??$S-nY0#~U9{yR~>m zN8y7VX=ufRw0-^0c+aG8o2=MnYv3-OwW}clDpQExPyJ8A(JzRCodHeG8afRh8zxx2jT)yi<7;fxHkBNWesGF^P&#l$KFO(Gj|F2D`PH zp|u635nE_LT5Qw?`a|iSPaS0hdt_ulKwGdiJg0$(NSaqdP)NX}DoN#0RjGH?o&VqG z{HNC0_uNOlK)J zP;|q?!(l%#Yu2oJ(n%>-P)rQXn>WwvxD0Rs?W<#ub-BrvU~S#pBki`gYuyAtD&Orbza$P z#y^q~&3hJ+uxI1X+;HPESE!xtJ-u;Gl-ZrH&n3pDO`GQRed7K7{RJ6#>`BAylR! z4b;`uJ!y@)j*gD~2M!!4w70hx-t)+gp;mJ(ZNosfC1! z3ZF2S%OyF+9!X1d62yiAl%&iOa)D5O z31XEfL}k@m%7k<0&hrV_&#`h)BJ`s#96jq}q|N{Wbb zd-m)p_)wXPdiVN!Tp?fYdXN0i?(X&Vt`0GsIMca1UKei=YHIwFq{29^-tZU ziF1!W?_A^EKlS6?U;d)2t*!NI3>QVMZa&m=x89d15s?z{BQCx)S%w=M8l}W&FF6`QY3*ZGL@x71>!X|H7O@@_WJ=VhK`BkI`Ctq z;}>f#+VPS~x@eppwx*`0vUW={VaTsU-U@zXFm%8%d7_7K&YU?#K8grXN;$Je z+G}ZP@&5ekNiH3tc|+Rh3a%bfa2Ov=I7htB8$4lVqE1^$`GT;9raKFA$~1i; zWDQwUv}7yK0b8cih~*r18xO z(~*`&LiBd@(gh9;O^w4DKrL@V=LW@^h6Bc(o@suPZLerhyc>8~hsu^Z!s##^qs}`(pN1(P@XYupl_>gsT+=Q)R6L%8bCOy1yOc?7c2nD|N-Bslm0jj$Ctt-E*6 zKw?9-yg>YuIK}u5(j?@kjUR; zlEz$7rray33HzoT5o$^7d;5KmgCi_JetJ2@KGRxnR7OJhowao-r`jt?&M#3oO4tWS z%_PbpooihC^7q`dT|aOIWLc=4?K)5RAKqx+P{Ez~_<$p<$H~>zt8#8d!${E7w>x@W zHj~pA;A}Y^ve|62#x}5UhOE3Y)Q%n(`@BEDAi>CO=oeZAWol2V$yW=nX^B4E)aY6- z`+RcPDTjn=zNR>E`tKyzsENPvm$yo;2r8(Mk?-ztO;2noI+Q7LN<~eXAdS}INUl_) zT&XtaAHSKZrLvX0mfoa}WGG`EhL&ojGL<}!o#-q+h9bO1yu>MXL3tXonGO#QN-hPL z)HV6QQbaQtUVKF2kdCkli}aR!0j@Ift}Slqrd7yktcO3V@I^MJLulIHrD9hO%3fsThO{7A&CdS#m6g z%tYBKV~wF!Q_i8aUlopPw!?CdObcX#^(ZLH6qs>;BW&?_(lWf$Iw@Q-D1 z5$y0l^Zn?{FAPwx2O4iXeE>a}Yhc>=^jB2?-};8w;ck68_wb88f~dxTO|p? zr;+b1W!)xWamia+DV)_NuN0rQa8x-1a))KN60AB=INb_k$$4^UxLi<_6+c`=NmpW& z%i>#o*%8FPW&x7kN11Z1VxllucHL8ua!hD(IS&&c-O5>9I+hmV@+&*xdA@82mQ57K zxoDJK2NOdNp6POjcWRixffKKE!wcV*Bt?b|TH}vCe8}xMTzr82#WhXt?F-VUhtyY> zBaTtsWjH%44gx|Y6NO^tmQG~CLia9L^T3BAE42vHA7RoYj()sl{zRRpmc1w4>H}0Y ze%n3dKK59*V$Fo`;=20=+^pJMa^Zx6-hUjTVj>;3&%)u=_leu)!?6V7P%KJPBtnmO zJm+d2{y1)w;QWaRQo~=4paqWOWRv9SD(4QrDY{$t{NZ7D?&IZ?q$M?8CBlOr{@#*} zMSRh?is0CA9qw9h5sxr+O@#y~+(gJGW#ZvFRW()=7J=UmrqdD^vRP5UNRB5 zYD_r13^(7rEmn?Z zaKge%EAy*9^m|Od)L?QG^3bI*6;xeYB zhmQUeH{5hQl3`LxR!PNUe>pGa#}gqt-pMF_7{kvu)F)L8XZf>rVm>4BU212 zg#Qg?KT!fQrZJ%sB`$vb(-*jW2X?cpX0!~)FkWnZm2+;WVX^Bv{#vTKUR3n-&Cvr{ zo>1oJ8*6f|r9KkK^3UXyq#$W}riGfRM3H14f}h3&*etZTXO`hpmJY2>h?8%Fwz!p* zuPnZjBD6S@WY;x0+DL7TVC*r_HinKk7L7{6>6{KYKJ)qe+>X93vP-t_EZyLauAk}U zsWa(Lx|CH*RTQ_aPDb$eD|jVDXmKgO+|%hk z{OkKPtP1kNCEMK3UgC27$&HYTy4c*fJzx2fPm-4yY;wd^Md5^aEHB9~wK2lQ&j*+g zE2ZQtE*jyphxfZPp5Ih4z)*np*hiBjZD1{QEuTEkUpZn@Ojg}q*bxo6eA@a>B^opS z&?ZNkO^`VG=We^-&#E<6ElwL_ZAvPHN{}#~h_728MTw%^JPmtPGan{NWzx=CcnmIw zR=3r(4rTA~d){TqmGR-|IG72thgDUgF+W*kWwx8IJc&0 zZglOp$gCGB`uW-NcOFxt0;hAO3b}cp*5a$MDxPQR?(~6Vb5!0fp?Xp8z z;mue7otw5B&vf&i1lB({h}*e6I7A$bs@Q!!_PvW1`XsfnVMU3n(;o1W`IKZ(QH>YV z!vx7wpv24ZH6haBSOKyU!fo)PTN-hV2~E2WHvDZXLrbAmB}xrEdASsQ2XQ56q3~+> zOiTeQA<;w+q2<#@++GHKi3a6h)rrao5~{Oq`YuJ8@$Dtgc2bPlNV1h z09LG^k@e`P6SW4A@KPLPl&rF3!=yMCO-YDG9pU1|c5cV`L$WzqIIcuPXE-%li*@yG z^cE!|sGtQ!S5mYkJeIi@(BHic{Y;IgW?*Utre@&xb_OPNtD7|o*oU4BIk)0jgD^90Iu*ouw&Cl4NyjGZL>{Nh=rI`SD>i;Jo=frZ%RE!r^{+ zn_J3b99+V-W8!Rr#KTiO@hl`B9~z#H>W+GG9#x`nHXU)5yryXbV*(lr*SH)MPdXut z`S;A8J^NJhs%=##3I|JJbVn(}3Q&-8#5K->A+3^*<)gaWknC}!Rnw|kM-k9`7^|41 zb;u;bM8dJ;EnT?fiAHGfRd}+Cj~i6gDkciU+yLyYWKBT`QeHt>Tr|lMa^17*spKUq zzSSWPomDs|=2gpztzx3EQ1WuRbxcnROmxvSF2|>=l9jyG7f#4#Y`qu%#Nv@x*;Y1D z7<;&^Hkiht7tI=rMu9AxG|`!?aM1;&AM$a;bq8o=cReLHMo=ud@v)A)^WB^9j)qH# zrdnb8QrEx!ri3OvCd0*%WA;sL{qFNm7H`a#Hs#$voixMiOIJE1iWcMDcy@t%h0Ini z(P)PksL8ls?&qhv+&~8|szTiVy@DpyshoFxYp!v_bJnJkBZoFld$7axCihfHjT(8~ zxF*bY{n|#iZuZFGFM0A$z8Rl}f4yWLL1iwwP&|_c!Y1Q_Ns@dbrH=EWd5aT8)!6Ev zxya@F+H61`|BsJ!WhO}-R-FIA%>(`go_E;Y8zpCwO6(~f!01U38VFiuqLBIDft)u= znvA;Ed!tI~sT3yZ6NAY(PgWCGy!^QS@&A&Tq>cOc4Z6;#UA6cPe2U&@>Sm!igJ9#qd<&vuT3_*&MRCNtMe|WoB z8Ou*SZeDHej4G;lWJhDgh3m^ViYJoRY8kdk0XkH%2<=iEv%o=7Fhq&-eIxcfDn zu83?_1M?{9e7saZ@mMIFc8Fv5b#`bo^{@t*UzBh)FfxWDnM_hSB+I-x0fhWX_@0mi z8|hc~%dNpX=0|l=VuZqJML4(EVT&|Js2`NDAX&sU7S4kKznJ>x|7eEB0lg19CQakw z0H9P=8^B+y&RH_@l&9jMGI1R~>b3^%?ebavq%ne|N!dc-6e6ziz=oSaVc>D_exn1N z(C<=NS&k(`SLOdA34xOB*v1k6ib0S{tfD%T#YMK%ZYGr|6{JiUcJkRo?_2YCQ8KEe z7SVX$>67N>GUgA?I4;rkhN}F*AIjXrFcI3z-Kq6(rRXEhW120r!Qyih7NzNv` z+{!Vsr183|jD<;s2jWzctT%vzfoU&&8*hNx?s7xey85R(v8}`ZT?c0z@48o92t4{D ztsLI++d=ok)?wF;=K=>Y$HVBHYEHsiaYgEnj*#StFZmQyB`L`p$bz7^;}JPtFz_vv zC@(CNYLk>f(Kvg;B`YXdjRi$72gQ?)py-6`@=rdK6aR2!e!H@yYDW0v*%I2rnS}0zWSO>SrG>pEO7fSI$y&ChE-&OHp!TuN;I`Gq9r9p zXmMLf%5hBosoU}OsolHRwcz2%y63ige@akEX-sJGn4h{j zl1em8PKnYf4Ou>Er#$r|cZd%^RoQMixWh|YyVa;Rf9pn9xBq~TK?$jf7K%s6J9O4| zDp3fulW7A{av}WrftOv^$kJ_ToOOw83s|+7>}h7&zYU7qD_toYYaTON+R1uiQ*3PUn)T* zEMdWf9=s4u{8I4kO$$9M+*Os5PtoyM>)^)qHknk?JR)ME=#QrK;z3cOG5yIT84zsZ zqA#tV;Rf*+s?oG_<{q6a{yZ3{x(!8d+!*-C8A>LVB&*35!wp$>GZV!V*y|{)1f{4X z32!;>-JU$u-zRoixVm9>%3jtHPqqOZes^@bp<|EniD(hkVj5S`PXP3v1K%I7hqf{k zh43)CfAxowwMo(l$2T1PX1vZ1XC8d7UzvvM0`B^j*C!IP)&7Zd5?Ut0N**}q3Ro=r zz8LLCnJBvw)R_9fS7q7(F*8vLW$&QLR7E-NN0s(|7N>8W9ns_EBx398_>LC5cSV)#{@#sAVoFeuiN@`7 zLb6~YmBqvp*URu6(2GnoD_PN~yRGM-yP@@2w-vCtuED)?W{dmy{9_ZdI#CEWL^`eF z!2tJ@+=X!K$_bmD7lU@Ks7uR@h0FeXC)$u4Av$h zT#$0Y2`x^0XpexFdE^tZOaG23QJKU0=WjzY$!!eMm9(G@*d`)ed{tC*LGt6q^|9(j zRZ4=16%j@Ykx(89KY>b~NL?jJoIx^RcD67X%NH&v9jKiJ+V{PIar}%sQR^G;%;YH^ z4s}M7RN#c{N>+4RIZX;+D@>dUnJw1-c<>2L)CPhoe+uI(5Oi~xl#;U$`0bd4OCkG= zwKIiJ&A`+QOwGX53{1_y)C^3`z$-HYlXh4%S>faOl8?5%Gwvq?Hq)0qz~-1Oq;bs7 z!!*mYIC$+iXnz236K=d{1G730p1x12T z6z)3#tGbIV+ofQ1YpWEuN;-nO7NY#W@~Df+#FU)Ht!vRGN1kx;L=)YPMH3{CO}e5B zisyxlTuA4b`)BD1hH|8fXYpA7B)n~)3m?zn9FDt3LekX0%c#w4EN;~4D#PI+F3rzUnN{?WoQ7Zib93};u5)}a!R zp2mVc(L>u@ZqEbG?SBIAQpQslz44P64f9=L8v5L|Zg|04@%59HNkOF_+T~b0O`@e` z$v@XQF})8ZeY!2uFz0?g;0KESYtvJVpq?wyX>hh_e{qio;ASN(eMY?9R3!m z$>G_pe{2;`a1IUOrQIZ$wq{n1yZrb@cZB&Tq5M!xzJyyST(NM>2A$jS5{VB*qw0SZ zb5$B}!fAaLz36pYSq78{A)BCN3+<1){9~U%&G3Q>wOUjuwP$Am!Ss=e5ffBg|LifZ z5Y@Q;HDAFR?4P4f{AI<#34DBizq{zkUMwG@ng&IR{b#}T;SWtJFuu&K9q~$sl6-D#) zkBi1X5c@IcESx8suo;$@iD@X#@XX^~@0#n9HBhn8zuKp^bh~Fes-7pQWkbZ((>I91 zM)tYJ{=?dal&tk_aSBx!KZ!MUEs8o4e9CfqU}h%G2uE8k_@gyT_#r6N(;;C^+**sr0nu4l&!1Hf>@QLcCGH|aLDAaQ)oFT34K-4j$y z8jKs)*q(vtLJ(g_^xfAtq!udWFL^@I2({U@cr3fQrKN?BmsV^@y>f$tYams!m<&Lj z)+{dTq_O3m|CT8xX!;9(s+g>f3JB=`{qD8#!;sOnnM_{#5T_E`%lGbbwJ+bCnlQ$2 zC&WLR8$psaH-eTHtDVGW4P(44s8~=qITaTC zLyOjuoC}gi+>RwL8ey*WXA!xE#iSC4aRGgCfcsh!#^L$m0T20pmu_UdJoI9lwe1gi zUpB6L_eTGK@{CFN;aXN#8^yF~Z?qecf6W8k3Kvf_(d{^IxaHDg0VoUB9TTmi-PxI#LsAZB8$ZRXd+LXa#UbvDue{&#T`Q%o99pRPaK6? zHG?r_UrpkIZd*84HfHfKe~Yl`Wlc)9$YV*i`+^KxNO3!sL(#0ckT z7Sp{E5dFarXyi-A7fW&^5=Rp~*%U|b4^j+~(B%K};E3(KsEY###nsoUg*}e_m$I3S|DujyZD-*wi&Bt#F z=GRnTIcCYsqAndmPa}_=%S2-`QHrCnhBhXz)#D<`ch^mGCpV8wZMpf=oG>EANO^Ys zLxx4=SjENMrrsuIvl;PfsS&&nwX@-pBhh0nYGMN!^1#xstH-c?17iEK0QzS*nrH|HO` zq1JytQ*%V9gAXsWM8uKGZtI4L485uwuf{( zM&VO0hx10_pOSC#0UsYnbj{UH0_7?tCO$VonhYDvXnaXuIvlH!7Wxv8P&~<5o^bNm z1cl45#^TGCc2du}Yc2&bHx2~z#eR$4N zysmj9RxLo(m%m}Wo2T)?hg|LRzs4m(q>48p`InpU6@P_x4i2@2Y=d0Jb zn!WK&^AvY%1AYF2wSRDR zzj<*o+~Jt4;P(IN$6f!*=p|BgqN0Sw6Wta{xFGeZ$GELN3i@aGZ%uS7i9)88oJkm2 zgjW^u^JZRL(C8M?tqgGnCYm6Xi2up9d)?MSJXe;Sc7&EEW~}d@(o8=0`Gy6 z`W%2(;+ha`!Zfy!xVqIL&bF@~mub+j70q}-wNGxyumU*6$=W3Lomkgzj`yJpo&Z(O`g_XjmbN{DS9S*IQ}*k zX_M7f)#Dm5n*4Ke29~5R2TqD_y!@7JXvK*LE{OQGOJWAQ2fziEqS2n7J|E>90ACu(iv-3avp@x$K z597#vFq-$iv(G9jmMx$yn2K70b~@;M;<93^s-UzIe{A?nTQuToT0=|mNvF)J#yRe) zWpDIq1w6DIy>oZOj_i#WUbgTA_nNxs%YKTJaPY{*?!eh+j@Nv#KIej)*m%p+bN;7X zVa0M^P!)?xEEu~sxwgQ<1!E^?LjKMeuLwrYMJkF$0{GPM`%oDE@3Z7usR^_uNn>X+ zguDB@-N(1z?>g|w7jFv(5;gw&Zley#x^c5=YTXSjZ*VQOjfpP`gfZ2$x4Y)A{iDlw zN1Ml#kPlBwxWE^arkJxJaoa6jxEGFoPJ`?}n{h>SOtXjg zBQM3>m}fCbO`0e|2C6YVTRa>~{#RZ5++XeZMN(MGWdDz{yH7E)~;+> z=himO%k*nwvvJjJ+wSIl`$m`NwOgD+R@HFvz;QomjssZ8-U~kChF2e#Dj5B;ajj$1 zm{7QQULgA6Ukg`*zthmFLdR54TE?W*b#`_>0Cc^bpqNLHYLXGOOwsN=w99>S&o;Lc z*LJIEOYjApPb^sJ-iDWG(*`F8EIX_l`ECA7Hg zTG`M}I1XjY@#Tv$nov8*#7oi1W0QQ=SiDd!l=X&+e|Ydy_5QM09kFE*M@z#b)uFI= z0lrtdnq)!Ji8HZ~W_3oxw{}ANS-vQviB-`=)0q5F#?nghO3`Isd_mGpy9fCD!5h||?lDJQyUb}TzqF2p5c^*Biymy)N9CR2FUIEzM`(jjh( zAC9eDh*LIb+c16$#erp*U@mp3!cxvod^ol|;+zmmv+|a2amuiX zMjLD_f^b0qv5@b9+^7$FGHj(tlTuK5z@$z`asMyY*!MC? zPO@zp3tAp=(FHAy_IO?!+NCUM>})EU#^RAqS<4qskowZgk`rGt($kpypm8BT1AHFE zPD-29g4&2t*bm@T=SECobnP!@hQ;D!kj5^YqFHjHOO|8mu(R1Ba4epMmQGwc!X?Ww zo5mJex))0S9Ki4#$dBt_CvCFy=oKrdLcrwL;f)^`V(q#NwB$V2@P#H&1tVm)O*~C7 zdBO!rQ=v#>%i>AK@+B``mY!t1;pnFu;7ass!5jC1jnJMug7|ybrYNP~erE z7+WxlQ_qgG3Yj(Ov?)4maLmp|x^PPu9zw4a>k*f3On(mW0?``-$Ka>l83e#{VMdkFivka$bFUC?^Hpv z<^aX4!C&Z3!G!-Y@KYeOh;ms4$fA>`;#j`)EnjkR!Q`V2vi}0P@1g$-colD9(dMhw ze&-8XX=1v%y7({~PmhknWb-S9$D#l{ALf_QW~#>p?8Ml2$aR6X5995?w*hX&;~j)0 tpVz4r%M^cV2Bv0UY6hle;NR5@{C{FA1w=p#kK$d literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/event.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/event.js new file mode 100644 index 0000000..688de16 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/event.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 const commonFunc = function(obj, e) { + if (obj.flag) { + obj.color = 16766720; + obj.flag = false; + } else { + obj.color = 32768; + obj.flag = true; + } + obj.pointX = e.point.x; + obj.pointY = e.point.y; + obj.timeStamp = e.timeStamp; +}; +export const dataCommon = { + color: "#5265ef", + flag: false, + pointX: 0, + pointY: 0, + timeStamp: 0 +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/general.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/general.js new file mode 100644 index 0000000..4c6253d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/general.js @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2021 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 router from "@system.router"; + +export const backPage = function(superiorUri) { + return { + // back to main page + backMain() { + router.replace({ uri: "/pages/index/index" }); + }, + // back to superior page + backSuperior() { + router.replace({ uri: superiorUri }); + } + }; +}; +export const imageFrames = [ + { src: "/common/A094_051.png" }, + { src: "/common/A094_052.png" }, + { src: "/common/A094_053.png" }, + { src: "/common/A094_054.png" }, + { src: "/common/A094_055.png" }, + { src: "/common/A094_056.png" }, + { src: "/common/A094_057.png" }, + { src: "/common/A094_058.png" }, + { src: "/common/A094_059.png" }, + { src: "/common/A094_060.png" }, + { src: "/common/A094_061.png" }, + { src: "/common/A094_062.png" }, + { src: "/common/A094_063.png" }, + { src: "/common/A094_064.png" }, + { src: "/common/A094_065.png" }, + { src: "/common/A094_066.png" }, + { src: "/common/A094_067.png" } +]; +export const pageRoute = function(prevUri, nextUri) { + return { + changePrev() { + router.replace({ + uri: prevUri + }); + }, + backMain() { + router.replace({ + uri: "pages/index/index" + }); + }, + changeNext() { + router.replace({ + uri: nextUri + }); + } + }; +}; +// route new page +export const routePage = function(uri) { + return { + changePage() { + router.replace({ uri: uri }); + } + }; +}; +// for back prev page +export const goPage = function(prevUri) { + return { + goHome() { + router.replace({ uri: "pages/index/index" }); + }, + goPrevious() { + router.replace({ uri: prevUri }); + } + }; +}; +export const lifeCycleFunc = function() { + return { + onInit() { + console.log("onInit called..."); + }, + onReady() { + console.log("onReady called..."); + }, + onShow() { + console.log("onShow called..."); + }, + onDestroy() { + console.log("onDestroy called..."); + } + }; +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/list.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/list.js new file mode 100755 index 0000000..c65ad8d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/list.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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 const addData = function() { + for (var i = 0; i < 50; i++) { + this.listData.push("common/left.png"); + this.listData.push("common/right.png"); + this.listData.push("common/music_prev.png"); + this.listData.push("common/music_next.png"); + this.listData.push("common/music_play.png"); + this.listData.push("common/goAhead.png"); + } +}; +export const resource = [ + "common/left.png", + "common/right.png", + "common/music_prev.png", + "common/music_next.png", + "common/music_play.png", + "common/goAhead.png" +]; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/swiper.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/swiper.js new file mode 100644 index 0000000..288ecad --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/js/swiper.js @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2021 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 const showPage = function(e) { + this.index = e.index; +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/left.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea923f5dd049c09090d1d8a798377a39c7c59c6c GIT binary patch literal 597 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/music_prev.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/music_prev.png new file mode 100644 index 0000000000000000000000000000000000000000..6101ca4c7d2d1c655cab41722a3fcb29032b276b GIT binary patch literal 1195 zcmeAS@N?(olHy`uVBq!ia0vp^9zg8L!3HGfZA^Fsq!^2X+?^QKos)S9a~60+7BevL9R^{>9hE{7QmN2iX@n)hJ|4J*3q%cW%P+8GhP=2c0$qi@XWqXqwxbpxnf9 zy_)&D<>Wu-@0eO|Hr_n*!1^2d#^2`^du-Z0^QPGERIN^fH7@8V$Ew@<_Su8K_ddIF zn>+3JTIPx#ro+n~vKN2*Tx$H~=`;J1HB5&uMPIm>_O0*BjDsH^-bhIM)8N$n@kI=4 z+tSGTSX+q=1HIVCVltWndPfD z9-BK+ym{lnicb`z~mW;qz~^i=XBG7yG=t)Qrzb`T7D|QHf`2-3Kd* zbZ-HTI(&AMZ#i$?=@f%`F_W_b5^fme8A#`RR(~sy!hFuudW{L&^G2t+Yk+RBU1`VKwz8<% zGAn-b38uN)-(2q(|9J6lzA4fx;qUkd-dI*ngP_h$baYlSKY|C?tGB>car{^skD`(i8Ip&N8;75#z^o?+!}C~i|6&U=b|CK zYZ|k{5@yVbVw-yHET>{o{;JT%#8-b7+;L}2S?CwFeS6CZ+m&v>_&)iGZKVJta*Hc@ zyxuvQY8vFsxUk^f_uM0C%bnNxZq+czu`pked-(UOU1!Z*)_Iz07@YBy`tF?lBx=ic zro(qq4K;SMyWUQ@-U+P`$GsDxNt zMnL?wbu(@;HgV)i??m+nK7oUWPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D15imsK~z{r&6rzA zl|c~4Ewc+&ND@d$SF*^!E)+%=ip(e@kiZIxg2I>R@?sP{gw#Wk(2Ed76jBjMkzq+x zf)Z(|NSTr#l1PatC6*znxiyE~`7Y0;-D*W9qSyI;7Y=jX84{ivRE=B&?wwE_aAgXM)q-0bM{W-&HCE=RGV zw7HXWHkX!*35kiYRsf)MFeN2bY`8{TQ{mSb2kJUS*0JZFn-ML2gK`Wj+WLPuazd;WD1EW7lvC9$atvo&sB7n(5Gw^r zUm{#7PzEBRl>%iTB3da>2FAWp=#~CG_D7Clg?**aYd52XCwKKJ?as+3PS2>iA>S%yc3w=`6 zh@fx69rTUabLbmIwKPBpp)){dK{cW?;to1Xbf#1eoi$X;11KSMOH?DeJ#>rQLAOoi z&@H6fh-!HNWgPT=&^w}<(fi^KdWYyeQaSWap;|sb8Ak*wLI;!%B3cnTpmY$?iqHWi z6XA-`0VQK!5kUyCB6L6*!@VMc5Mo8>fHFqd|EvnRB6L7$5-3dqrAeSP36v&*(j-ut d1WH3Bh`-DlB?@Wko^t>I002ovPDHLkV1jOwq|E>T literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/preRow.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/preRow.png new file mode 100644 index 0000000000000000000000000000000000000000..c9bf0b5af12681a6069c4c49d46c966290c23138 GIT binary patch literal 1130 zcmV-w1eN=VP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1OG`xK~z{r?U-9g z)LRtBKW7@V4Aa!ow6U^D(@H9c9zu|UiWA-FhFOsj6a~>+&{L1~R8SN}bvl*jbT2y4 zg&+`uh%Bfy%e$GDm$FQ zQ-IF*4eb44>4a>KNMx+vCJtCKY22VNZqHAgFRd2`)ZM*q8iueGXwuSkh>9P}I@&P| z`B|x~johqkLhCm->+a64sJI+>cKXl`Ub)z_->c%+^ zrGj=K*P5*yibxm{iRDw0SsN)TYv52sS6ee`{=djt1+75QNvTL%v{D>UknQAwHq!L9 z3%6@Nhyz~#cajHM6|F$7wOe_hiOI3i$a5yJHd6Gefd`tPEB>zd4r^7E1I0{qAtiT_ zIAHU1C+rclHGEXJcj7^Pi#VYC!ZGxCJmS<)4wSWJwe1Dp$%aS2-`U?8IL;eC9rDrZd#@YIVs)<$wCB)}Ed`y}B-x@i|{E0_i% zUj1`K6!56=Bg$Gk#Q7+kktPaAnwyI;nK|P0Pzppv*Y;^^61$ookZ ztw2Qets=NP+F8@)zV^n~Wqquinv9s?y}d`9d$MOy6?U zsTA!%L?|o8QlL;)N>D#o%|CD&qti3RnPc{26=CUw`Y=|C3bZI=r)G;AnxFzvrO>C= w!R$w_puVzD5Y!2Uf^Z-+!hy^P2MP@E3%~q-V*2pn%>V!Z07*qoM6N<$g7Y96J^%m! literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/right.png b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/common/right.png new file mode 100644 index 0000000000000000000000000000000000000000..0b6229a6897bea531937509888779cd4b36cf7d2 GIT binary patch literal 746 zcmeAS@N?(olHy`uVBq!ia0vp^en1?+!3HF^mpOj}QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$Aj3=B;5o-U3d6>)EG8+M5}iX8hG8tiBwAZUEh z<$^wJ)yx z_%t#!f4^I@%Y%G@bJ&*+%B`i`Saeao&FJoYbb z{&+sIdF~?4zGce`tlflVeDxoe^{Igj7VQ91*A9zz0jX(+MSFl$*kMtSoY>(|u-u_g zkerE3ZDvf6dA!Hb0|piMfxblrAo`*&C=AGa;jC@$BG- zOs>Mf@aGoSne_k|l&nB=cSW{wOZgU*Om365|FXBmBt|R3 + + + FSModule + {{testRes}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/async/async001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/async/async001/index.js new file mode 100644 index 0000000..6327e4b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/async/async001/index.js @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021 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 router from "@system.router"; +export default { + data: { + testRes: "failed" + }, + backMain() { + router.replace({ uri: "pages/index/index" }); + }, + onInit() { + console.log("onInit called..."); + }, + onReady() { + console.log("onReady called..."); + }, + onShow() { + console.log("onShow called..."); + var thisCtx = this; + var file = require("@system.file"); + file.access({ + uri: 'internal://app/test', + success: function() { + console.log('file.access success'); + thisCtx.testRes = "passed"; + }, + fail: function(data, code) { + console.log('file.access fail, data: ' + data + ', code: ' + code); + thisCtx.testRes = "passed"; + } + }); + console.log('file.access execute finished!'); + thisCtx.testRes = "failed"; + }, + onDestroy() { + console.log("onDestroy called..."); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.css new file mode 100644 index 0000000..1cd5796 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.css @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2021 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. + */ +#container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 620px; +} + +#testTitle { + font-size: 30px; + text-align: center; + width: 300px; + height: 65px; +} + +.title { + font-size: 30px; + text-align: center; + border-color: aqua; + border-width: 2px; + width: 300px; + height: 30px; + padding: 5px; + margin: 5px; +} + +#secDiv { + display: flex; + justify-content: center; + flex-direction: row; + left: 0px; + top: 200px; + width: 454px; + height: 60px; +} + +.button { + width: 160px; + height: 50px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.hml new file mode 100644 index 0000000..55e9060 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.hml @@ -0,0 +1,26 @@ + + +

+ 异常场景 + + onClick OOM + +
+ +
+ +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.js new file mode 100755 index 0000000..4de045e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/JSHeapOverFlow001/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 { + onClickOOM() { + var a = "1"; + for (var i = 0; i < 100000; i++) { + a = a + 1; + } + console.log(a); + }, +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.css new file mode 100644 index 0000000..0ab23fb --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.css @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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. + */ + +.divContainer { + width: 100%; + height: 100%; + background-color: darkseagreen; + justify-content: center; + align-items: center; +} +.divContainer2 { + width: 90%; + height: 90%; + background-color: gainsboro; + justify-content: center; + align-items: center; +} +.stackContainer { + width: 50%; + height: 30%; + background-color: mistyrose; +} +.title { + width: 70%; + height: 60%; + font-size: 30px; + text-align: left; + background-color: black; +} +.contentCenter { + justify-content: center; + align-items: center; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.hml new file mode 100644 index 0000000..6d808b1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.hml @@ -0,0 +1,46 @@ + +
+
+ + + 父组件{{stackWidth}},{{stackHeight}} + + + 宽60%，高50%, top {{topValue}} left {{leftValue}} + + +
+ + margin {{marginValue}} + + + + + list 70%, 75% + + + + + + +
+
+
diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.js new file mode 100644 index 0000000..b8f5812 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/PercentSupport/index.js @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2021 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 router from '@system.router'; + +export default { + data: { + title: 'World', + listData: [ + "返回首页 1", + "返回首页 2", + "返回首页 3", + "返回首页 4", + "返回首页 5", + "返回首页 6", + "返回首页 7", + "返回首页 8", + "返回首页 9", + "返回首页 10" + ], + stackClickCount: 0, + stackWidth: "50%", + stackHeight: "30%", + topValue: "30%", + leftValue: "0px", + topLeftClickCount: 0, + marginValue: "8.5%", + marginClickCount: 0 + }, + changePercentToPercent() { + this.topLeftClickCount++; + if (this.topLeftClickCount % 2 == 0) { + this.stackWidth = "80%"; + this.stackHeight = "40%"; + } else { + this.stackWidth = "50%"; + this.stackHeight = "30%"; + } + }, + changePercentToPX() { + this.topLeftClickCount++; + if (this.topLeftClickCount % 2 == 0) { + this.topValue = "0px"; + this.leftValue = "30%"; + } else { + this.topValue = "30%"; + this.leftValue = "0px"; + } + }, + changeMargin() { + this.marginClickCount++; + if (this.marginClickCount % 2 == 0) { + this.marginValue = "8.5%"; + } else { + this.marginValue = "10px"; + } + }, + returnIndex() { + router.replace({ uri:"pages/index/index" }); + } +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.css new file mode 100644 index 0000000..e257aa9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.css @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 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. + */ +#container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} +#testTitle { + font-size: 30px; + text-align: center; + width: 300px; + height: 65px; +} +.title { + font-size: 30px; + text-align: center; + width: 400px; + height: 40px; +} +.title2 { + margin: 20px; + font-size: 38px; + text-align: center; + width: 350px; + height: 30px; +} +#secDiv { + display: flex; + justify-content: center; + flex-direction: row; + left: 0px; + top: 200px; + width: 454px; + height: 60px; +} +.button { + width: 150px; + height: 50px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.hml new file mode 100644 index 0000000..a1da3b1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.hml @@ -0,0 +1,32 @@ + + +
+ 显示框架版本信息 + + aceVersion: {{versionStr}} + + + commit: {{commitStr}} + + + {{buildStamp}} + +
+ +
+ +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.js new file mode 100644 index 0000000..28b83d8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/base/VersionCheck001/index.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 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 router from '@system.router'; + +export default { + data: { + versionStr: 'null', + commitStr: 'null', + buildStamp: 'null' + }, + exitPage() { + router.replace({ uri:"pages/index/index" }); + }, + nextPage() { + router.replace({ uri:"pages/Base/PercentSupport/index" }); + }, + onShow() { + if(getAceVersion && typeof(getAceVersion) == "function") { + this.versionStr = getAceVersion(); + } + if(getAceCommit && typeof(getAceCommit) == "function") { + this.commitStr = getAceCommit(); + } + if(getAceStamp && typeof(getAceStamp) == "function") { + this.buildStamp = getAceStamp(); + } + } +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.hml new file mode 100644 index 0000000..0149727 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.hml @@ -0,0 +1,25 @@ + + + + camera001 + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.js new file mode 100644 index 0000000..514b242 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera001/index.js @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +export default { + backMain:backPage().backMain, + changeNext:routePage("pages/camera/camera002/index").changePage, + ...lifeCycleFunc(), + takePhoto() { + console.log("JS::takePhoto called!"); + var camera = this.$refs.cam; + camera.takePhoto({ + quality: "high", + success: (res) => { + console.log("JS::camera.takePhoto success, uri=" + res.uri); + }, + fail: (erromsg, errocode) => { + console.log("JS::camera.takePhoto fail, errocode=" + errocode + " erromsg=" + erromsg); + }, + complete: () => { + console.log("JS::camera.takePhoto complete"); + } + }); + }, + error: function (e) { + console.log("JS::camera.onerror detail=" + e.detail + " errorCode=" + e.errorCode); + }, +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.hml new file mode 100644 index 0000000..e2ceb31 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.hml @@ -0,0 +1,25 @@ + + + + camera002 + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.js new file mode 100644 index 0000000..4a04bac --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera002/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +export default { + changePrev:routePage("pages/camera/camera001/index").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/camera/camera003/index").changePage, + ...lifeCycleFunc(), + takePhoto() { + var camera = this.$refs.cam; + camera.takePhoto({ + quality: "normal" + }); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.hml new file mode 100644 index 0000000..9f09e41 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.hml @@ -0,0 +1,25 @@ + + + + camera003 + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.js new file mode 100644 index 0000000..e8e200a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera003/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +export default { + changePrev:routePage("pages/camera/camera002/index").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/camera/camera004/index").changePage, + ...lifeCycleFunc(), + takePhoto() { + var camera = this.$refs.cam; + camera.takePhoto({ + quality: "low" + }); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.hml new file mode 100644 index 0000000..32368e1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.hml @@ -0,0 +1,25 @@ + + + + camera004 + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.js new file mode 100644 index 0000000..16b7ea8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/camera/camera004/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +export default { + changePrev:routePage("pages/camera/camera003/index").changePage, + backMain:backPage().backMain, + ...lifeCycleFunc(), + takePhoto() { + var camera = this.$refs.cam; + camera.takePhoto({ + quality: "illegal" + }); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.css new file mode 100755 index 0000000..04fe1df --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.css @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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. + */ + +.container { + display: flex; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 800px; +} + +.title { + width: 454px; + height: 45px; + text-align: center; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.hml new file mode 100755 index 0000000..8726fa4 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.hml @@ -0,0 +1,32 @@ + + +
+ device api + 点击获取信息 + {{brand}} + {{manufacturer}} + {{model}} + {{product}} + {{language}} + {{region}} + {{windowWidth}} + {{windowHeight}} + {{screenDensity}} + {{screenShape}} + {{apiVersion}} + {{deviceType}} + 退出 +
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.js new file mode 100755 index 0000000..57e7dc6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/deviceInfo/index.js @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2021 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 device from '@system.device'; +import {backPage} from "../../common/js/general"; + +export default { + data: { + brand:'', + manufacturer:'', + model:'', + product:'', + language:'', + region:'', + windowWidth:'', + windowHeight:'', + screenDensity:'', + screenShape:'', + apiVersion:'', + deviceType:'' + }, + backMain:backPage().backMain, + clickAction:function(){ + let that = this; + device.getInfo({ + success:function(data){ + that.brand = 'band:' + data.brand; + that.manufacturer = 'manufacturer:' + data.manufacturer; + that.model = 'model:' + data.model; + that.product = 'product:' + data.product; + that.language = 'language:' + data.language; + that.region = 'region:' + data.region; + that.windowHeight = 'windowHeight:' + data.windowHeight; + that.windowWidth = 'windowWidth:' + data.windowWidth; + that.screenDensity = 'screenDensity:' + data.screenDensity; + that.screenShape = 'screenShape:' + data.screenShape; + that.apiVersion = 'apiVersion:' + data.apiVersion; + that.deviceType = 'deviceType:' + data.deviceType; + console.log("get device info success"); + }, + fail:function(data,code){ + that.brand = "get device info failed, errorcode:"+code; + console.log("get device info failed"); + }, + complete:function(){ + console.log("get device info completed"); + } + }); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.css new file mode 100755 index 0000000..8fa6854 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.css @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2021 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. + */ + +.container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} + +.title { + font-size: 30px; + width: 350px; + height: 80px; +} + +.btn { + width: 150px; + height: 50px; + top: 230px; + left: 120px; +} + +.testTitle { + font-size: 30px; + text-align: center; + width: 350px; + height: 65px; + top: 100px; + left: 50px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.hml new file mode 100755 index 0000000..a16d79f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.hml @@ -0,0 +1,25 @@ + + + + DFX 功能增强1 + + {{textValue}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.js new file mode 100755 index 0000000..cabe80a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist1/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage} from "../../../common/js/general"; +export default { + data: { + textValue: "Hello World", + textColor: 65280 + }, + showChange() { + this.textValue = "Hello ACE"; + this.textColor = 16711680; + }, + changePrev:routePage("pages/dfx/dfx7/index").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/dfx/assist2/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.css new file mode 100755 index 0000000..30f4111 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.css @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2021 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. + */ + +.container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} + +.title { + font-size: 30px; + width: 350px; + height: 80px; +} + +.btn { + width: 150px; + height: 50px; + top: 230px; + left: 120px; +} + +.testTitle { + font-size: 30px; + text-align: center; + width: 350px; + height: 65px; + top: 100px; + left: 50px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.hml new file mode 100755 index 0000000..d751b8b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.hml @@ -0,0 +1,25 @@ + + + + DFX 功能增强2 + + {{textValue}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.js new file mode 100755 index 0000000..cce9bf4 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist2/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +export default { + data: { + textValue: "Hello World", + textColor: 65280 + }, + showChange() { + // construct undefined variable + var sum = num + 1; + }, + changePrev:routePage("pages/dfx/assist1/index").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/dfx/assist3/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.css new file mode 100755 index 0000000..30f4111 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.css @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2021 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. + */ + +.container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} + +.title { + font-size: 30px; + width: 350px; + height: 80px; +} + +.btn { + width: 150px; + height: 50px; + top: 230px; + left: 120px; +} + +.testTitle { + font-size: 30px; + text-align: center; + width: 350px; + height: 65px; + top: 100px; + left: 50px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.hml new file mode 100755 index 0000000..f1a548f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.hml @@ -0,0 +1,25 @@ + + + + DFX 功能增强3 + + {{textValue}} + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.js new file mode 100755 index 0000000..6c4c884 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/assist3/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + textValue: "Hello World", + textColor: 65280 + }, + showChange() { + // construct undefined method + this.xxx(); + }, + changePrev:routePage("pages/dfx/assist2/index").changePage, + backMain:backPage().backMain +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.css new file mode 100644 index 0000000..19f28f3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.css @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 75px; + width: 200px; + height: 150px; + margin: 10px; + padding: 30px; + border-width: 1px; + border-radius: 10px; + background-color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.hml new file mode 100644 index 0000000..d26390e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.hml @@ -0,0 +1,44 @@ + + + + get dom node +
+ domId: {{domId}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.js new file mode 100644 index 0000000..12d6886 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx1/index.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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. + */ + +var dfx = require("@system.dfx"); +import {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; + +export default { + data: { + domId: "" + }, + getDomNode(viewid) { + var info = dfx.dumpDomNode(viewid); + if (info == undefined) { + console.log("dump dom node error"); + this.domId = "error"; + } else { + var jsonInfo = JSON.parse(info); + this.domId = jsonInfo.id; + } + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changeNext:routePage("pages/dfx/dfx2/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.css new file mode 100644 index 0000000..b586b71 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.css @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 95px; + width: 200px; + height: 150px; + margin: 10px; + padding: 30px; + border-width: 1px; + border-radius: 10px; + background-color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.hml new file mode 100644 index 0000000..4ba0d14 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.hml @@ -0,0 +1,45 @@ + + + + get dom tree default +
+ {{msg}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.js new file mode 100644 index 0000000..ddffbf9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx2/index.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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. + */ + +var dfx = require("@system.dfx"); +import {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; + +export default { + data: { + msg: "" + }, + getDomTree() { + if (dfx.dumpDomTree()) { + console.log("dump dom tree success"); + this.msg = "success"; + } else { + console.log("dum dom tree fail"); + this.msg = "fail"; + } + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changeNext:routePage("pages/dfx/dfx3/index").changePage, + changePrev:routePage("pages/dfx/dfx1/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.css new file mode 100644 index 0000000..b586b71 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.css @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 95px; + width: 200px; + height: 150px; + margin: 10px; + padding: 30px; + border-width: 1px; + border-radius: 10px; + background-color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.hml new file mode 100644 index 0000000..d9f9461 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.hml @@ -0,0 +1,45 @@ + + + + get dom tree +
+ {{msg}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.js new file mode 100644 index 0000000..43bdce6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx3/index.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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. + */ + +var dfx = require("@system.dfx"); +import {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; + +export default { + data: { + msg: "" + }, + getDomTree(viewId) { + if (dfx.dumpDomTree(viewId)) { + console.log("dump dom tree success"); + this.msg = "success"; + } else { + console.log("dum dom tree fail"); + this.msg = "fail"; + } + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changeNext:routePage("pages/dfx/dfx4/index").changePage, + changePrev:routePage("pages/dfx/dfx2/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.css new file mode 100644 index 0000000..fc4fd96 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 130px; + width: 200px; + height: 200px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.hml new file mode 100644 index 0000000..c2d6e13 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.hml @@ -0,0 +1,46 @@ + + + + click event +
+ + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.js new file mode 100644 index 0000000..4e87168 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx4/index.js @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021 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. + */ + +var dfx = require("@system.dfx"); +import {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; + +export default { + data: { + color: "#5265ef" + }, + changeGreen() { + this.color = 32768; + }, + changeRed() { + this.color = 16711680; + }, + backMain:backPage().backMain, + changeNext:routePage("pages/dfx/dfx5/index").changePage, + changePrev:routePage("pages/dfx/dfx3/index").changePage, + onInit: lifeCycleFunc().onInit, + onReady: lifeCycleFunc().onReady, + onShow() { + console.log("onShow called..."); + + console.log("click..."); + var points = [ + [200, 250, 1], + [200, 250, 1], + [200, 250, 1], + [200, 250, 1], + [200, 250, 0] + ]; + + dfx.injectEvent(points, "point"); + console.log("click..."); + }, + onDestroy: lifeCycleFunc().onDestroy +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.css new file mode 100644 index 0000000..fc4fd96 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 130px; + width: 200px; + height: 200px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.hml new file mode 100644 index 0000000..41e38c6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.hml @@ -0,0 +1,46 @@ + + + + long press event +
+ + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.js new file mode 100644 index 0000000..49bb20c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx5/index.js @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2021 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. + */ + +var dfx = require("@system.dfx"); +import { backPage, routePage, lifeCycleFunc } from "../../../common/js/general"; + +export default { + data: { + color: "#5265ef" + }, + changeRed() { + this.color = 16711680; + }, + changeGreen() { + this.color = 32768; + }, + onInit: lifeCycleFunc().onInit, + onReady: lifeCycleFunc().onReady, + onShow() { + var pointss = []; + function addData() { + for (var i = 0; i < 20; i++) { + pointss.push([200, 250, 1]); + } + pointss.push([200, 250, 0]); + } + console.log("onShow called..."); + console.log("press..."); + addData(); + dfx.injectEvent(pointss, "point"); + console.log("press..."); + }, + onDestroy: lifeCycleFunc().onDestroy, + backMain: backPage().backMain, + changeNext: routePage("pages/dfx/dfx6/index").changePage, + changePrev: routePage("pages/dfx/dfx4/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.css new file mode 100644 index 0000000..611548d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.css @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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. + */ +.sliderStyle { + left: 100px; + top: 280px; + color: #b22222; + height: 30px; + width: 250px; + selected-color: #00ff00; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.hml new file mode 100644 index 0000000..49f8718 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.hml @@ -0,0 +1,48 @@ + + + + drag event + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.js new file mode 100644 index 0000000..be9bb73 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx6/index.js @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 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. + */ + +var dfx = require("@system.dfx"); +import {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; + +export default { + getDomNode(viewid) { + var info = dfx.dumpDomNode(viewid); + if (info == undefined) { + console.log("dump dom node error"); + } else { + console.log(JSON.stringify(info)); + } + }, + onInit: lifeCycleFunc().onInit, + onReady: lifeCycleFunc().onReady, + onShow() { + console.log("onShow called..."); + console.log("drag..."); + var drag_points = [ + [228, 299, 1], + [248, 299, 1], + [289, 299, 0] + ]; + dfx.injectEvent(drag_points, "point"); + console.log("drag..."); + }, + onDestroy: lifeCycleFunc().onDestroy, + backMain:backPage().backMain, + changeNext:routePage("pages/dfx/dfx7/index").changePage, + changePrev:routePage("pages/dfx/dfx5/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.css new file mode 100644 index 0000000..b586b71 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.css @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 95px; + width: 200px; + height: 150px; + margin: 10px; + padding: 30px; + border-width: 1px; + border-radius: 10px; + background-color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.hml new file mode 100644 index 0000000..f225f0d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.hml @@ -0,0 +1,42 @@ + + + + screensnap +
+ {{msg}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.js new file mode 100755 index 0000000..327672c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dfx/dfx7/index.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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. + */ + +var dfx = require("@system.dfx"); +import { backPage, routePage, lifeCycleFunc } from "../../../common/js/general"; + +export default { + data: { + msg: "" + }, + makeScreenshot() { + if (dfx.screenshotToFile()) { + this.msg = "success"; + console.log("screen success"); + } else { + this.msg = "fail"; + console.log("screen fail"); + } + }, + ...lifeCycleFunc(), + backMain: backPage().backMain, + changePrev: routePage("pages/dfx/dfx6/index").changePage, + changeNext: routePage("pages/dfx/assist1/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.hml new file mode 100755 index 0000000..6ad4042 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.hml @@ -0,0 +1,31 @@ + + + + dialog + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.js new file mode 100755 index 0000000..6e96327 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/dialog/dialog001/index.js @@ -0,0 +1,233 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +import prompt from "@system.prompt"; + +export default { + backMain:backPage().backMain, + ...lifeCycleFunc(), + showDialog() { + console.log("JS::show dialog called!"); + prompt.showDialog({title: '弹框标题',}); + }, + + showDialog01() { + console.log("JS::show dialog01 called!"); + prompt.showDialog({ + title: '弹框标题', + message: '弹框显示内容01', + buttons: [ + { + text: '确认', + color: '#666666', + }, + ], + success: function(data) { + console.log('dialog success callback，click button : ' + data.index); + switch(data.index) + { + case 0: + console.log("JS::dialog confirm button clicked!"); + break; + } + }, + }); + }, + + showDialog02() { + console.log("JS::show dialog02 called!"); + prompt.showDialog({ + title: '弹框标题', + message: '弹框显示内容02', + buttons: [ + { + text: '确认', + color: '#666666', + }, + { + text: '取消', + color: '#666666', + }, + ], + success: function(data) { + console.log('dialog success callback，click button : ' + data.index); + switch(data.index) + { + case 0: + console.log("JS::dialog confirm button clicked!"); + break; + case 1: + console.log("JS::dialog cancel button clicked!"); + break; + } + }, + }); + }, + + showDialog03() { + console.log("JS::show dialog03 called!"); + prompt.showDialog({ + title: '弹框标题', + message: '弹框显示内容03', + buttons: [ + { + text: '确认', + color: '#666666', + }, + { + text: '取消', + color: '#666666', + }, + { + text: '完成', + color: '#666666', + }, + ], + success: function(data) { + console.log('dialog success callback，click button : ' + data.index); + switch(data.index) + { + case 0: + console.log("JS::dialog confirm button index 0 clicked!"); + break; + case 1: + console.log("JS::dialog cancel button index 1 clicked!"); + break; + case 2: + console.log("JS::dialog complete button index 2 clicked!"); + break; + } + }, + }); + }, + + showDialog04() { + console.log("JS::show dialog04 called!"); + prompt.showDialog({ + title: '弹框标题', + message: '弹框显示内容04', + buttons: [ + { + text: '确认', + color: '#666666', + }, + { + text: '取消', + color: '#666666', + }, + { + text: '完成', + color: '#666666', + }, + { + text: 'button04', + color: '#666666', + }, + ], + success: function(data) { + console.log('dialog success callback，click button : ' + data.index); + switch(data.index) + { + case 0: + console.log("JS::dialog confirm button index 0 clicked!"); + break; + case 1: + console.log("JS::dialog cancel button clicked!"); + break; + case 2: + console.log("JS::dialog complete button clicked!"); + break; + case 3: + console.log("JS::dialog buttontest04 button clicked!"); + break; + } + }, + }); + }, + + showDialog05() { + var dialogContext = this; + console.log("JS::show dialog05 called!"); + prompt.showDialog({ + title: '弹框标题', + message: '弹框显示内容06', + buttons: [ + { + text: '确认', + color: '#ff0000', + }, + { + text: '取消', + color: '#00ff00', + }, + ], + success: function(data) { + console.log('dialog success callback，click button : ' + data.index); + switch(data.index) + { + case 0: + console.log("JS::dialog confirm button clicked!"); + dialogContext.showDialog07(); + break; + case 1: + console.log("JS::dialog cancel button clicked!"); + break; + } + }, + }); + setTimeout( + () => { + this.showDialog06(); + }, 5 * 1000 + ); + + }, + + showDialog06() { + console.log("JS::show dialog 06 called!"); + prompt.showDialog({message: 'only ShowMessage',}); + }, + + showDialog07() { + console.log("JS::show dialog 07 called !"); + prompt.showDialog({ + title: '弹框标题', + message: 'show second dialog', + buttons: [ + { + text: '确认', + color: '#0000ff', + }, + { + text: '取消', + color: '#0000ff', + }, + ], + success: function(data) { + console.log('dialog success callback，click button : ' + data.index); + switch(data.index) + { + case 0: + console.log("JS::dialog confirm button clicked!"); + break; + case 1: + console.log("JS::dialog cancel button clicked!"); + break; + } + }, + }); + }, + +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.css new file mode 100644 index 0000000..cce4b4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 100px; + width: 200px; + height: 150px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.hml new file mode 100644 index 0000000..4085b50 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.hml @@ -0,0 +1,49 @@ + + + + touch cancel +
+ x: {{pointX}} , y: {{pointY}} + timeStamp: {{timeStamp}} + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.js new file mode 100644 index 0000000..0bf512a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/cancel/index.js @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage, lifeCycleFunc } from "../../../common/js/general"; +import { commonFunc, dataCommon } from "../../../common/js/event"; + +export default { + data: { + ...dataCommon + }, + touchcancel(e) { + console.log("touch end start"); + commonFunc(this, e); + console.log("touch end stop"); + }, + ...lifeCycleFunc(), + backMain: backPage().backMain, + changeNext: routePage("pages/event/end/index").changePage, + changePrev: routePage("pages/event/move/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.css new file mode 100644 index 0000000..cce4b4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 100px; + width: 200px; + height: 150px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.hml new file mode 100644 index 0000000..a428083 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.hml @@ -0,0 +1,48 @@ + + + + click +
+ x: {{pointX}} , y: {{pointY}} + timeStamp: {{timeStamp}} + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.js new file mode 100644 index 0000000..e484c8c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/click/index.js @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +import {commonFunc, dataCommon} from "../../../common/js/event"; + +export default { + data: { + ...dataCommon + }, + clickEvent(e) { + console.log("click start"); + commonFunc(this, e); + console.log("click stop"); + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changeNext:routePage("pages/event/longpress/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.css new file mode 100644 index 0000000..cce4b4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 100px; + width: 200px; + height: 150px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.hml new file mode 100644 index 0000000..6ca952a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.hml @@ -0,0 +1,49 @@ + + + + touch end +
+ x: {{pointX}} , y: {{pointY}} + timeStamp: {{timeStamp}} + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.js new file mode 100644 index 0000000..a4b0298 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/end/index.js @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +import {commonFunc, dataCommon} from "../../../common/js/event" + +export default { + data: { + ...dataCommon + }, + touchend(e) { + console.log("touch end start"); + commonFunc(this, e); + console.log("touch end stop"); + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changePrev:routePage("pages/event/cancel/index").changePage, + changeNext:routePage("pages/event/key/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.css new file mode 100644 index 0000000..cce4b4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 100px; + width: 200px; + height: 150px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.hml new file mode 100644 index 0000000..8df38ac --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.hml @@ -0,0 +1,43 @@ + + + + key event +
+ {{msg}} + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.js new file mode 100644 index 0000000..d6dab58 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/key/index.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; + +export default { + data: { + color: "#5265ef", + flag: false, + msg: "key event" + }, + keyEvent(e) { + console.log("key start"); + if (this.flag) { + this.color = 16766720; + this.flag = false; + this.msg = "color is 16766720"; + } else { + this.color = 32768; + this.flag = true; + this.msg = "color is 32768"; + } + console.log("key stop"); + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changePrev:routePage("pages/event/end/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.css new file mode 100644 index 0000000..cce4b4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 100px; + width: 200px; + height: 150px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.hml new file mode 100644 index 0000000..d665c62 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.hml @@ -0,0 +1,49 @@ + + + + long press +
+ x: {{pointX}} , y: {{pointY}} + timeStamp: {{timeStamp}} + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.js new file mode 100644 index 0000000..6fe4d3a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/longpress/index.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; +import {commonFunc, dataCommon} from "../../../common/js/event" + +export default { + data: { + ...dataCommon + }, + longPressEvent(e) { + console.log("press start"); + commonFunc(this, e); + console.log("press stop"); + }, + ...lifeCycleFunc(), + backMain:backPage().backMain , + changeNext:routePage("pages/event/start/index").changePage, + changePrev:routePage("pages/event/click/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.css new file mode 100644 index 0000000..cce4b4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 100px; + width: 200px; + height: 150px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.hml new file mode 100644 index 0000000..ebd7519 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.hml @@ -0,0 +1,50 @@ + + + + touch move +
+ start X: {{startX}} , Y: {{startY}} + timeStamp: {{timeStamp}} + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.js new file mode 100644 index 0000000..916744f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/move/index.js @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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 {backPage, lifeCycleFunc, routePage} from "../../../common/js/general"; +import {commonFunc, dataCommon} from "../../../common/js/event"; + +export default { + data: { + ...dataCommon, + startX: 0, + startY: 0 + }, + touchstart(e) { + console.log("touch start"); + commonFunc(this, e); + console.log("touch stop"); + }, + touchmove(e) { + console.log("touch move start"); + commonFunc(this, e); + this.startX = e.touches.startX; + this.startY = e.touches.startY; + console.log("touch move end"); + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changeNext:routePage("pages/event/cancel/index").changePage, + changePrev:routePage("pages/event/start/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.css new file mode 100644 index 0000000..cce4b4a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.css @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 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. + */ +.commonStyle { + left: 95px; + top: 100px; + width: 200px; + height: 150px; + border-width: 1px; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.hml new file mode 100644 index 0000000..acdf8d0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.hml @@ -0,0 +1,49 @@ + + + + touch start +
+ x: {{pointX}} , y: {{pointY}} + timeStamp: {{timeStamp}} + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.js new file mode 100644 index 0000000..fc13093 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/event/start/index.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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 {backPage, lifeCycleFunc, routePage} from "../../../common/js/general"; +import {commonFunc, dataCommon} from "../../../common/js/event" + +export default { + data: { + ...dataCommon + }, + touchstart(e) { + console.log("touch end start"); + commonFunc(this, e); + console.log("touch end stop"); + }, + ...lifeCycleFunc(), + backMain:backPage().backMain, + changeNext:routePage("pages/event/move/index").changePage, + changePrev:routePage("pages/event/longpress/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.hml new file mode 100644 index 0000000..2582736 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.hml @@ -0,0 +1,62 @@ + + + + + + step1:move() + + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.js new file mode 100644 index 0000000..7b4520a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file01/index.js @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import file from "@system.file"; + +export default { + data: { + srcStatus: false, + desStatus: false + }, + backMain: backPage().backMain, + changeNext: routePage("pages/file/file02/index").changePage, + fileMove: function() { + file.move({ + srcUri: "internal://app/testfile1", + dstUri: "internal://app/testfile2", + success: function(uri) { + console.log("move call success :" + uri); + }, + fail: function(data, code) { + console.log("move call fail"); + }, + complete: function() { + console.log("move call complete"); + } + }) + }, + checkSrc: function() { + var obj = this; + file.access({ + uri: "internal://app/testfile1", + success: function(data) { + console.log("move src file exist."); + }, + fail: function(data, code) { + console.log("move src file not exist."); + obj.srcStatus = true; + }, + complete: function() { + console.log("move src access call complete."); + } + }) + }, + checkDes: function() { + var obj = this; + file.access({ + uri: "internal://app/testfile2", + success: function(data) { + console.log("move des file exist."); + obj.desStatus = true; + }, + fail: function(data, code) { + console.log("move des file not exist."); + }, + complete: function() { + console.log("move des access call complete."); + } + }) + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.hml new file mode 100644 index 0000000..d30a434 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.hml @@ -0,0 +1,62 @@ + + + + + + step2:copy() + + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.js new file mode 100644 index 0000000..41d933e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file02/index.js @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import file from "@system.file"; + +export default { + data: { + srcStatus: false, + desStatus: false + }, + backMain: backPage().backMain, + changePrev: routePage("pages/file/file01/index").changePage, + changeNext: routePage("pages/file/file03/index").changePage, + fileCopy: function() { + file.copy({ + srcUri: "internal://app/testfile2", + dstUri: "internal://app/testfile1", + success: function(uri) { + console.log("copy call success :" + uri); + }, + fail: function(data, code) { + console.log("copy call fail"); + }, + complete: function() { + console.log("copy call complete"); + } + }) + }, + checkSrc: function() { + var obj = this; + file.access({ + uri: "internal://app/testfile2", + success: function(data) { + console.log("copy src file exist."); + obj.srcStatus = true; + }, + fail: function(data, code) { + console.log("copy src file not exist."); + }, + complete: function() { + console.log("copy src access call complete."); + } + }) + }, + checkDes: function() { + var obj = this; + file.access({ + uri: "internal://app/testfile1", + success: function(data) { + console.log("copy des file exist."); + obj.desStatus = true; + }, + fail: function(data, code) { + console.log("copy des file not exist."); + }, + complete: function() { + console.log("copy des access call complete."); + } + }) + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.hml new file mode 100644 index 0000000..2b16f0c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.hml @@ -0,0 +1,56 @@ + + + + + + step3:delete() + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.js new file mode 100644 index 0000000..03f2d61 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file03/index.js @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import file from "@system.file"; + +export default { + data: { + srcStatus: false + }, + backMain: backPage().backMain, + changePrev: routePage("pages/file/file02/index").changePage, + changeNext: routePage("pages/file/file04/index").changePage, + fileDel: function() { + file.delete({ + uri: "internal://app/testfile2", + success: function(data) { + console.log("del call success"); + }, + fail: function(data, code) { + console.log("del call fail"); + }, + complete: function() { + console.log("del call complete"); + } + }) + }, + checkDel: function() { + var obj = this; + file.access({ + uri: "internal://app/testfile2", + success: function(data) { + console.log("del src file exist."); + }, + fail: function(data, code) { + console.log("del src file not exist."); + obj.srcStatus = true; + }, + complete: function() { + console.log("del src access call complete."); + } + }) + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.hml new file mode 100644 index 0000000..ab1e08a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.hml @@ -0,0 +1,56 @@ + + + + + + step4:{{status}} + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.js new file mode 100644 index 0000000..2723d86 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file04/index.js @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import file from "@system.file"; + +export default { + data: { + status: "write" + }, + backMain: backPage().backMain, + changePrev: routePage("pages/file/file03/index").changePage, + changeNext: routePage("pages/file/file05/index").changePage, + fileWrite: function() { + file.writeText({ + uri: "internal://app/testfile1", + text: "read", + success: function(data) { + console.log("write call success"); + }, + fail: function(data, code) { + console.log("write call fail"); + }, + complete: function() { + console.log("write call complete"); + } + }) + }, + fileRead: function() { + var obj = this; + file.readText({ + uri: "internal://app/testfile1", + success: function(data) { + console.log("read call success"); + obj.status = data.text; + }, + fail: function(data, code) { + console.log("read call fail"); + }, + complete: function() { + console.log("read call complete"); + } + }) + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.hml new file mode 100644 index 0000000..5a3520b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.hml @@ -0,0 +1,56 @@ + + + + + + step5:{{status}} + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.js new file mode 100644 index 0000000..6c3eb52 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file05/index.js @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import file from "@system.file"; + +export default { + data: { + status: "mkdir" + }, + backMain: backPage().backMain, + changePrev: routePage("pages/file/file04/index").changePage, + changeNext: routePage("pages/file/file06/index").changePage, + fileMkdir: function() { + file.mkdir({ + uri: "internal://app/testDirectory", + success: function(data) { + console.log("mkdir call success"); + }, + fail: function(data, code) { + console.log("mkdir call fail"); + }, + complete: function() { + console.log("mkdir call complete"); + } + }) + }, + fileRmdir: function() { + var obj = this; + file.rmdir({ + uri: "internal://app/testDirectory", + recursive: true, + success: function(data) { + console.log("rmdir call success"); + obj.status = "rmdir"; + }, + fail: function(data, code) { + console.log("rmdir call fail"); + }, + complete: function() { + console.log("rmdir call complete"); + } + }) + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.hml new file mode 100644 index 0000000..b2e094f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.hml @@ -0,0 +1,53 @@ + + + + + + step6:file.list() + + + + + {{content}} + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.js new file mode 100644 index 0000000..62d73c7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file06/index.js @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import file from "@system.file"; + +export default { + data: { + content: "content" + }, + backMain: backPage().backMain, + changePrev: routePage("pages/file/file05/index").changePage, + changeNext: routePage("pages/file/file07/index").changePage, + fileList: function() { + var obj = this; + file.list({ + uri: "internal://app", + success: function(data) { + console.log("list call success " + JSON.stringify(data.fileList)); + obj.content = JSON.stringify(data.fileList); + }, + fail: function(data, code) { + console.log("list call fail"); + }, + complete: function() { + console.log("list call complete"); + } + }) + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.hml new file mode 100644 index 0000000..338d51d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.hml @@ -0,0 +1,53 @@ + + + + + + step7:file.get() + + + + + {{content}} + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.js new file mode 100644 index 0000000..b6b7d37 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/file/file07/index.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import file from "@system.file"; + +export default { + data: { + content: "content" + }, + backMain: backPage().backMain, + changePrev: routePage("pages/file/file06/index").changePage, + fileGet: function() { + var obj = this; + file.get({ + uri: "internal://app/testfile1", + success: function(data) { + console.log("get call success " + JSON.stringify(data)); + obj.content = JSON.stringify(data); + }, + fail: function(data, code) { + console.log("get call fail"); + }, + complete: function() { + console.log("get call complete"); + } + }) + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.hml new file mode 100644 index 0000000..029ca42 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.hml @@ -0,0 +1,47 @@ + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.js new file mode 100644 index 0000000..babfec1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/01/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 { pageRoute, imageFrames } from "../../../common/js/general"; + + + +export default { + data: { + frames: imageFrames + }, + ...pageRoute("", "pages/image-animator/02/index") +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.hml new file mode 100644 index 0000000..682003f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.hml @@ -0,0 +1,58 @@ + + + + + iteration: {{iteration}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.js new file mode 100644 index 0000000..71f7226 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/02/index.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 { pageRoute, imageFrames as frames } from "../../../common/js/general"; + + +export default { + data: { + frames, + iteration: 5 + }, + ...pageRoute("pages/image-animator/01/index", "pages/image-animator/03/index"), + increase() { + this.iteration++; + this.$refs.animator.start(); + }, + decrease() { + this.iteration--; + this.$refs.animator.start(); + } + +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.hml new file mode 100644 index 0000000..e3f8f50 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.hml @@ -0,0 +1,52 @@ + + + + + {{reverse ? '逆序播放': '正序播放'}} + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.js new file mode 100644 index 0000000..963c4dd --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/03/index.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021 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 { pageRoute, imageFrames as frames } from "../../../common/js/general"; + + +export default { + data: { + frames, + reverse: false + }, + ...pageRoute("pages/image-animator/02/index", "pages/image-animator/04/index"), + toggle() { + this.reverse = !this.reverse; + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.css new file mode 100644 index 0000000..37ce441 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.button { + border-radius: 4px; + width: 100px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.hml new file mode 100644 index 0000000..80c0f11 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.hml @@ -0,0 +1,81 @@ + + + + {{state}} + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.js new file mode 100644 index 0000000..82aa0b8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/04/index.js @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021 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 { pageRoute, imageFrames as frames } from "../../../common/js/general"; + +export default { + data: { + frames, + state: null, + }, + ...pageRoute("pages/image-animator/03/index", "pages/image-animator/05/index"), + onShow() { + const animator = this.$refs.animator; + this.state = animator.getState(); + }, + handleStart() { + const animator = this.$refs.animator; + animator.start(); + this.state = animator.getState(); + }, + handlePause() { + const animator = this.$refs.animator; + animator.pause(); + this.state = animator.getState(); + }, + handleResume() { + const animator = this.$refs.animator; + animator.resume(); + this.state = animator.getState(); + }, + handleStop() { + const animator = this.$refs.animator; + animator.stop(); + this.state = animator.getState(); + }, + logStop() { + console.log("Stopped"); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.hml new file mode 100644 index 0000000..6517e12 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.hml @@ -0,0 +1,57 @@ + + + + + duration: {{duration}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.js new file mode 100644 index 0000000..d470593 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/05/index.js @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021 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 { pageRoute, imageFrames as frames } from "../../../common/js/general"; + + +export default { + data: { + frames, + duration: '540ms', + }, + ...pageRoute("pages/image-animator/04/index", "pages/image-animator/06/index"), + increase() { + const animator = this.$refs.animator; + animator.stop(); + const duration = parseInt(this.duration); + this.duration = `${duration + 540}ms`; + animator.start(); + }, + decrease() { + const animator = this.$refs.animator; + animator.stop(); + const duration = parseInt(this.duration); + this.duration = `${duration - 540}ms`; + animator.start(); + } + +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.css new file mode 100644 index 0000000..335313e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.css @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + justify-content: center; + align-items: center; + flex-direction: column; + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} +.title { + width: 400px; + height: 40px; + text-align: center; +} +.player { + width: 220px; + height: 220px; +} +.box { + width: 420px; + height: 110px; + justify-content: center; + align-items: center; + flex-wrap: wrap; +} +.btn { + width: 100px; + height: 50px; + border-radius: 2px; + margin-top: 4px; + margin-right: 4px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.hml new file mode 100644 index 0000000..6871b83 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.hml @@ -0,0 +1,61 @@ + + +
+ duration: {{duration}}ms + +
+ + + + + + +
+
diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.js new file mode 100644 index 0000000..8f99b18 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/image-animator/06/index.js @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2021 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 router from '@system.router'; + +const frames = [ + { src: '/common/A094_051.png' }, + { src: '/common/A094_052.png' }, + { src: '/common/A094_053.png' }, + { src: '/common/A094_054.png' }, + { src: '/common/A094_055.png' }, + { src: '/common/A094_056.png' }, + { src: '/common/A094_057.png' }, + { src: '/common/A094_058.png' }, + { src: '/common/A094_059.png' }, + { src: '/common/A094_060.png' }, + { src: '/common/A094_061.png' }, + { src: '/common/A094_062.png' }, + { src: '/common/A094_063.png' }, + { src: '/common/A094_064.png' }, + { src: '/common/A094_065.png' }, + { src: '/common/A094_066.png' }, + { src: '/common/A094_067.png' }, +]; + +const framesSize = frames.length; +const MILLIONS_PER_TICK = 30; +const duration = framesSize * MILLIONS_PER_TICK; + +export default { + data: { + frames, + duration + }, + quick() { + this.duration -= duration; + }, + slow() { + this.duration += duration; + }, + set0() { + this.duration = 0; + }, + set1() { + this.duration = 1; + }, + setA() { + this.duration = 'A'; + }, + goHome() { + router.replace({ uri: "/" }); + } +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000..5bfa218 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.css @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left: 0px; + top: 0px; + width: 454px; + height: 454px; +} + +.listItem { + width: 454px; + height: 80px; +} + +.titleContainerStyle { + width: 454px; + height: 70px; +} + +.titleTextStyle { + width: 454px; + height: 50px; + margin-left: 140px; + margin-top: 0px; +} + +.separatorContainerStyle { + width: 454px; + height: 4px; + background-color: #8b8b7a; +} + +.buttonContainerStyle { + width: 454px; + height: 80px; +} + +.buttonStyle { + width: 240px; + height: 60px; + margin-left: 110px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000..a7e03f6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.hml @@ -0,0 +1,208 @@ + + + + + + + UI手动测试 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.js new file mode 100755 index 0000000..a63c777 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/index/index.js @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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 { routePage } from "../../common/js/general"; + +export default { + changeSwiper: routePage("pages/swiper/SwiperA07/index").changePage, + changeMarquee: routePage("pages/marquee/marquee1/marquee1").changePage, + changeAsync: routePage("pages/async/async001/index").changePage, + changeDfx: routePage("pages/dfx/dfx1/index").changePage, + changeEvent: routePage("pages/event/click/index").changePage, + changeTimer: routePage("pages/timer/setTimeout01/index").changePage, + changeInput: routePage("pages/input/ButtonA30/index").changePage, + changeList: routePage("pages/list/list3/list3").changePage, + changeListItem: routePage("pages/list-item/item5/item5").changePage, + changeText: routePage("pages/text/text001/index").changePage, + changeTransition: routePage("pages/transition/01/index").changePage, + changeBase: routePage("pages/base/VersionCheck001/index").changePage, + changeSlider: routePage("pages/slider/index/index").changePage, + changeImageAnimator: routePage("pages/image-animator/01/index").changePage, + changeCamera: routePage("pages/camera/camera001/index").changePage, + changeFile: routePage("pages/file/file01/index").changePage, + changeDeviceInfo: routePage("pages/deviceInfo/index").changePage, + changeStorage: routePage("pages/storage/storage01/index").changePage, + changeVideo: routePage("pages/video/video001/index").changePage, + changeOpacity: routePage("pages/opacity/01/index").changePage, + changeQrcode: routePage("pages/qrcode/index/index").changePage, + changeResource: routePage("pages/resource/resource001/index").changePage, + changeDialog: routePage("pages/dialog/dialog001/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.css new file mode 100644 index 0000000..e68826f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.css @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height:600px; + flex-direction: column; +} + +.backColorBtn{ + width: 150px; + height:50px; + margin-left:100px; + margin-top: 10px; + background-color: aqua +} + +.backColorBtn:active{ +background-color: coral +} + +.backImgBtn{ + width: 150px; + height:50px; + margin-left:100px; + margin-top: 10px; + background-image: url(common/left.png) +} + +.backImgBtn:active{ +background-image: url(common/right.png) +} + +.bottom { + width:454px; + height:200px; +} +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top:10px; +} + +.page { + width:120px; + height:60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.hml new file mode 100644 index 0000000..b931036 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.hml @@ -0,0 +1,30 @@ + + +
+
+ backgroundColor + +
+
+ backgroundImg + +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.js new file mode 100644 index 0000000..db953d4 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/ButtonA30/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 {backPage, routePage} from "../../../common/js/general"; + +export default { + goHome:routePage("/").changePage, + goPrevious:routePage("pages/input/CheckboxA029/index").changePage, + goNext:routePage("pages/input/CheckboxImage31/index").changePage +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.css new file mode 100644 index 0000000..da01e72 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.css @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width:454px; + height:454px; + flex-direction: column; +} + +.checkbox{ + margin-left:100px; + margin-top:40px; + width:60px; + height:60px; + background-image:url(common/left.png) +} + +.checkbox:checked{ + background-image:url(common/right.png); +} + +.radio{ + margin-left:100px; + margin-top:40px; + width:60px; + height:60px; + background-image:url(common/left.png) +} + +.radio:checked{ + background-image:url(common/right.png); +} + +.bottom { + width:454px; + height:200px; +} +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top:10px; +} + +.page { + width:120px; + height:60px; + margin-left: 20px; + margin-top: 10px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.hml new file mode 100644 index 0000000..75e2e84 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.hml @@ -0,0 +1,23 @@ + + +
+ + +
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.js new file mode 100644 index 0000000..2aaf0d2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/input/CheckboxImage31/index.js @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2021 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 {routePage} from "../../../common/js/general"; + +export default{ + goPrevious:routePage("pages/input/ButtonA30/index").changePage, + goHome:routePage("/").changePage +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.css new file mode 100644 index 0000000..2b43894 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:240px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.hml new file mode 100755 index 0000000..e8e267d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.hml @@ -0,0 +1,34 @@ + + + + list-item5 + + + + + + item--{{$idx}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.js new file mode 100755 index 0000000..01f9d23 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list-item/item5/item5.js @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; + +export default { + data: { + listData: [] + }, + onInit() { + for (var i = 0; i < 100; i++) { + this.listData.push("common/left.png"); + this.listData.push("common/right.png"); + this.listData.push("common/music_prev.png"); + this.listData.push("common/music_next.png"); + this.listData.push("common/music_play.png"); + this.listData.push("common/goAhead.png"); + } + }, + backMain: backPage().backMain, + prePage: routePage("").changePage, + nextPage: routePage("").changePage, + scrollEnd(endState, endComponentIndex) { + console.log( + "list onscrollend is triggered, end component index=" + endComponentIndex + ); + }, + listClick() { + console.log("list onclick is triggered"); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.css new file mode 100644 index 0000000..6220000 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:250px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.hml new file mode 100755 index 0000000..c995dc5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.hml @@ -0,0 +1,46 @@ + + + + list3 + + + + + mytext0 + + + + + mytext1 + + + + + mytext2 + + + + + mytext3 + + + + + 单击list内部做页面跳转 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.js new file mode 100644 index 0000000..60704f4 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list3/list3.js @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + backMain:backPage().backMain, + prePage:routePage("").changePage, + nextPage:routePage("pages/list/list5/list5").changePage, + go:routePage("pages/list/list4/list4").changePage, + scrollEnd(endState, endComponentIndex) { + console.log("list onscrollend is triggered, end component index=" + endComponentIndex); + }, + onInit() { + console.log("on init called..."); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.css new file mode 100644 index 0000000..6220000 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:250px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.hml new file mode 100755 index 0000000..28c2685 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.hml @@ -0,0 +1,46 @@ + + + + list4 + + + + + mytext0 + + + + + mytext1 + + + + + mytext2 + + + + + mytext3 + + + + + 单击list内部做页面跳转 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.js new file mode 100644 index 0000000..73040d0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list4/list4.js @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + backMain:backPage().backMain, + prePage:routePage("pages/list/list2/list2").changePage, + nextPage:routePage("pages/list/list5/list5").changePage, + back:routePage("pages/list/list3/list3").changePage, + scrollEnd(endState, endComponentIndex) { + console.log("list onscrollend is triggered, end component index=" + endComponentIndex); + }, + onInit() { + console.log("on init called..."); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.css new file mode 100644 index 0000000..6220000 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:250px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.hml new file mode 100755 index 0000000..8f84671 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.hml @@ -0,0 +1,32 @@ + + + + list5 + + + + + {{$idx}}--{{$item}} + + + + + 单击list内部做页面跳转 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.js new file mode 100644 index 0000000..a0cd087 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list5/list5.js @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + listData: [ + "Item0", + "Item1", + "Item2", + "Item3" + ] + }, + prePage:routePage("pages/list/list3/list3").changePage, + backMain:backPage().backMain, + nextPage:routePage("pages/list/list7/list7").changePage, + go:routePage("pages/list/list6/list6").changePage, + scrollEnd(endState, endComponentIndex) { + }, + onInit() { + console.log("on init called..."); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.css new file mode 100644 index 0000000..6220000 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:250px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.hml new file mode 100755 index 0000000..cef8022 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.hml @@ -0,0 +1,32 @@ + + + + list6 + + + + + {{$idx}}--{{$item}} + + + + + 单击list内部做页面跳转 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.js new file mode 100644 index 0000000..deedfd0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list6/list6.js @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +import {addData} from "../../../common/js/list" +export default { + data: { + listData: [ + "Item0", + "Item1", + "Item2", + "Item3" + ] + }, + backMain:backPage().backMain, + prePage:routePage("pages/list/list3/list3").changePage, + nextPage:routePage("pages/list/list7/list7").changePage, + back:routePage("pages/list/list5/list5").changePage, + scrollEnd(endState, endComponentIndex) { + }, + onInit() { + console.log("on init called..."); + } +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.css new file mode 100644 index 0000000..6220000 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:250px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.hml new file mode 100755 index 0000000..79e2d7f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.hml @@ -0,0 +1,34 @@ + + + + list7 + + + + + + item--{{$idx}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.js new file mode 100644 index 0000000..8468d32 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list7/list7.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import { addData } from "../../../common/js/list"; +export default { + data: { + listData: [] + }, + onInit: addData, + backMain: backPage().backMain, + prePage: routePage("pages/list/list5/list5").changePage, + nextPage: routePage("pages/list/list8/list8").changePage, + listClick() { + console.log("list onclick is triggered"); + }, + scrollEnd(endState, endComponentIndex) { + console.log( + "list onscrollend is triggered, end component index=" + endComponentIndex + ); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.css new file mode 100644 index 0000000..6220000 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.itemStyle { + width:250px; + height:120px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.hml new file mode 100755 index 0000000..81b3d7c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.hml @@ -0,0 +1,34 @@ + + + + list8 + + + + + + item--{{$idx}} + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.js new file mode 100644 index 0000000..6ed4063 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/list/list8/list8.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import { addData } from "../../../common/js/list"; +export default { + data: { + listData: [] + }, + onInit: addData, + backMain: backPage().backMain, + prePage: routePage("pages/list/list7/list7").changePage, + nextPage: routePage("").changePage, + listClick() { + console.log("list onclick is triggered"); + }, + scrollEnd(endState, endComponentIndex) { + console.log( + "list onscrollend is triggered, end component index=" + endComponentIndex + ); + } +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.css new file mode 100644 index 0000000..b3657e3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.css @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2021 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. + */ +.textStyle { + color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.hml new file mode 100644 index 0000000..2c7f06e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.hml @@ -0,0 +1,48 @@ + + + + marquee1 + Hello JS, we are friends. + {{text}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.js new file mode 100644 index 0000000..7e7ac55 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee1/marquee1.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +export default { + data: { + text: "Hello JS, we are friends.", + speed: 1, + flag: true + }, + changeSpeed() { + if (this.flag) { + this.speed = 5; + this.flag = false; + } else { + this.speed = 50; + this.flag = true; + } + }, + backMain:backPage().backMain, + changeNext:routePage("pages/marquee/marquee2/marquee2").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.css new file mode 100644 index 0000000..b3657e3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.css @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2021 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. + */ +.textStyle { + color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.hml new file mode 100644 index 0000000..935d080 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.hml @@ -0,0 +1,47 @@ + + + + marquee2 + Hello JS, scrollamount is 65535. + {{text}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.js new file mode 100644 index 0000000..d66753d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee2/marquee2.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +export default { + data: { + text: "Hello JS, scrollamount is 65535." + }, + changePrev:routePage("pages/marquee/marquee1/marquee1").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/marquee/marquee3/marquee3").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.css new file mode 100644 index 0000000..b3657e3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.css @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2021 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. + */ +.textStyle { + color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.hml new file mode 100644 index 0000000..1ad74b3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.hml @@ -0,0 +1,47 @@ + + + + marquee3 + Hello JS, scrollamount is default value 6. + {{text}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.js new file mode 100644 index 0000000..eb60044 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee3/marquee3.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +export default { + data: { + text: "Hello JS, scrollamount is default value 6." + }, + changePrev:routePage("pages/marquee/marquee2/marquee2").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/marquee/marquee4/marquee4").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.css new file mode 100644 index 0000000..b3657e3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.css @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2021 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. + */ +.textStyle { + color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.hml new file mode 100644 index 0000000..30b3af2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.hml @@ -0,0 +1,47 @@ + + + + marquee4 + Scrollamount is 0. + {{text}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.js new file mode 100644 index 0000000..dfe77d7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee4/marquee4.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + text: "Scrollamount is 0." + }, + changePrev:routePage("pages/marquee/marquee3/marquee3").changePage , + backMain:backPage().backMain, + changeNext:routePage("pages/marquee/marquee5/marquee5").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.css new file mode 100644 index 0000000..b3657e3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.css @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2021 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. + */ +.textStyle { + color: #ff0000; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.hml new file mode 100644 index 0000000..ce15e84 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.hml @@ -0,0 +1,47 @@ + + + + marquee5 + Hello JS, scrollamount is 65536. + {{text}} + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.js new file mode 100644 index 0000000..bd89ad8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/marquee/marquee5/marquee5.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + text: "Hello JS, scrollamount is 65536." + }, + changePrev:routePage("pages/marquee/marquee4/marquee4").changePage , + backMain:backPage().backMain +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.css new file mode 100755 index 0000000..17ae082 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.css @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock1 { + width:100px; + height:100px; + background-color: #00ff80; +} + +.divBlock2 { + width:100px; + height:100px; + background-color: #00ff80; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; +} + +@keyframes opacityAnimation { + from { + width:100px; + opacity: 1.0; + } + to { + width:50px; + opacity: 0.1; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.hml new file mode 100755 index 0000000..8a3b91e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.hml @@ -0,0 +1,32 @@ + + +
+
+ Animation_Opacity_StyleSet_Test_01 +
+
+
+
+
+
+
+
+
+
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.js new file mode 100755 index 0000000..d01bf23 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/01/index.js @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + backMain:backPage().backMain, + changeNext:routePage('pages/opacity/02/index').changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.css new file mode 100755 index 0000000..76615a9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.css @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff55; +} + +.imageBlock { + width:120px; + height:120px; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.hml new file mode 100755 index 0000000..eea94e3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.hml @@ -0,0 +1,34 @@ + + +
+
+ Image_Opacity_StyleSet_Test_02 +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.js new file mode 100755 index 0000000..d2effe5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/02/index.js @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + backMain:backPage().backMain, + backPage:routePage('pages/opacity/01/index').changePage, + changeNext:routePage('pages/opacity/03/index').changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.css new file mode 100755 index 0000000..3866335 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.css @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; +} + +.textBlock { + border-width: 2px; + color: rgba(255, 0, 0, 0.5); + border-color: #6f00ff00; +} + +.textBackGroundColor { + background-color: rgba(250, 250, 250, 0.5); +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.hml new file mode 100755 index 0000000..86399b9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.hml @@ -0,0 +1,37 @@ + + +
+
+ Opacity_StyleSet_Test_02 +
+
+ normal +
+
+ div opacity +
+
+ dir&text opacity +
+
+ background opacity +
+
+ + + +
+
diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.js new file mode 100755 index 0000000..2e584a0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/opacity/03/index.js @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + backMain:backPage().backMain, + backPage:routePage('pages/opacity/02/index').changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.css new file mode 100755 index 0000000..2067d72 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.css @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 754px; + height: 754px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.hml new file mode 100755 index 0000000..6721153 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.hml @@ -0,0 +1,26 @@ + + + +
+ + + + + +
+ + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.js new file mode 100755 index 0000000..9aa4662 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/qrcode/index/index.js @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +export default { + data: { + top: 50, + left: 10, + width: 100, + height: 200, + borderWidth: 5, + qrValue: 'helloworld', + bgcolor: '#00ff00', + color: '#0000ff' + }, + clickAction:function(){ + console.log('trigger click'); + }, + swipeAction:function(){ + console.log('trigger swipe'); + }, + changeStyle:function(){ + this.top = this.top + 10; + this.left = this.left + 10; + this.borderWidth = this.borderWidth + 5; + this.bgcolor = '#0000ff'; + this.color = '#00ff00'; + this.width = 200; + console.log('qrcode top:' + this.top); + console.log('qrcode left:' + this.left); + console.log('qrcode borderWidth:' + this.borderWidth); + }, + changeValue:function(){ + this.qrValue = this.qrValue + 'qrcode'; + console.log('qrcode top:' + this.value); + }, + invalidColor:function(){ + console.log('invalidColor'); + this.bgcolor = 'invalid bgcolor'; + this.color = 'invalid color'; + }, + invalidSize:function(){ + console.log('invalidSize'); + this.width = 14; + this.height = 14; + }, + backMain:backPage().backMain +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.hml new file mode 100644 index 0000000..ad747ed --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.hml @@ -0,0 +1,38 @@ + + + + resource001 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.js new file mode 100644 index 0000000..4694fbd --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource001/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default{ + data: { + imgSrc: "./test.png" + }, + backMain:backPage().backMain, + changeNext:routePage("pages/resource/resource002/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.hml new file mode 100644 index 0000000..8999c4c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.hml @@ -0,0 +1,38 @@ + + + + resource002 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.js new file mode 100644 index 0000000..247199f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource002/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + imgSrc: "./abc/def/test.png" + }, + changePrev:routePage("pages/resource/resource001/index").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/resource/resource003/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.hml new file mode 100644 index 0000000..613b1d2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.hml @@ -0,0 +1,38 @@ + + + + resource003 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.js new file mode 100644 index 0000000..cadcaa0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource003/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + imgSrc: "./te#&st.png" + }, + changePrev:routePage("pages/resource/resource002/index").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/resource/resource004/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.hml new file mode 100644 index 0000000..b080bb5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.hml @@ -0,0 +1,38 @@ + + + + resource004 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.js new file mode 100644 index 0000000..011fcb3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource004/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + imgSrc: "./abc/testError.png" + }, + changePrev:routePage("pages/resource/resource003/index").changePage, + backMain:backPage().backMain, + changeNext:routePage("pages/resource/resource006/index").changePage +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.hml new file mode 100644 index 0000000..739836f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.hml @@ -0,0 +1,41 @@ + + + + resource006 + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.js new file mode 100644 index 0000000..6f1bb77 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/resource/resource006/index.js @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + imgSrc: "common/go#&Ahead/test.png" + }, + changePrev:routePage( "pages/resource/resource004/index").changePage, + backMain:backPage().backMain +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.css new file mode 100644 index 0000000..275ce72 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.css @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left: 0px; + top: 0px; + width: 454px; + height: 454px; + background-color:yellow; +} + +.showBox { + width: 200px; + top: 0px; + left: 0px; + height: 150px; + + border-width: 2px; + border-radius: 1px; + background-color: aliceblue; + border-width: 2px; + +} + +.outlineBox { + width: 454px; + top: 170px; + left: 0px; + height: 280px; + + border-width: 2px; + border-radius:1px; + background-color: aliceblue; + + flex-wrap: wrap; + justify-content:center; +} + + +.outlineBtn { + width:135px; + height: 30px; + font-size: 30px; + border-color: blueviolet +} + +.BordWidthTwo { + border-width: 5px; +} + +.BordWidthThree { + border-width: 8px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.hml new file mode 100644 index 0000000..7002752 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.hml @@ -0,0 +1,50 @@ + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.js new file mode 100644 index 0000000..085b724 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/index/index.js @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + top: 20, + left:150, + width:100, + height:100, + padding:2, + bordradius:2, + bordWidth:2, + bkgcor:0xD4F2E7, + bordColor:0x8A2BE2, + color:0xff0000, + colorIndex:0, + blockColor:0x00ff00, + blockColorIndex:0, + selectedColor:0x0000ff, + selectedColorIndex:0, + // bordWidth:'BordWidthOne', + // special 初始值 + min:0, + max:100, + value:50, + bkgcorlorIndex: 0, + bordColorIndex: 0, + bordWidthIndex:0, + colors:[0xFAEBD7,0xFFFF00,0xD4F2E7,0x8A2BE2,0x00FFFF, + 0x0000FF,0x00ff00,0xA52A2A,0xFF0000], + + bordWidths:[3,5,10,1,7,12,15], + }, + + onClickBtnTopAdd(){ + this.top += 5; + console.log("top:" + this.top); + }, + onClickBtnTopSub(){ + this.top -= 5; + console.log("top:" + this.top); + }, + onClickBtnLeftAdd(){ + this.left += 5; + console.log("left:" + this.left); + }, + onClickBtnLeftSub(){ + this.left -= 5; + console.log("left:" + this.left); + }, + onClickBtnWidthAdd(){ + this.width +=20; + console.log("width:" + this.width); + }, + onClickBtnWidthSub(){ + this.width -=20; + console.log("width:" + this.width); + }, + onClickBtnHeightAdd(){ + this.height +=20; + console.log("height:" + this.height); + }, + onClickBtnHeightSub(){ + this.height -=20; + console.log("height:" + this.height); + }, + onClickBtnPaddingAdd(){ + this.padding +=10; + console.log('pad:'+ this.padding); + }, + onClickBtnPaddingSub(){ + this.padding -=10; + console.log('pad:'+ this.padding); + }, + onClickBtnBoardRadiusAdd(){ + this.bordradius += 1; + console.log("bordradius:" + this.bordradius); + }, + onClickBtnBoardRadiusSub(){ + this.bordradius -= 1; + console.log("bordradius:" + this.bordradius); + }, + onClickBtnBoardWidthAdd(){ + if(this.bordWidthIndex >= this.bordWidths.length){ + this.bordWidthIndex = 0; + } + this.bordWidth = this.bordWidths[this.bordWidthIndex]; + this.bordWidthIndex += 1; + console.log("bordWidth:" + this.bordWidth); + }, + onClickBtnBKGColor(){ + if(this.bkgcorlorIndex >= this.colors.length){ + this.bkgcorlorIndex = 0; + } + this.bkgcor = this.colors[this.bkgcorlorIndex]; + console.log('index:'+this.bkgcorlorIndex + ' ' +'bkgcolor:'+ this.bkgcor); + this.bkgcorlorIndex += 1; + }, + onClickBtnColor(){ + if(this.colorIndex >= this.colors.length){ + this.colorIndex = 0; + } + this.color = this.colors[this.colorIndex]; + console.log('index:'+this.colorIndex + ' ' +'color:'+ this.color); + this.colorIndex += 1; + }, + onClickBtnSelectedColor(){ + if(this.selectedColorIndex >= this.colors.length){ + this.selectedColorIndex = 0; + } + this.selectedColor = this.colors[this.selectedColorIndex]; + console.log('selectedColorIndex:'+this.selectedColorIndex + ' ' +'selectedColor:'+ this.selectedColor); + this.selectedColorIndex += 1; + }, + onClickBtnBlockColor(){ + if(this.blockColorIndex >= this.colors.length){ + this.blockColorIndex = 0; + } + this.blockColor = this.colors[this.blockColorIndex]; + console.log('blockColorIndex:'+this.blockColorIndex + ' ' +'blockColor:'+ this.blockColor); + this.blockColorIndex += 1; + }, + onClickBtnNextPage:routePage('pages/slider/second/second').changePage + +} +/* */ \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.css new file mode 100644 index 0000000..1496a84 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.css @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + flex-direction: column; + justify-content: flex-start; + align-items: center; + left: 0px; + top: 0px; + width: 454px; + height: 454px; + background-color:yellow; +} + +.showBox { + width: 200px; + top: 0px; + left: 0px; + height: 150px; + + border-width: 2px; + border-radius: 1px; + background-color: aliceblue; + border-width: 2px; + +} + +.outlineBox { + width: 454px; + top: 170px; + left: 0px; + height: 280px; + + border-width: 2px; + border-radius:1px; + background-color: aliceblue; + + flex-wrap: wrap; + justify-content:center; +} + + +.outlineBtn { + width:135px; + height: 36px; + font-size: 30px; + border-color: blueviolet +} + +.BordWidthTwo { + border-width: 5px; +} + +.BordWidthThree { + border-width: 8px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.hml new file mode 100644 index 0000000..427e98a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.hml @@ -0,0 +1,39 @@ + + +
+ + +
+ + + + + + + + + + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.js new file mode 100644 index 0000000..a8a848f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/second/second.js @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + margin:0, + marginLeft:0, + marginRight:0, + marginTop:0, + marginBottom:0 + }, + + onClickBtnmargin(operator){ + if(operator == "+"){ + this.margin += 5; + }else if(operator == "-"){ + this.margin -= 5; + } + console.log("marginLeft:" + this.marginLeft); + console.log("margin:" + this.margin); + }, + onClickBtnmarginLeft(operator){ + if(operator == "+"){ + this.marginLeft += 5; + }else if(operator == "-"){ + this.marginLeft -= 5; + } + console.log("marginLeft:" + this.marginLeft); + }, + onClickBtnmarginRight(operator){ + if(operator == "+"){ + this.marginRight += 5; + }else if(operator == "-"){ + this.marginRight -= 5; + } + console.log("marginRight:" + this.marginRight); + }, + onClickBtnmarginTop(operator){ + if(operator == "+"){ + this.marginTop += 5; + }else if(operator == "-"){ + this.marginTop -= 5; + } + console.log("marginTop:" + this.marginTop); + }, + onClickBtnmarginBottom(operator){ + if(operator == "+"){ + this.marginBottom += 5; + }else if(operator == "-"){ + this.marginBottom -= 5; + } + console.log("marginBottom:" + this.marginBottom); + }, + onClickBtnNextPage:routePage('pages/slider/third/index').changePage + +} +/* */ \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.css new file mode 100644 index 0000000..c3a959d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.css @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2021 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. + */ +.sliderStyle { + left: 100px; + top: 100px; + color: #b22222; + height: 30px; + width: 250px; + selected-color: #00ff00; + border-radius: 10px; +} + +.verticalSliderStyle { + left: 200px; + top: 200px; + color: #b22222; + height: 250px; + width: 30px; + selected-color: #00ff00; + direction: column; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.hml new file mode 100755 index 0000000..af1a3cf --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.hml @@ -0,0 +1,43 @@ + + + + slider + + {{sliderValue}} + + {{verticalSliderValue}} + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.js new file mode 100644 index 0000000..5b2a71b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/slider/third/index.js @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage, lifeCycleFunc} from "../../../common/js/general"; + +export default { + data: { + sliderValue: 150, + verticalSliderValue: 200, + dynamicValue: 150 + }, + nextPage: routePage("pages/index/index").changePage, + clickSlider() { + console.log("onClick called..."); + this.sliderValue = "slider clicked"; + }, + + clickVerticalSlider() { + console.log("onClick called..."); + this.verticalSliderValue = "v slider clicked"; + }, + + valueChange(value) { + this.sliderValue = value.progress; + }, + + verticalValueChange(value) { + this.verticalSliderValue = value.progress; + this.dynamicValue = value.progress; + }, + ...lifeCycleFunc() +}; \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.hml new file mode 100755 index 0000000..3136e14 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.hml @@ -0,0 +1,50 @@ + + + + + + storage:{{status}} + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.js new file mode 100755 index 0000000..d7744bf --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage01/index.js @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import storage from "@system.storage"; + +export default { + data: { + status: "click set" + }, + backMain: backPage().backMain, + changeNext: routePage("pages/storage/storage02/index").changePage, + storageSet: function() { + this.status = "click get" + storage.set({ + key: "Storage1", + value: "Info1", + success: function() { + console.log("storageSet call success, key = Storage1, value = Info1"); + }, + fail: function(data, code) { + console.log("storageSet call fail, key = Storage1, value = Info1"); + }, + complete: function() { + console.log("storageSet call complete") + } + }) + }, + storageGet: function() { + var obj = this; + storage.get({ + key: "Storage1", + success: function(data) { + console.log("storageGet call success, key = Storage1, expected value = Info1"); + obj.status = JSON.stringify(data); + }, + fail: function(data, code) { + console.log("storageGet call fail, key = Storage1"); + }, + complete: function() { + console.log("storageGet call complete") + } + }) + } +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.hml new file mode 100755 index 0000000..3cdb84d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.hml @@ -0,0 +1,56 @@ + + + + + + storage:{{status}} + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.js new file mode 100755 index 0000000..46ceefa --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage02/index.js @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import storage from "@system.storage"; + +export default { + data: { + status: "click delete" + }, + backMain: backPage().backMain, + changePrev: routePage("pages/storage/storage01/index").changePage, + changeNext: routePage("pages/storage/storage03/index").changePage, + storageDelete: function() { + this.status = "click get"; + storage.delete({ + key: "Storage1", + success: function(data) { + console.log("storageDelete call success, key = Storage1"); + }, + fail: function(data, code) { + console.log("storageDelete call fail, key = Storage1"); + }, + complete: function() { + console.log("storageDelete call complete") + } + }) + }, + storageGet: function() { + var obj = this; + storage.get({ + key: "Storage1", + success: function(data) { + console.log("storageGet call success, key = Storage1, expected value = \"\""); + obj.status = JSON.stringify(data); + }, + fail: function(data, code) { + console.log("storageGet call fail, key = Storage1"); + }, + complete: function() { + console.log("storageGet call complete") + } + }) + } +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.hml new file mode 100755 index 0000000..f1c495d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.hml @@ -0,0 +1,68 @@ + + + + + + storage:{{status}} + + + + + + + + + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.js new file mode 100755 index 0000000..196a06b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/storage/storage03/index.js @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2021 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 { backPage, routePage } from "../../../common/js/general"; +import storage from "@system.storage"; + +export default { + data: { + status: "click set info1" + }, + backMain: backPage().backMain, + changePrev: routePage("pages/storage/storage02/index").changePage, + storageSet1: function() { + this.status = "click set info2"; + storage.set({ + key: "Storage2", + value: "Info2", + success: function() { + console.log("storageSet call success, key = Storage2, value = Info2"); + }, + fail: function(data, code) { + console.log("storageSet call fail, key = Storage2, value = Info2"); + }, + complete: function() { + console.log("storageSet call complete") + } + }) + }, + storageSet2: function() { + this.status = "click clear"; + storage.set({ + key: "Storage3", + value: "Info3", + success: function() { + console.log("storageSet call success, key = Storage3, value = Info3"); + }, + fail: function(data, code) { + console.log("storageSet call fail, key = Storage3, value = Info3"); + }, + complete: function() { + console.log("storageSet call complete") + } + }) + }, + storageClear: function() { + this.status = "click getInfo1 and getInfo2"; + storage.clear({ + success: function(data) { + console.log("storageClear call success"); + }, + fail: function(data, code) { + console.log("storageClear call fail"); + }, + complete: function() { + console.log("storageClear call complete") + } + }) + }, + storageGet1: function() { + var object = this; + storage.get({ + key: "Storage2", + success: function(data) { + console.log("storageGet call success, key = Storage2"); + object.status = JSON.stringify(data); + }, + fail: function(data, code) { + console.log("storageGet call fail, key = Storage2"); + }, + complete: function() { + console.log("storageGet call complete") + } + }) + }, + storageGet2: function() { + var object = this; + storage.get({ + key: "Storage3", + success: function(data) { + console.log("storageGet call success, key = Storage3"); + object.status = JSON.stringify(data); + }, + fail: function(data, code) { + console.log("storageGet call fail, key = Storage3"); + }, + complete: function() { + console.log("storageGet call complete") + } + }) + } +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.hml new file mode 100644 index 0000000..4833169 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.hml @@ -0,0 +1,51 @@ + + + + + + + 第{{index}}页，共2页 + + + attr007 + + + + + 第{{index}}页，共2页 + + + + + 第{{index}}页，共2页 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.js new file mode 100644 index 0000000..f9190ad --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA07/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +import {showPage} from "../../../common/js/swiper"; + +export default { + data: { + index: 0 + }, + showPage: showPage, + backMain:backPage().backMain, + changeNext:routePage("pages/swiper/SwiperA08/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.hml new file mode 100644 index 0000000..4c347db --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.hml @@ -0,0 +1,51 @@ + + + + + + + 第{{index}}页，共2页 + + + attr008 + + + + + 第{{index}}页，共2页 + + + + + 第{{index}}页，共2页 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.js new file mode 100644 index 0000000..0663234 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA08/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +import {showPage} from "../../../common/js/swiper"; + +export default { + data: { + index: 0 + }, + showPage: showPage, + backMain:backPage().backMain, + changePrev:routePage("pages/swiper/SwiperA07/index").changePage, + changeNext:routePage("pages/swiper/SwiperA09/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.hml new file mode 100644 index 0000000..1acfbf3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.hml @@ -0,0 +1,51 @@ + + + + + + + 第{{index}}页，共2页 + + + attr009 + + + + + 第{{index}}页，共2页 + + + + + 第{{index}}页，共2页 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.js new file mode 100644 index 0000000..9b029c0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA09/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +import {showPage} from "../../../common/js/swiper"; + +export default { + data: { + index: 0 + }, + showPage: showPage, + backMain:backPage().backMain, + changePrev:routePage("pages/swiper/SwiperA08/index").changePage, + changeNext:routePage("pages/swiper/SwiperA10/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.hml new file mode 100644 index 0000000..237334a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.hml @@ -0,0 +1,52 @@ + + + + + + + 第{{index}}页，共2页 + + + attr010 + + + + + 第{{index}}页，共2页 + + + + + 第{{index}}页，共2页 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.js new file mode 100644 index 0000000..c7cd450 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA10/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +import {showPage} from "../../../common/js/swiper"; + +export default { + data: { + index: 0 + }, + showPage: showPage, + backMain:backPage().backMain, + changePrev:routePage("pages/swiper/SwiperA09/index").changePage, + changeNext:routePage("pages/swiper/SwiperA11/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.hml new file mode 100644 index 0000000..c6a142a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.hml @@ -0,0 +1,51 @@ + + + + + + + 第{{index}}页，共2页 + + + attr011 + + + + + 第{{index}}页，共2页 + + + + + 第{{index}}页，共2页 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.js new file mode 100644 index 0000000..15c7864 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA11/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +import {showPage} from "../../../common/js/swiper"; + +export default { + data: { + index: 0 + }, + showPage: showPage, + backMain:backPage().backMain, + changePrev:routePage("pages/swiper/SwiperA10/index").changePage, + changeNext:routePage("pages/swiper/SwiperA12/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.css new file mode 100644 index 0000000..2e73d04 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 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. + */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.hml new file mode 100644 index 0000000..948ea1a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.hml @@ -0,0 +1,52 @@ + + + + + + + 第{{index}}页，共2页 + + + attr012 + + + + + 第{{index}}页，共2页 + + + + + 第{{index}}页，共2页 + + + + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.js new file mode 100644 index 0000000..eeb42cb --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA12/index.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; +import {showPage} from "../../../common/js/swiper"; + +export default { + data: { + index: 0, + duration: 1000 + }, + showPage: showPage, + updateDuration() { + this.duration = 500; + }, + backMain:backPage().backMain, + changePrev:routePage("pages/swiper/SwiperA11/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.css new file mode 100644 index 0000000..afb7e90 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.css @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + display: flex; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 454px; + height: 454px; + background-color:yellow; +} +.title { + font-size: 30px; + text-align: center; + width: 454px; + height: 50px; + top:0px; + border-width: 2px; + border-color: greenyellow; + color: red; +} + + +.showBox { + width: 454px; + top: 40px; + left: 0px; + height: 170px; + + border-width: 2px; + border-radius: 1px; + background-color: aliceblue; + +} + +.showBoxDiv { + width: 454px; + top: 40px; + left: 0px; + height: 170px; + justify-content: center; + align-items: center; + border-width: 2px; + border-radius: 1px; + background-color: aliceblue; + + flex-wrap: wrap; +} + +.outlineBox { + width: 454px; + top: 215px; + left: 0px; + height: 240px; + + border-width: 2px; + border-radius:1px; + background-color: aliceblue; + + flex-wrap: wrap; + justify-content:center; +} + +.specialBtn { + width:200px; + height: 36px; + font-size: 30px; + border-width: 1px; + border-color: blueviolet + +} +.outlineBtn { + width:135px; + height: 36px; + font-size: 30px; + border-width: 1px; + border-color: blueviolet +} + +.BordWidthOne { + border-width: 2px; +} + +.BordWidthTwo { + border-width: 5px; +} + +.BordWidthThree { + border-width: 8px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.hml new file mode 100644 index 0000000..55401ad --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.hml @@ -0,0 +1,57 @@ + + + + + text + +
+ + this is text + +
+
+ + + + + + + + +
+ + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.js new file mode 100644 index 0000000..7dd3d2d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text001/index.js @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + title: "Text", + top: 20, + left: 100, + width: 200, + height: 60, + padding: 2, + bordradius: 2, + bordwidth: 2, + bkgcor: 0xd4f2e7, + + margin: 2, + marginLeft: 2, + marginRight: 2, + marginTop: 2, + marginBottom: 2, + + bordColor: 0x8a2be2, + display: "flex", + bordWidth: "BordWidthOne", + // special init value + color: 0x8a2be2, + fontsize: 30, + letterspacing: 2, + textalign: "left", + textoverflow: "clip", + fontfamily: "HYQiHei-65S", + + bkgcorlorIndex: 0, + bordColorIndex: 0, + displayIndex: 0, + bordWidthIndex: 0, + // special Index + colorIndex: 0, + fontsizeIndex: 0, + textalignIndex: 0, + textoverflowIndex: 0, + fontfamilyIndex: 0, + + colors: [ + 0xfaebd7, + 0xffff00, + 0xd4f2e7, + 0x8a2be2, + 0x00ffff, + 0x0000ff, + 0x00ff00, + 0xa52a2a, + 0xff0000 + ], + + displays: ["flex", "none"], + + bordWidths: ["BordWidthOne", "BordWidthTwo", "BordWidthThree"], + + // special Array + + fontsizes: [38, 30], + textaligns: ["left", "center", "right"], + textoverflows: ["clip", "ellipsis"], + fontfamilys: ["HYQiHei-65S"] + }, + + /**************************** special **************************************/ + onClickBtncolor() { + if (this.colorIndex >= this.colors.length) { + this.colorIndex = 0; + } + this.color = this.colors[this.colorIndex]; + console.log("color:" + this.color); + + this.colorIndex += 1; + }, + onClickBtnFontsize() { + if (this.fontsizeIndex >= this.fontsizes.length) { + this.fontsizeIndex = 0; + } + this.fontsize = this.fontsizes[this.fontsizeIndex]; + console.log("fontsize:" + this.fontsize); + this.fontfamily = "HYQiHei-65S"; + this.fontsizeIndex += 1; + }, + onClickBtnLetterspacingAdd() { + this.letterspacing += 1; + }, + onClickBtnLetterspacingSub() { + this.letterspacing -= 1; + }, + onClickBtnTextalign() { + if (this.textalignIndex >= this.textaligns.length) { + this.textalignIndex = 0; + } + this.textalign = this.textaligns[this.textalignIndex]; + console.log("textalign:" + this.textalign); + this.textalignIndex += 1; + }, + onClickBtnTextoverflow() { + if (this.textoverflowIndex >= this.textoverflows.length) { + this.textoverflowIndex = 0; + } + this.textoverflow = this.textoverflows[this.textoverflowIndex]; + console.log("textoverflow:" + this.textoverflow); + this.textoverflowIndex += 1; + }, + onClickBtnFontfamily() { + if (this.fontfamilyIndex >= this.fontfamilys.length) { + this.fontfamilyIndex = 0; + } + this.fontfamily = this.fontfamilys[this.fontfamilyIndex]; + console.log("fontfamily:" + this.fontfamily); + this.fontfamilyIndex += 1; + }, + + + // ************************* pages ********************************* + backMain:backPage().backMain, + changeNext:routePage("pages/text/text002/index").changePage +}; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.css new file mode 100644 index 0000000..fbc549c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.css @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + display: flex; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 454px; + height: 454px; + background-color:yellow; +} +.title { + font-size: 30px; + text-align: center; + width: 454px; + height: 50px; + top:0px; + border-width: 2px; + border-color: greenyellow; + color: red; +} + + +.showBox { + width: 454px; + top: 40px; + left: 0px; + height: 170px; + + border-width: 2px; + border-radius: 1px; + background-color: aliceblue; + +} + +.showBoxDiv { + width: 454px; + top: 40px; + left: 0px; + height: 170px; + justify-content: center; + align-items: center; + border-width: 2px; + border-radius: 1px; + background-color: aliceblue; + + flex-wrap: wrap; +} + +.outlineBox { + width: 454px; + top: 215px; + left: 0px; + height: 240px; + + border-width: 2px; + border-radius:1px; + background-color: aliceblue; + + flex-wrap: wrap; + justify-content:center; +} + + +.outlineBtn { + width:135px; + height: 36px; + font-size: 30px; + border-color: blueviolet +} + +.divBordWidth { + border-width: 3px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.hml new file mode 100644 index 0000000..be29c7b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.hml @@ -0,0 +1,55 @@ + + + + + text + +
+ + this is text + +
+ +
+ + + + + + + + + + + + + + + + +
+ + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.js new file mode 100644 index 0000000..9060cc0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/text/text002/index.js @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + top: 20, + left:100, + width:200, + height:60, + padding:2, + bordradius:2, + bordwidth:2, + bkgcor: 0xD4F2E7, + margin:2, + marginLeft:2, + marginRight:2, + marginTop:2, + marginBottom:2, + bordColor:0x8A2BE2, + display:'flex', + color: 0x8a2be2, + + bkgcorlorIndex: 0, + bordColorIndex: 0, + displayIndex: 0, + + colors:[0xFAEBD7,0xFFFF00,0xD4F2E7,0x8A2BE2,0x00FFFF, + 0x0000FF,0x00ff00,0xA52A2A,0xFF0000], + displays:['flex','none'], + }, + + onClickBtnWidthAdd(){ + this.width +=20; + }, + onClickBtnWidthSub(){ + this.width -=20; + }, + onClickBtnHeightAdd(){ + this.height +=20; + }, + onClickBtnHeightSub(){ + this.height -=20; + }, + onClickBtnPaddingAdd(){ + this.padding +=10; + console.log('pad:'+ this.padding); + }, + onClickBtnBoardRadiusAdd(){ + this.bordradius += 1; + }, + onClickBtnPaddingSub(){ + this.padding -=10; + console.log('pad:'+ this.padding); + }, + onClickBtnBoardRadiusSub(){ + this.bordradius -= 1; + }, + onClickBtnBoardWidthAdd(e){ + this.bordwidth += 3; + console.log("border-width:"+ this.bordwidth); + }, + onClickBtnBoardWidthSub(e){ + this.bordwidth -= 3; + console.log("border-width:"+ this.bordwidth); + }, + onClickBtnBKGColor(){ + if(this.bkgcorlorIndex >= this.colors.length){ + this.bkgcorlorIndex = 0; + } + this.bkgcor = this.colors[this.bkgcorlorIndex]; + console.log('index:'+this.bkgcorlorIndex + ' ' +'bkgcolor:'+ this.bkgcor); + this.bkgcorlorIndex += 1; + }, + + onClickBtnMarginAdd(){ + console.log('margin:'+ this.margin); + this.margin += 2; + }, + onClickBtnMarginSub(){ + console.log('margin:'+ this.margin); + this.margin -=2; + }, + onClickBtnBoardColor(){ + if(this.bordColorIndex >= this.colors.length){ + this.bordColorIndex = 0; + } + this.bordColor = this.bkgcors[this.bordColorIndex]; + this.bordColorIndex += 1; + }, + + // ************************* pages ********************************* + backMain:backPage().backMain, + changePrev:routePage("pages/text/text001/index").changePage +} +/* */ diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.css new file mode 100644 index 0000000..7b01629 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 50px; + margin-left: 150px; +} + +.text { + width:200px; + height: 60px; + margin-left: 100px; + margin-top:10px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.hml new file mode 100644 index 0000000..667a184 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.hml @@ -0,0 +1,25 @@ + + +
+ + + {{value}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.js new file mode 100644 index 0000000..87f2971 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval08/index.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + clearSetTimeout:function() { + clearTimeout(1); + this.value = "clearSuccess"; + }, + clearSetInterval:function() { + clearInterval(1); + this.value = "intervalSuccess"; + }, + goHome:routePage("/").changePage, + goPrevious:routePage("/pages/timer/setInterval07/index").changePage, + goNext:routePage("pages/timer/clearInterval09/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.css new file mode 100644 index 0000000..23c435f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 50px; + margin-left: 150px; +} + +.text { + width:200px; + height:60px; + margin-left:100px; + margin-top:10px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.hml new file mode 100644 index 0000000..5056c5e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.hml @@ -0,0 +1,27 @@ + + +
+ + + + + {{value}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.js new file mode 100644 index 0000000..50fd15a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/clearInterval09/index.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + testMinTime:function() { + setTimeout(()=>{this.value = "min"},-2); + }, + testMaxTime:function() { + setTimeout(()=>{this.value = "max"},4294967297); + }, + testMinInterval:function() { + var id = setInterval(()=>{this.value = "min"; clearInterval(id);},-1); + }, + testMaxInterval:function() { + var id = setInterval(()=>{this.value = "max", clearInterval(id);},4294967295); + }, + goPrevious:routePage("pages/timer/clearInterval08/index").changePage, + goHome:routePage("/").changePage, + goNext:routePage("/pages/timer/timerLimit10/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.css new file mode 100644 index 0000000..6c9658e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.css @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 60px; + margin-left: 150px; + margin-top: 30px; +} + +.text { + width: 200px; + height:60px; + margin-left: 150px; + margin-top: 30px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml new file mode 100644 index 0000000..06b3a0f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml @@ -0,0 +1,24 @@ + + +
+ + {{show}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js new file mode 100644 index 0000000..d0881eb --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +var index = 0; +export default { + data:{show:"show", + index:0}, + startTimer:function() { + var id = setInterval(()=> { + if(index >5) { + this.show = "clearInterval"; + clearInterval(id); + } + index ++; + this.show = index; + }, 200); + }, + goPrevious:routePage("/pages/timer/setTimeout01/index").changePage, + goHome:routePage("/").changePage, + goNext:routePage("/pages/timer/setTimeout03/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.css new file mode 100644 index 0000000..93883ad --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 50px; + margin-left: 150px; +} + +.text { + width: 200px; + height:60px; + margin-left: 80px; + margin-top: 10px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.hml new file mode 100644 index 0000000..a2dc3a3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.hml @@ -0,0 +1,26 @@ + + +
+ + + + {{value}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.js new file mode 100644 index 0000000..ecd02ae --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval05/index.js @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + triggerOne:function() { + var id = setInterval((a)=>{ + this.value = a; + clearInterval(id); + }, 200, "one Arg"); + }, + triggerNo:function() { + var id = setInterval((a)=>{ + this.value = a; + clearInterval(id); + }, 200); + }, + tiggerTwo:function() { + var id = setInterval((a)=>{ + this.value = a; + clearInterval(id); + }, 200, "args1", "args2"); + }, + goHome:routePage("/").changePage, + goPrevious:routePage("pages/timer/setTimeout04/index").changePage, + goNext:routePage("pages/timer/setInterval06/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.css new file mode 100644 index 0000000..485bc9d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 50px; + margin-left: 150px; +} + +.text { + width: 200px; + height:60px; + margin-left: 100px; + margin-top:10px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.hml new file mode 100644 index 0000000..049e4e9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.hml @@ -0,0 +1,24 @@ + + +
+ + {{value}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.js new file mode 100644 index 0000000..434eafa --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval06/index.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + checkSetTimeout:function() { + var id = setTimeout( + ()=>{ + this.value = "trigger start"; + clearTimeout(id); + this.value = "trigger success"; + }, 200 + ); + }, + goHome:routePage("/").changePage, + goPrevious:routePage("/pages/timer/setInterval05/index").changePage, + goNext:routePage("/pages/timer/setInterval07/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.css new file mode 100644 index 0000000..641691f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 50px; + margin-left: 150px; +} + +.text { + width:200px; + height:60px; + margin-left: 80px; + margin-top:10px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.hml new file mode 100644 index 0000000..049e4e9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.hml @@ -0,0 +1,24 @@ + + +
+ + {{value}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.js new file mode 100644 index 0000000..0accc28 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval07/index.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + checkSetTimeout:function() { + var id = setInterval( + ()=>{ + this.value = "trigger start"; + clearInterval(id); + this.value = "trigger success"; + },200 + ); + }, + goHome:routePage("/").changePage, + goPrevious:routePage("/pages/timer/setInterval06/index").changePage, + goNext:routePage("/pages/timer/clearInterval08/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.css new file mode 100644 index 0000000..6c9658e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.css @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 60px; + margin-left: 150px; + margin-top: 30px; +} + +.text { + width: 200px; + height:60px; + margin-left: 150px; + margin-top: 30px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml new file mode 100644 index 0000000..671b2bf --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml @@ -0,0 +1,24 @@ + + +
+ + {{show}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js new file mode 100644 index 0000000..8227369 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{show:"show"}, + startTimer:function() { + setTimeout(()=> {this.show = "once_timer success"}, 1000); + }, + goPrevious:routePage("/").changePage, + goHome:routePage("/").changePage, + goNext:routePage("/pages/timer/setInterval02/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.css new file mode 100644 index 0000000..6c9658e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.css @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 60px; + margin-left: 150px; + margin-top: 30px; +} + +.text { + width: 200px; + height:60px; + margin-left: 150px; + margin-top: 30px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.hml new file mode 100644 index 0000000..2c7ad26 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.hml @@ -0,0 +1,24 @@ + + +
+ + {{value}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.js new file mode 100644 index 0000000..af423d7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout03/index.js @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + startTimer:function() { + var id = setTimeout(()=> { + clearTimeout(id); + this.value = "clearSuccess"; + }, 1000); + }, + goPrevious:routePage("/pages/timer/setTimeout01/index").changePage, + goHome:routePage("/").changePage, + goNext:routePage("/pages/timer/setTimeout04/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.css new file mode 100644 index 0000000..86a782f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width: 454px; + height: 454px; + flex-direction: column; +} + +.button { + width: 200px; + height: 50px; + margin-left: 150px; +} + +.text { + width:200px; + height:60px; + margin-left: 80px; + margin-top: 10px; +} + +.bottom { + margin-top: 20px; + width: 454px; + height:150px; +} + +.previous{ + width: 120px; + height: 60px; + margin-left: 50px; + margin-top: 10px; +} + +.page { + width:120px; + height: 60px; + margin-left: 20px; + margin-top: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.hml new file mode 100644 index 0000000..a2dc3a3 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.hml @@ -0,0 +1,26 @@ + + +
+ + + + {{value}} +
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.js new file mode 100644 index 0000000..9cda384 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout04/index.js @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + triggerOne:function() { + setTimeout((a)=>{ + this.value = a; + }, 200, "one Arg"); + }, + triggerNo:function() { + setTimeout((a)=>{ + this.value = a; + }, 200); + }, + tiggerTwo:function() { + setTimeout((a)=>{ + this.value = a; + }, 200, "args1", "args2"); + }, + goHome:routePage("/").changePage, + goPrevious:routePage("pages/timer/setTimeout03/index").changePage, + goNext:routePage("pages/timer/setInterval05/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.css new file mode 100644 index 0000000..542deea --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + width:454px; + height:454px; + flex-direction: column; +} + +.button { + width:200px; + height:60px; + margin-left: 100px; + margin-top: 20px; +} + +.text { + width:300px; + height:60px; + margin-left: 100px; + margin-top: 20px; +} + +.bottom { + width:454px; + height:200px; +} + +.previous { + width:120px; + height:60px; + margin-left: 80px; + margin-top:20px; +} + +.page { + width:120px; + height:60px; + margin-left: 10px; + margin-top:20px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.hml new file mode 100644 index 0000000..ea6fa8d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.hml @@ -0,0 +1,23 @@ + + +
+ + {{value}} +
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.js new file mode 100644 index 0000000..30939ab --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/timerLimit10/index.js @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data:{ + value:"show" + }, + startMaxTimer:function() { + setTimeout(()=>{ + this.value = "timer1"; + }, 4000); + setTimeout(()=>{ + this.value = "timer2"; + },4000); + setTimeout(()=>{ + this.value = "timer3"; + },4000); + setTimeout(()=>{ + this.value = "timer4"; + }, 4000); + }, + goHome:routePage("/").changePage, + goPrevious:routePage("/pages/timer/clearInterval09/index").changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.css new file mode 100644 index 0000000..b0ad1ec --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.css @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:120px; + background-color: #00ff7f; +} + +.divAnimationStyle { + animation-duration: 1000ms; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 500ms; + animation-iteration-count: 2; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +@keyframes animationTest { + from { + transform: translateX(-15px); + height: 100px; + width: 20px; + background-color: #00ced1; + } + to { + transform: translateX(200px); + height: 30px; + width: 100px; + background-color: #008000; + } +} + +@keyframes 76788 { + from { + height: 200px; + } + to { + height: 30px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.hml new file mode 100644 index 0000000..d76aa39 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.hml @@ -0,0 +1,31 @@ + + +
+
+ Component_animation_StyleSet_Test_001 +
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.js new file mode 100644 index 0000000..04e995f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/01/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName: "animationTest", + animationName2: 76788 + }, + changePrev:routePage('pages/index/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/0203/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.css new file mode 100644 index 0000000..116292c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.css @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:80px; + height:50px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle1 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 2s; + animation-iteration-count: 2; +} + +.divAnimationStyle2 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: 2; +} + +.divAnimationStyle3 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 00000; + animation-iteration-count: 2; +} + +.divAnimationStyle4 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 2; + animation-iteration-count: 2; +} + +@keyframes animationTest { + from { + height: 20px; + } + to { + height: 100px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.hml new file mode 100644 index 0000000..45222c9 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.hml @@ -0,0 +1,35 @@ + + +
+
+ Component_animation_StyleSet_Test_0203 +
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.js new file mode 100644 index 0000000..8c80fea --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0203/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName: "animationTest" + }, + changePrev:routePage('pages/transition/01/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/0405/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.css new file mode 100644 index 0000000..81d9f3a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.css @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:80px; + height:50px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle1 { + animation-duration: 2s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 500ms; + animation-iteration-count: 2; +} + +.divAnimationStyle2 { + animation-duration: 1000ms; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 500ms; + animation-iteration-count: 2; +} + +.divAnimationStyle3 { + animation-duration: -1; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 500ms; + animation-iteration-count: 2; +} + +.divAnimationStyle4 { + animation-duration: 1000; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 500ms; + animation-iteration-count: 2; +} + +.divAnimationStyle5 { + animation-duration: 2; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 500ms; + animation-iteration-count: 2; +} + +@keyframes animationTest { + from { + height: 20px; + } + to { + height: 100px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.hml new file mode 100644 index 0000000..5ef5f4c --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.hml @@ -0,0 +1,37 @@ + + +
+
+ Component_animation_StyleSet_Test_0405 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.js new file mode 100644 index 0000000..c6c6470 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0405/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName: "animationTest" + }, + changePrev:routePage('pages/transition/0203/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/0607/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.css new file mode 100644 index 0000000..4d4b4dc --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.css @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:80px; + height:50px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle1 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: 005; +} + +.divAnimationStyle2 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: infinite; +} + +.divAnimationStyle3 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: 2; +} + +.divAnimationStyle4 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: -1; +} + +@keyframes animationTest { + from { + height: 20px; + } + to { + height: 100px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.hml new file mode 100644 index 0000000..ac47edd --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.hml @@ -0,0 +1,35 @@ + + +
+
+ Component_animation_StyleSet_Test_0607 +
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.js new file mode 100644 index 0000000..b029213 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0607/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName: "animationTest" + }, + changePrev:routePage('pages/transition/0405/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/0809/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.css new file mode 100644 index 0000000..68484e7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.css @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:70px; + height:50px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle1 { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: infinite; +} + +.divAnimationStyle2 { + animation-duration: 3s; + animation-timing-function: ease-in; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: infinite; +} + +.divAnimationStyle3 { + animation-duration: 3s; + animation-timing-function: ease-out; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: infinite; +} + +.divAnimationStyle4 { + animation-duration: 3s; + animation-timing-function: ease-in-out; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: infinite; +} + +.divAnimationStyle5 { + animation-duration: 3s; + animation-timing-function: ease-in-out; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: infinite; +} + +.divAnimationStyle6 { + animation-duration: 3s; + animation-timing-function: ease-in-out; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: infinite; +} + +@keyframes animationTest { + from { + height: 20px; + } + to { + height: 200px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.hml new file mode 100644 index 0000000..a1787b1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.hml @@ -0,0 +1,39 @@ + + +
+
+ Component_animation_StyleSet_Test_0809 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.js new file mode 100644 index 0000000..699f65e --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/0809/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName: "animationTest" + }, + changePrev:routePage('pages/transition/0607/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/1011/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.css new file mode 100644 index 0000000..90777eb --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.css @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; +} + +@keyframes animationTest1 { + from { + transform: translateX(20); + } + to { + transform: translateX(200); + } +} + +@keyframes animationTest2 { + from { + transform: translateX(20px); + } + to { + transform: translateX(200px); + } +} + +@keyframes animationTest3 { + from { + transform: translateX(jhkhj); + } + to { + transform: translateX(jhkhj); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.hml new file mode 100644 index 0000000..69eebbd --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.hml @@ -0,0 +1,33 @@ + + +
+
+ Component_animation_StyleSet_Test_1011 +
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.js new file mode 100644 index 0000000..641fe5f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1011/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName1: "animationTest1", + animationName2: "animationTest2", + animationName3: "animationTest3", + }, + changePrev:routePage('pages/transition/0809/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/1213/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.css new file mode 100644 index 0000000..5ddb0af --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.css @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; +} + +@keyframes animationTest1 { + from { + transform: translateY(20); + } + to { + transform: translateY(200); + } +} + +@keyframes animationTest2 { + from { + transform: translateY(20px); + } + to { + transform: translateY(200px); + } +} + +@keyframes animationTest3 { + from { + transform: translateY(jhkhj); + } + to { + transform: translateY(jhkhj); + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.hml new file mode 100644 index 0000000..d467495 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.hml @@ -0,0 +1,33 @@ + + +
+
+ Component_animation_StyleSet_Test_1213 +
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.js new file mode 100644 index 0000000..8f9765a --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1213/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + animationName1: "animationTest1", + animationName2: "animationTest2", + animationName3: "animationTest3", + }, + changePrev:routePage('pages/transition/1011/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/1415/index').changePage +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.css new file mode 100644 index 0000000..f50227b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.css @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: 3; +} + +@keyframes animationTest1 { + from { + background-color: #d87093; + } + to { + background-color: #ff0000; + } +} + +@keyframes animationTest2 { + from { + background-color: "98988"; + } + to { + background-color: "908877"; + } +} + +@keyframes animationTest3 { + from { + background-color: #1f3ffffff8f; + } + to { + background-color: #-31ffffffbe; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.hml new file mode 100644 index 0000000..5d85cc2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.hml @@ -0,0 +1,33 @@ + + +
+
+ Component_animation_StyleSet_Test_1415 +
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.js new file mode 100644 index 0000000..7d480d2 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/1415/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName1: "animationTest1", + animationName2: "animationTest2", + animationName3: "animationTest3", + }, + changePrev:routePage('pages/transition/1213/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/16/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.css new file mode 100644 index 0000000..321a767 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.css @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; + animation-iteration-count: 3; +} + +@keyframes animationTest1 { + from { + opacity: 20; + } + to { + opacity: 255; + } +} + +@keyframes animationTest2 { + from { + opacity: 0.1; + } + to { + opacity: 1; + } +} + +@keyframes animationTest3 { + from { + opacity: "dd"; + } + to { + opacity: "255"; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.hml new file mode 100644 index 0000000..716439d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.hml @@ -0,0 +1,33 @@ + + +
+
+ Component_animation_StyleSet_Test_016 +
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.js new file mode 100644 index 0000000..6cacd32 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/16/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName1: "animationTest1", + animationName2: "animationTest2", + animationName3: "animationTest3", + }, + changePrev:routePage('pages/transition/1415/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/17/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.css new file mode 100644 index 0000000..47332c5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.css @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; +} + +@keyframes animationTest1 { + from { + width:100px; + } + to { + width:50px; + } +} + +@keyframes animationTest2 { + from { + width:100px; + } + to { + width:40px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.hml new file mode 100644 index 0000000..9537c00 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.hml @@ -0,0 +1,31 @@ + + +
+
+ Component_animation_StyleSet_Test_017 +
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.js new file mode 100644 index 0000000..e423ac0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/17/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName1: "animationTest1", + animationName2: "animationTest2", + }, + changePrev:routePage('pages/transition/16/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/18/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.css new file mode 100644 index 0000000..c946390 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.css @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; + } + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; +} + +@keyframes animationTest1 { + from { + height:200px; + } + to { + height:50px; + } +} + +@keyframes animationTest2 { + from { + height:100px; + } + to { + height:40px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.hml new file mode 100644 index 0000000..60ef668 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.hml @@ -0,0 +1,31 @@ + + +
+
+ Component_animation_StyleSet_Test_018 +
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.js new file mode 100644 index 0000000..400dbc6 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/18/index.js @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName1: "animationTest1", + animationName2: "animationTest2", + }, + changePrev:routePage('pages/transition/17/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/19/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.css new file mode 100644 index 0000000..88f1cf1 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.css @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; +} + +@keyframes animationTest1 { + from { + transform: translate(20); + } + to { + transform: translate(200); + } +} + +@keyframes animationTest2 { + from { + transform: translateX(20); + aaa:"aa"; + } + to { + transform: translateX(200); + aaa:"aab"; + } +} + +@keyframes animationTest3 { + from { + transform: translateX(200); + aaa:"aa"; + } + to { + transform: translateX(20); + aaa:"aab"; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.hml new file mode 100644 index 0000000..3c83de5 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.hml @@ -0,0 +1,33 @@ + + +
+
+ Component_animation_StyleSet_Test_019 +
+
+
+
+
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.js new file mode 100644 index 0000000..c8d8e57 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/19/index.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName1: "animationTest1", + animationName2: "animationTest2", + animationName3: "animationTest3", + }, + changePrev:routePage('pages/transition/18/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/20/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.css new file mode 100644 index 0000000..be346b8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.css @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divBlock { + width:100px; + height:100px; + background-color: #00ff7f; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +.divAnimationStyle { + animation-duration: 3s; + animation-timing-function: linear; + animation-fill-mode: none; + animation-delay: 1000ms; +} + +@keyframes animationTest1 { + from { + rotate: "270deg"; + } + to { + rotate: "-10deg"; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.hml new file mode 100644 index 0000000..893c238 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.hml @@ -0,0 +1,28 @@ + + +
+
+ Component_animation_StyleSet_Test_020 +
+
+ +
+
+ + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.js new file mode 100644 index 0000000..624c2f4 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/20/index.js @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + + export default { + data: { + animationName1: "animationTest1", + }, + changePrev:routePage('pages/transition/19/index').changePage, + backMain:backPage().backMain, + changeNext:routePage('pages/transition/21/index').changePage + } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.css new file mode 100644 index 0000000..6684dbe --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.css @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021 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. + */ +.container { + left:0px; + top:0px; + width:454px; + height:454px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 227px; + border-width: 2px; + border-color: #00ff00; +} + +.divFrame { + width:454px; + height:50px; + justify-content:center; + align-items:center; +} + +@keyframes rotate1{ + from { + transform: rotate(0deg); + } + to { + transform: rotate(90deg); + } +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.hml new file mode 100644 index 0000000..3dd45b8 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.hml @@ -0,0 +1,31 @@ + +
+
+ Component_animation_StyleSet_Test_021 +
+
+ +
+ click to trigger if +
+
+
+ + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.js new file mode 100644 index 0000000..1301ec0 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/transition/21/index.js @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + title: 'World', + animationName:'rotate1', + index:1, + ifFlag:true + }, + clickAction(){ + if(this.index > 4){ + this.index = 1; + } + console.log(this.index); + this.animationName = "rotate"+this.index; + this.index++; + }, + changeIf() { + this.ifFlag = this.ifFlag == true ? false : true; + }, + changePrev:routePage('pages/transition/20/index').changePage, + backMain:backPage().backMain +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.css new file mode 100755 index 0000000..83bd42f --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.css @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2021 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. + */ +.specialVideo { +margin-left:1px; +margin-top:1px; +width:900px; +height:380px; +} + +.specialImage { + height:50px; + width:50px; +} + +.specialSlider { + color: #b22222; + height: 30px; + width: 150px; + selected-color: #00ff00; + border-radius: 10px; +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.hml new file mode 100755 index 0000000..a7ea1c7 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.hml @@ -0,0 +1,33 @@ + + +
+ + +
+ + + + + + + + + +
+
\ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.js new file mode 100755 index 0000000..d7abd5b --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/video/video001/index.js @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2021 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 {backPage,routePage} from "../../../common/js/general"; + +export default { + data: { + photoUri: "", + videoSrc:"/sdcard/video/test_720p_no_audio.LRV", + showControls: true, + startTime:"00:00", + endTime:"00:00", + index : 1, + }, + startPlayVideo: function () { + console.log("JS::startPlayVideo called!"); + var video = this.$refs.vid; + video.start(); + }, + stopPlayVideo: function () { + console.log("JS::pausePlayVideo called!"); + var video = this.$refs.vid; + video.pause(); + }, + setCurrentTime: function (val) { + console.log("JS::setCurrentTime called!"); + var video = this.$refs.vid; + video.setCurrentTime(10); + }, + + playNext: function () { + console.log("JS::playNext video!"); + if (this.index % 2 == 0) { + console.log("click change to play image startPlayVideo called!"); + this.videoSrc = "/sdcard/video/test_720p_no_audio.LRV"; + } else { + console.log("click change to stop image stopPlayVideo called!"); + this.videoSrc = "/sdcard/video/test.mp4"; + } + this.index ++; + }, + + valueChange(value) { + var video = this.$refs.vid; + video.setCurrentTime(value.progress); + this.startTime = value.progress; + }, + + preparedfn: function() { + console.log('js video preparedfn called'); + }, + + startfunc: function() { + console.log('js video startfunc called'); + }, + + pausefn: function() { + console.log('js video pausefn called'); + }, + + finishfn: function() { + console.log('js video finishfn called'); + }, + + error: function () { + console.log('onerror called'); + }, + + seekingfn: function(e) { + console.log('js video seeking called:' + e.currenttime); + }, + seekedfn: function(e) { + console.log('js video seeked called' + e.currenttime); + }, + timeupdatefn: function(e) { + console.log('js video timeUpdate called' + e.currenttime); + }, + +// ************************* pages ********************************* + backMain:backPage().backMain + +} diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/res/drawable/icon.png b/test/moduletest/common/test_app/ui_manual_test/src/main/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6ebbe6521fa8f6b75d263cf9a6858529fc86fa87 GIT binary patch literal 10591 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 literal 0 HcmV?d00001 diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/res/drawable/icon_small.png b/test/moduletest/common/test_app/ui_manual_test/src/main/res/drawable/icon_small.png new file mode 100644 index 0000000000000000000000000000000000000000..c69db787b2744937e1d88b67c8c1349bce9e5f3d GIT binary patch literal 6371 zcmV<97#!z`P)Py2ok>JNRCodHTnUgJ)pfo9&nnG~q>&g#h*cIKR%5^*$(Vf$!l(?P5=f|!N({yr zLNE@t0NXK+gK>f(K!unrRe@qN22#ZAi-mxI2u29ANgz3ZK+;HJG#brl*8g+P>ppK@ z_wSxf;Ho%!Q*Z8l_ub{Z+poJ{FTc&kQ_3i%QmNeE-(T+O=_z-0b-gM-1u;}YvBAN? zL>(9yu&Gn07MxW^{R^t;QJ$)cwN4S?U7+e> z(dZHV4?2&1eSO5{glS4A_4W1UJgRfv8^3U#emUy|n|A5tj^A|SbvAM0L@Tm|0W4EE zwizxeWv5hER~HS2!jC`x*oSAh2@@u`T3cId1r+CzicA3%7LcbB!#Ph-qHNS9p$(5d zJQEMEzTbsL|12t{x5}nXo5~95ES%D&cA9RDjg3(rX?^7`2fNPjAC;I>77u9S#*JleI&MmaW5PKZs;a7-j^8rV zrcEo*b4^W+Q=%s+g;8>OW(D<@c+d-T72^&MQHn601^!*O!MjS>s%hEe$&(X4{7_;C z+_LY|XmGIK?D6BQw05!EHXJ6MUj2Hfo%#GGCu5tr+OT0maz@A*73i$$(Id?25SSaI zP=)TIZ8`iGcEWRARQ2WLsU^E;X0;1MyPbC0DcXE!+#&>|y(c^aAK1S!ldQ;E?`M$r z2Ij)ui%#x9R57smUHW}FWG9gx)_9>)(7#0p^x~aYsA=WuDqDNd_uba!wBS}}aXG|h zzlIJ~4}ax8ZzzU+VJQp@+O#|G@jG?JM5J;@M+X2#2$ywjv^8utZkG;f{w9_9r$u1uWcZL`3JT)a9@=G&&(qxg157zZ3s48V z@5iopJI(}$k84nHatf*|$R&>&?o`*?+gskcb!(Z&r##0M8--q^OjgrHdr`Qt(7$5R zq)D@-PnvL;c19Hwn*sEy!t&WK6kdCI&ya0qIUabTc39h z#H~0$>?&K25C(3jbXI)y3ud)!^59Ty-SZx^kG2llIse@)JL|#Ze)@|IeqU~FZFRmJ zLipN1O${e=At*(?_BZ zjsVbZ{rdGi5LF4G&k2FAnk|Awgi0fPq%76&tQ zMm}^#r6)G8AxV^-zIBy9xW-4JrBsl^o9RfyO<1Baxfn%H$dN1^&SH89`<+9a)h}j_ zSm=15mm6%ToYy?dHl2IUkbvCB?LK$RpNezH1{{7>Lx28&1y<1S+ihTv-L2=|I~_uz3lFkxE6aO(dwU0*PSO@-00p6;s&g zN5}?t^2s1~%aNREYsR^9j$>z<B`mKuCeg+O=!l!jgtUB!r+#;ApONx6?6a0F&Tw z)D5VvVB7ID?oT~DG_dmOhNmH3b)nug=0GsW-NtEWK*AG5gXCz7^+!?4!YYMOCLVoX zZE9+|RXTZeSb%VL6bzq98#4$CXFZF8iiWa~&*|ShWy%!pO_?PZAe;@Q2&QU=G~~65 zDhm6uD*Hn_=|FrpE?3T$y=VnM7@UI6howO3ovgauiYsoxK^2+f($bw2(O;^z-XotF z(u2+Yt9$I`Rej)wLiF_YTM57yAKm121y);wSBs3Pl4wAg3$-Qelp%Q##j)0QKskr97e|7r9fn(H(bv1U|2gqjNpK;Y*vu4fT zQ;)?1gaVhmi4lcH{ri6}$`)1#5ip!md0KVL6rAlqah;IJyo-?WZ(y)wm(GNKJWmCT z?f5ivnaq4Dp>#j$=~QBoak_0=R$2X9-?qXamWU1Qq3NR-I4!wL9fBiIiu0ty=2sQ~*Chi{`mf+8?qS!?_>Mi_)n>iOc$CkA zojrA?of>bZ8Mtg+y!79#s;!N8jxdR_p1W1TCJF?YJb?jX;e7$5oUM<6Wcs`s~ucVtzjEEF=y={+c9KIE_>#G%h@LB(5@X zg+_3^l;QO;*K}ys{Lf8R?*7OJ`@QF|?&KwDP>L8xLtU-?)2d#3r*pvd$UkYkvn6i1 zP$>Zr?FXGD{)NWn-gaynfWz&LXsQqxO$joh^{<`hY_{UILSMA_ma7D9z+Htudu40V ze=sd@SAnNaUpznnN?Z~VAPZ@sZ82^ppzS6EL4hGy(ikA;7Rz%Rc*AJ8;+%MZ(hTAy zvKa2g?%@R$1LcSxM9>tV2rYxffI(@uIof)Pn@NlCRS^T4v20ps`F>}WQ5|A@;%aJ*E&%IHkldVq2+Dg}+K_lu9xMO5Q?hX-^qP`Zf#?mEG{ zl#2wNJ+Wj*<0euFj(l(pL!LKLUGd)11_DMc*H@^u?zxZJKnvHVF);2V+?xS-%YHXF zy+bAyY@bFBBv~3@@(=r%{oOu8x80N;y3k!(-=p)>VM+I&v-jn#3w&nI=e>XNN<_w(dUfWN2IDu03*hc+`;8^^&;1ZnzZdw)v3;848e8>jk3_GRNzeRhVXvGgc zuqoHwnCcm7b}Ts6x{sLWb_jtJ6-eCax(?Sf-=vkFgKQ9#XqrFrwFid<=M3?$=G|3d zGwI|9AF}GU^@+@do0%Zd_Gh#Z;L@zDQPwelhpEw1@XVkRhW3(W(H*{fbz-j#Ge{m8 zTr4{e5S#W&1t4Wn`|0-8(jS(}ZdfIB7BET!d5q=Gk?LO|k4QEv{-J-}F)cupe4LmOLcu)p%Iz4}E7uy3!u)Xb;QW9DK&{tOb& zzl%e|1VFqUFjrZllK4I98lzjl!zA(hEeANigZa+|qqrR%)^ovmnHj{+u`E&=`kw$u zF+e>KQxA|pAK!nzd!3;?Sh-x;zq-+mXlT)*)7JdpyL2=ZMO+77^4onkD<5}E#T?|G zjQTmLiu&WA1f;nA3rs_+8S$il_1+SDp%c$PQ0njq?8e>Z*zEeriNUasn`_EH-fDHP zEM*g~;#FJERST`W@9c`~IR!jF2EdBv$C&^DqzP}?ZKh%RoJ^Sj=k;gpnc5N5M@m^- zRsh^=H9}gkiP;Hd-sV4qK;pIsC2*on0so|{z-b`x={Kvu#p&-y$t#(gI8;XPCfq>hr1V*2f4V(f=9Dqf*#F%CSMh{B zj7>f_gHnW(&K-8xf$w}jKu|0pIA%iNLSESuC{p&vWjF96f}^gtkmX1eZ~VLnfO7;k z1Q&u4z>ose0@VK;DMr{oVg^HH@_1Z7m+umz%m<*QX;5m%z)NUfhgyp^ZN>yH9eaCw zdj_^=;Qw9*#(Wgq)*<5P$-5pWpz`|vIMjns-AxxzS9F98+meaKeY^nW3i4^3bf3aA zgC}ty8+lzV$DaWG)DwsS^Oo(EsB_YInG6iruRhoxCP+MK$jgQ@@$wz$Ey0=Lhq%!C zRL=~bcmgqiT``y&P|whyvZw~izAS#UveDWj(R`caFLBNFK^C6z%07_#12klhW)TNEN*TOSi&AyQ@3WlRY~K<=t9qgFh5Pe&9uQTC6-XZ2^v zN93UV$G2e|{{x_NcFw;QV~V;FiiwoBD&>Fcr^lSYm~@Zm>evdr=po zxk}wQG}zL_J#Aq2C03sDS*Pdi(ITI2zq)C_e)4vgt?cHTiqQiQ+z7=h#__KJV<@{% zEZQY|)!SiH{H>`9U-Ye6oQm@R9;pwzk|5Z46b^UhKR8XiViYQc0VQ{`_wTdfo7Y96 zBG$TkM&zDCDkP}C|3O(K@7r^s4erSGb>%Mq#JWEF(TZNL>y(E1*N=Cg`}%QH9j?Ez zSDk%%ry8HY5PKdE*UON^iaV)c$Ov^P33xbu5zUGPFjew`7JhY^71qCiXN;HzMN~%c ziE|Cec;rxM(m)Q~ftF*fZ_mpij|yY`?eZRbs;%;tvvh`|E|GYeFsHf7etbZ^!=A<; z&O-7$G?1b!!7oB{e^r)y3`77vqNqq71BaD?e7o)WD0xgA_ZkNPA($}76Oij*Cu-2A z-zwm4aP`J#thj!WzbE=y$Kbe=hagsiyM48|Exx3E(C+^*`5FbWv-mNft>Y>w>YR1! z)+HX-ID`0KW&+`i&$z!HDuw|_|xN|hLH3GtGP zDv;~1$9me0pGlzx-N%V@GmlO7X%>>FVyuJN7xjbUfuLdz27`g}xC^}6Ongj)<6)uy zaBSgN)GrKZyPQxS7WzyS81Pl3gVWBa6gaEk*HCu?t$6Ty&MwiH7t&*)f6BsyQpQ;u-&a2vZ`vP4Sy(C(h|c5F z$y2a2rK50bvcGTM9X8l}Bzoe+#k-_Sl$(7_R$Mjnd?Jxpmtef9f=_tJcMadd+QxEN zk40{w=fmhT z4W-`LH)kRS!rd6jEY;1hQq5EsGxQbuZ$lFKD?sry zlAUOtPs;O>rsR=g2Kv{ZXv2~<1NqAZADq03fMihypqy2FXvc3)m3Vwam0q$xY0uqP ze&my~mfC{tP!s8nWFPjEmmkHae;(ghNZC%;RDZ?ouZjf1*E#}aNe6Vo_#gXNLMmXA z{TlC_-LUR0dvoii*lKj-@e9wNc=C$~^CJ$qy=QPi> zKc70w4XSp@OV)VTy<>9_YUA+He#V!rcV2W|pafDyypk2l#4FL*h0n+PcmGVeO2rK1 z503EKC8wZ&&=V$zhFQCpbS_`{f<4>40oE1UMlnZ4H}V~56z8|AdsH^LN;rHp-}fKZ z^Xf9|yy$CAEliwdSe}dq=qus%yPv0H=(OnNaMppw^-2h7x-y_-G}JEtUma^~5x+yT zjme|WFg{uoZCk-Hu726;HevB|{^!9=7?&p@4SDuyW`e&Se0v&1MFOdSOfSR$HYhQa zDPbX%oRqpN@oRD@vboKL^H=dd8IN#SC|m8@%U#0KiDFxoNmKGjaoc|b`W9vlDl>s_ z&=12?X%HqXI^vTMW#cWgY8#y?V-8LoTH1`)pYb(J+>t5Gn2|fPRwRYvgnMsqJxZ^S({3B{)QLmZRDH%T9$KTk$ zg?2-jEcR<~;??fK-IQxqziLl*e8?`hq^ZJJBYDN)KIrNqV;19*qJ-~AdqTes{W43V*;Acco`oA#O`Y*sE4s1v! ziOI>TN}w~s?_WXph295oJC_Wh%~cudz^k=)q2(T)b3m*Fqrpigi?F{7Um;!D(`g$9 zdT`-ZuxZt`HmkM?mtWCGLPMJ@p0dn=BVpAathOq=fej>9Zf>>`UUn|v1FqCp(r7O} z^pi>))kgL1Cly)7lt3Eb3tqEOpGR`sK}pGDAB&Pmkl`+`zL4heO1$i|2CQVzhj=AS zGSNJH_6KDh_#>dZGLVhPjyZwyh%crbg#|ZX+;QL2qdYH}vI+aM_)tchaNy#@WJyM< znIt~!3wh}Y6DZbRb{cdR2eMJK<4&L=;75Y9@H@PRF?j!F7xgJ2Y07@dLS4$j!IIa2 zLz<@}{jfi@Q>>V-0Od(yOfxR!W9++d+CkWkA4vZMiD-~qiAq!UOD5g)z{7T$XJRO0 z5kH(x9D^r^Z$R(XxV_C}n`dAi0^I)QLzruD9ODa=K3Pl}2TCel1J6rD*iT=1dX$I# zt`WU}xez{vU5>=MV

k1{aMsg>wZ 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 Yo~P^n`TQ(g!GFeDOdNH_e9p%I1N62S%m4rY literal 0 HcmV?d00001 diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn new file mode 100755 index 0000000..babc045 --- /dev/null +++ b/frameworks/BUILD.gn @@ -0,0 +1,87 @@ +#Copyright (c) 2020-2021 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("//build/lite/config/component/lite_component.gni") +import("//build/lite/config/subsystem/aafwk/config.gni") +import("//foundation/ace/ace_engine_lite/ace_lite.gni") + +declare_args() { + LOSCFG_TEST_JS_BUILD = false +} + +lite_component("jsfwk") { + features = [ ":ace_lite" ] +} + +config("ace_lite_config") { + include_dirs = ace_lite_include_dirs + if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "liteos_m") { + include_dirs += [ "targets/liteos_a" ] + } else if (ohos_kernel_type == "linux") { + include_dirs += [ "targets/linux" ] + } + cflags_cc = [ "-std=c++14" ] + ldflags = [ "-lstdc++" ] + ldflags += [ "-lpthread" ] + ldflags += [ "-Wl,-rpath-link=$ohos_root_path/$root_out_dir" ] +} + +shared_library("ace_lite") { + configs -= [ "//build/lite/config:language_cpp" ] + cflags = [ + "-Wall", + "-Wno-format", + "-Wno-format-extra-args", + ] + cflags_cc = cflags + configs += [ ":ace_lite_config" ] + public_configs = configs + + sources = ace_lite_sources + + public_deps = [ + "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/js/builtin:capability_api", + "//base/global/i18n_lite/frameworks/i18n:global_i18n", + "//base/global/resmgr_lite/frameworks/resmgr_lite:global_resmgr", + "//base/security/huks/frameworks/crypto_lite/js/builtin:ace_kit_cipher", + "//build/lite/config/component/cJSON:cjson_shared", + "//foundation/graphic/surface:lite_surface", + "//foundation/graphic/ui:lite_ui", + "//foundation/multimedia/camera_lite/frameworks:camera_lite", + "//foundation/multimedia/media_lite/frameworks/player_lite:player_lite", + "//foundation/multimedia/media_lite/interfaces/kits/player_lite/js/builtin:audio_lite_api", + "//third_party/bounds_checking_function:libsec_shared", + "//third_party/jerryscript/jerry-core:jerry-core_shared", + "//third_party/jerryscript/jerry-ext:jerry-ext_shared", + "//third_party/jerryscript/jerry-libm:jerry-libm_shared", + "//third_party/jerryscript/jerry-port/default:jerry-port-default_shared", + "//utils/native/lite/js/builtin:ace_utils_kits", + "//utils/native/lite/timer_task:ace_kit_timer", + ] + + defines = [] + + if (ohos_build_type == "debug") { + defines += [ "JS_PROFILER=1" ] + } else { + defines += [ "JS_PROFILER=0" ] + } + + if (LOSCFG_TEST_JS_BUILD) { + defines += [ "JSFWK_TEST" ] + } + + if (enable_ohos_appexecfwk_feature_ability == true) { + defines += [ "ABILITY_WINDOW_SUPPORT" ] + } +} diff --git a/CMakeLists.txt b/frameworks/CMakeLists.txt similarity index 90% rename from CMakeLists.txt rename to frameworks/CMakeLists.txt index ada23aa..69ac460 100755 --- a/CMakeLists.txt +++ b/frameworks/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Huawei Device Co., Ltd. +# Copyright (c) 2020-2021 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 @@ -23,19 +23,19 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) add_compile_options(-fpermissive -Wno-narrowing) set(ACE_LITE_CONFIG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/targets/simulator") -set(ACE_LITE_INNERKITS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/innerkits/builtin") +set(ACE_LITE_INNERKITS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/innerkits/builtin") set(JSFWK_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include") -set(JSFWK_INNERKITS_BUILTIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/ace/interfaces/innerkits/builtin") +set(JSFWK_INNERKITS_BUILTIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/ace/ace_engine_lite/interfaces/innerkits/builtin") set(JSFWK_SOURCE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/core") -set(UIKIT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/graphic/lite") +set(UIKIT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/graphic/ui") set(THIRTY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../third_party") set(JSFWK_SIMULATOR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../tools/developer_tools_lite/graphic_tool/simulator") -set(AAFWK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../aafwk") +set(AAFWK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../aafwk/aafwk_lite") set(UTILS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../utils/native/lite") # add definitions # temporarily set, when ui and graphic unifid, this can be removed -add_definitions(-DSCREENRESOLUTION_CMAKE) +add_definitions(-DSCREENSIZE_SPECIFIED) # setup jerryscript include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) @@ -66,6 +66,7 @@ include_directories( ${JSFWK_SOURCE_PATH} ${JSFWK_SOURCE_PATH}/animation ${JSFWK_SOURCE_PATH}/base + ${JSFWK_SOURCE_PATH}/base/cache ${JSFWK_SOURCE_PATH}/components ${JSFWK_SOURCE_PATH}/context ${JSFWK_SOURCE_PATH}/directive @@ -92,6 +93,7 @@ include_directories( # source files aux_source_directory(${JSFWK_SOURCE_PATH}/animation ANIMATION) aux_source_directory(${JSFWK_SOURCE_PATH}/base BASE) +aux_source_directory(${JSFWK_SOURCE_PATH}/base/cache CACHE) aux_source_directory(${JSFWK_SOURCE_PATH}/components COMPONENTS) aux_source_directory(${JSFWK_SOURCE_PATH}/context CONTEXT) aux_source_directory(${JSFWK_SOURCE_PATH}/directive DIRECTIVE) @@ -102,8 +104,8 @@ aux_source_directory(${JSFWK_SOURCE_PATH}/router ROUTER) aux_source_directory(${JSFWK_SOURCE_PATH}/stylemgr STYLEMGR) aux_source_directory(${JSFWK_SOURCE_PATH}/wrapper WRAPPER) aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/targets TARGETS) -aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test TEST) -aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test/unittest UNITTEST) +#aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test TEST) +#aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test/unittest UNITTEST) list(REMOVE_ITEM CONTEXT "${JSFWK_SOURCE_PATH}/context/ace_ability.cpp") list(REMOVE_ITEM MODULES_PRESETS "${JSFWK_SOURCE_PATH}/modules/presets/jstest_module.cpp") @@ -115,6 +117,7 @@ list(REMOVE_ITEM UNITTEST add_library(jsfwk STATIC ${ANIMATION} ${BASE} + ${CACHE} ${COMPONENTS} ${CONTEXT} ${DIRECTIVE} @@ -124,7 +127,7 @@ add_library(jsfwk STATIC ${ROUTER} ${STYLEMGR} ${WRAPPER} - ${TEST} + #${TEST} ${TARGETS} ) target_include_directories(jsfwk PUBLIC @@ -142,7 +145,7 @@ target_link_directories(jsfwk PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/jerryscript/lib if(UNIX) target_link_libraries(jsfwk global_resmgr ui jerry-port-default jerry-ext jerry-core) else() - target_link_libraries(jsfwk global_resmgr ui -Wl,--whole-archive jerry-port-default jerry-ext jerry-core -Wl,--no-whole-archive) + target_link_libraries(jsfwk global_resmgr ui -Wl,--whole-archive jerry-port-default jerry-ext jerry-core -Wl,--no-whole-archive psapi) endif() if (${JERRY_EXTERNAL_CONTEXT} STREQUAL ON) diff --git a/examples/airquality/src/main/config.json b/frameworks/examples/airquality/src/main/config.json old mode 100755 new mode 100644 similarity index 97% rename from examples/airquality/src/main/config.json rename to frameworks/examples/airquality/src/main/config.json index d78468c..e6a6e19 --- a/examples/airquality/src/main/config.json +++ b/frameworks/examples/airquality/src/main/config.json @@ -17,7 +17,6 @@ }, "module": { "deviceType": [ - "liteWearable", "smartVision" ], "distro": { diff --git a/examples/airquality/src/main/js/default/app.js b/frameworks/examples/airquality/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/app.js rename to frameworks/examples/airquality/src/main/js/default/app.js diff --git a/examples/airquality/src/main/js/default/common/cloud.png b/frameworks/examples/airquality/src/main/js/default/common/cloud.png old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/common/cloud.png rename to frameworks/examples/airquality/src/main/js/default/common/cloud.png diff --git a/examples/airquality/src/main/js/default/common/cloud_green.png b/frameworks/examples/airquality/src/main/js/default/common/cloud_green.png old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/common/cloud_green.png rename to frameworks/examples/airquality/src/main/js/default/common/cloud_green.png diff --git a/examples/airquality/src/main/js/default/common/cloud_red.png b/frameworks/examples/airquality/src/main/js/default/common/cloud_red.png old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/common/cloud_red.png rename to frameworks/examples/airquality/src/main/js/default/common/cloud_red.png diff --git a/examples/airquality/src/main/js/default/common/cloud_yellow.png b/frameworks/examples/airquality/src/main/js/default/common/cloud_yellow.png old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/common/cloud_yellow.png rename to frameworks/examples/airquality/src/main/js/default/common/cloud_yellow.png diff --git a/examples/airquality/src/main/js/default/common/week.png b/frameworks/examples/airquality/src/main/js/default/common/week.png old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/common/week.png rename to frameworks/examples/airquality/src/main/js/default/common/week.png diff --git a/examples/airquality/src/main/js/default/i18n/en-US.json b/frameworks/examples/airquality/src/main/js/default/i18n/en-US.json old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/i18n/en-US.json rename to frameworks/examples/airquality/src/main/js/default/i18n/en-US.json diff --git a/examples/airquality/src/main/js/default/i18n/zh-CN.json b/frameworks/examples/airquality/src/main/js/default/i18n/zh-CN.json old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/i18n/zh-CN.json rename to frameworks/examples/airquality/src/main/js/default/i18n/zh-CN.json diff --git a/examples/airquality/src/main/js/default/pages/detail/detail.css b/frameworks/examples/airquality/src/main/js/default/pages/detail/detail.css old mode 100755 new mode 100644 similarity index 100% rename from examples/airquality/src/main/js/default/pages/detail/detail.css rename to frameworks/examples/airquality/src/main/js/default/pages/detail/detail.css diff --git a/examples/airquality/src/main/js/default/pages/detail/detail.hml b/frameworks/examples/airquality/src/main/js/default/pages/detail/detail.hml old mode 100755 new mode 100644 similarity index 96% rename from examples/airquality/src/main/js/default/pages/detail/detail.hml rename to frameworks/examples/airquality/src/main/js/default/pages/detail/detail.hml index 8117ceb..e8e268f --- a/examples/airquality/src/main/js/default/pages/detail/detail.hml +++ b/frameworks/examples/airquality/src/main/js/default/pages/detail/detail.hml @@ -47,7 +47,7 @@