From bd3700efb68222bd5f59e0a5b5996a9646d2a0c2 Mon Sep 17 00:00:00 2001 From: youbing54 Date: Sat, 20 Apr 2024 18:04:48 +0800 Subject: [PATCH] Description: Alarm repair IssueNo: https://gitee.com/openharmony/arkui_ace_engine_lite/issues/I9IC3S Feature or Bugfix: Feature Binary Source:Yes Signed-off-by: youbing54 --- .../js/default/pages/editAlarm/edit_alarm.js | 2 +- .../src/main/js/default/pages/index/index.js | 14 ++-- .../picker_view/time_picker/index/index.js | 10 +-- .../time_picker/indexAttr/index.js | 12 ++-- .../time_picker/indexStyle/index.js | 14 ++-- .../time_picker/time_picker1/time_picker1.js | 4 +- .../time_picker10/time_picker10.js | 12 ++-- .../time_picker/time_picker2/time_picker2.js | 10 +-- .../time_picker/time_picker3/time_picker3.js | 10 +-- .../time_picker/time_picker4/time_picker4.js | 4 +- .../time_picker/time_picker5/time_picker5.js | 4 +- .../time_picker/time_picker6/time_picker6.js | 6 +- .../time_picker/time_picker7/time_picker7.js | 6 +- .../time_picker/time_picker8/time_picker8.js | 6 +- .../time_picker/time_picker9/time_picker9.js | 4 +- .../pages/component/slider/attr/attr.js | 2 +- .../pages/component/switch/event/event.js | 16 ++--- .../unittest/common/require_module_tdd_test.h | 2 +- .../unittest/common/js_async_work_tdd_test.h | 6 +- .../unittest/common/jsi_interface_tdd_test.h | 2 +- .../src/core/animation/transition_impl.h | 2 +- frameworks/src/core/base/framework_min_bc.h | 3 +- frameworks/src/core/base/keys.h | 2 +- frameworks/src/core/base/product_adapter.cpp | 68 +++++++++---------- .../src/core/components/canvas_component.cpp | 3 +- .../src/core/components/chart_component.h | 2 +- frameworks/src/core/components/component.h | 2 +- .../core/components/input_button_component.h | 8 +-- .../src/core/components/marquee_component.cpp | 4 +- .../src/core/components/tab_bar_component.h | 2 +- .../common/horizonprogress_tdd_test.h | 2 +- .../test/unittest/common/input_tdd_test.h | 2 +- .../test/unittest/common/jsbundle_tdd_test.h | 2 +- .../test/unittest/common/list_tdd_test.cpp | 2 +- .../test/unittest/common/list_tdd_test.h | 2 +- .../unittest/common/picker_view_tdd_test.h | 2 +- .../test/unittest/common/stack_tdd_test.h | 2 +- .../test/unittest/common/swiper_tdd_test.h | 2 +- .../test/unittest/common/switch_tdd_test.h | 2 +- .../src/core/components/text_component.cpp | 18 ++--- .../src/core/components/text_component.h | 20 +++--- .../src/core/context/js_framework_raw.cpp | 4 +- .../test/unittest/common/jsfwk_tdd_test.h | 2 +- .../core/modules/presets/app_data_module.cpp | 8 +-- .../core/modules/presets/app_data_module.h | 4 +- .../core/modules/presets/console_log_impl.cpp | 6 +- .../core/stylemgr/condition_arbitrator.cpp | 4 +- .../test/unittest/common/stylemgr_tdd_test.h | 2 +- frameworks/tools/snapshot/framework2char.py | 2 +- test/moduletest/common/base_test.h | 2 +- 50 files changed, 166 insertions(+), 166 deletions(-) diff --git a/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js b/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js index e5a28f3d..e1868656 100644 --- a/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js +++ b/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js @@ -87,7 +87,7 @@ export default { let onTheHour = 12; if (timeAMPM === '下午') { - if (Number(hour) != onTheHour) { + if (Number(hour) !== onTheHour) { hour = Number(hour) + onTheHour; } this.dataWrapper.time = hour + ':' + minute; diff --git a/frameworks/examples/music/src/main/js/default/pages/index/index.js b/frameworks/examples/music/src/main/js/default/pages/index/index.js index 3ea26986..e4c03b28 100644 --- a/frameworks/examples/music/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/music/src/main/js/default/pages/index/index.js @@ -22,13 +22,13 @@ let modeImages = ['common/ic_music_listorder.png', 'common/ic_music_listcycle.pn export default { data: { showMusicList: false, - playMode: 1, //0:sequential,1:list loop,2:random,3:single + playMode: 1, //0:sequential,1:list loop,2:random,3:single modeImage: 'common/ic_music_listcycle.png', playImage: 'common/ic_music_play.png', - playProgress: 0, //progress - curMusicIndex: 0, //music index - playStatus: 2, //0:play,1:pause,2:stop - curMusic: { //current music info + playProgress: 0, //progress + curMusicIndex: 0, //music index + playStatus: 2, //0:play,1:pause,2:stop + curMusic: //current music info curMusicName: '', singer: '', playTime: '00:00', @@ -179,7 +179,7 @@ export default { } else if (mode === 'random') { //random this.curMusicIndex = parseInt(Math.random() * (this.musicList.length), 10); console.log('ChangeSong:random:' + this.curMusicIndex); - } else { //next + } else { //next (this.curMusicIndex === this.musicList.length - 1) ? this.curMusicIndex = 0 : this.curMusicIndex++; console.log('ChangeSong:next' + this.curMusicIndex); } @@ -220,7 +220,7 @@ export default { app.terminate(); console.log('end exit'); }, - swipeEvent(e){ + swipeEvent(e) { if (e.direction === 'right') { console.log('start exit'); this.exitApp(); diff --git a/frameworks/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 index 66db2397..83d55e85 100644 --- a/frameworks/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 @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/index/index"), - changePage1: routePage("pages/component/picker_view/time_picker/indexAttr/index").changePage, - changePage2: routePage("pages/component/picker_view/time_picker/indexStyle/index").changePage, - changePage3: routePage("pages/component/picker_view/time_picker/indexEvent/index").changePage + ...backPage('pages/component/picker_view/index/index'), + changePage1: routePage('pages/component/picker_view/time_picker/indexAttr/index').changePage, + changePage2: routePage('pages/component/picker_view/time_picker/indexStyle/index').changePage, + changePage3: routePage('pages/component/picker_view/time_picker/indexEvent/index').changePage }; diff --git a/frameworks/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 index 72420a45..d9916e07 100644 --- a/frameworks/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 @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/index/index"), - changePage1: routePage("pages/component/picker_view/time_picker/time_picker6/time_picker6").changePage, - changePage2: routePage("pages/component/picker_view/time_picker/time_picker5/time_picker5").changePage, - change2If: routePage("pages/component/picker_view/time_picker/time_picker7/time_picker7").changePage, - change2For: routePage("pages/component/picker_view/time_picker/time_picker8/time_picker8").changePage + ...backPage('pages/component/picker_view/time_picker/index/index'), + changePage1: routePage('pages/component/picker_view/time_picker/time_picker6/time_picker6').changePage, + changePage2: routePage('pages/component/picker_view/time_picker/time_picker5/time_picker5').changePage, + change2If: routePage('pages/component/picker_view/time_picker/time_picker7/time_picker7').changePage, + change2For: routePage('pages/component/picker_view/time_picker/time_picker8/time_picker8').changePage }; diff --git a/frameworks/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 index ed3b91c5..5051bdb5 100644 --- a/frameworks/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 @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/index/index"), - changePage1: routePage("pages/component/picker_view/time_picker/time_picker2/time_picker2").changePage, - changePage2: routePage("pages/component/picker_view/time_picker/time_picker3/time_picker3").changePage, - changePage3: routePage("pages/component/picker_view/time_picker/time_picker4/time_picker4").changePage, - change2Style: routePage("pages/component/picker_view/time_picker/time_picker9/time_picker9").changePage, - change2Display: routePage("pages/component/picker_view/time_picker/time_picker10/time_picker10").changePage + ...backPage('pages/component/picker_view/time_picker/index/index'), + changePage1: routePage('pages/component/picker_view/time_picker/time_picker2/time_picker2').changePage, + changePage2: routePage('pages/component/picker_view/time_picker/time_picker3/time_picker3').changePage, + changePage3: routePage('pages/component/picker_view/time_picker/time_picker4/time_picker4').changePage, + change2Style: routePage('pages/component/picker_view/time_picker/time_picker9/time_picker9').changePage, + change2Display: routePage('pages/component/picker_view/time_picker/time_picker10/time_picker10').changePage }; diff --git a/frameworks/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 index adbe9f83..c90eaf25 100644 --- a/frameworks/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 @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { time1: -1, time2: -1 }, - ...backPage("pages/component/picker_view/time_picker/indexEvent/index"), + ...backPage('pages/component/picker_view/time_picker/indexEvent/index'), getTime: function(e1) { this.time1 = e1.hour; this.time2 = e1.minute; diff --git a/frameworks/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 index 0073f49e..df33516b 100644 --- a/frameworks/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 @@ -12,17 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - status: "flex" + status: 'flex' }, - ...backPage("pages/component/picker_view/time_picker/indexStyle/index"), + ...backPage('pages/component/picker_view/time_picker/indexStyle/index'), changeStatus: function() { - if (this.status === "flex") { - this.status = "none"; + if (this.status === 'flex') { + this.status = 'none'; } else { - this.status = "flex"; + this.status = 'flex'; } } }; diff --git a/frameworks/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 index 91a9a353..d01f98ce 100644 --- a/frameworks/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 @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "背景色绿色", - text2: "left设置85", - text3: "top设置170" + text1: '背景色绿色', + text2: 'left设置85', + text3: 'top设置170' }, - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/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 index 93aee208..9af8ddac 100644 --- a/frameworks/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 @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "margin左边距85", - text2: "margin上边距10", - text3: "宽高已设置" + text1: 'margin左边距85', + text2: 'margin上边距10', + text3: '宽高已设置' }, - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/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 index 54879abf..df7a7631 100644 --- a/frameworks/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 @@ -13,7 +13,7 @@ * limitations under the License. */ // time_picker4.js -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/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 index 7c3e3a20..90af4188 100644 --- a/frameworks/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 @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/indexAttr/index") + ...backPage('pages/component/picker_view/time_picker/indexAttr/index') }; diff --git a/frameworks/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 index 294a8ed0..cec1999f 100644 --- a/frameworks/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 @@ -13,12 +13,12 @@ * limitations under the License. */ // time_picker6.js -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/picker_view"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/picker_view'; export default { data: { status: true }, - ...backPage("pages/component/picker_view/time_picker/indexAttr/index"), + ...backPage('pages/component/picker_view/time_picker/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/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 index 0edecbf9..db0f9a1e 100644 --- a/frameworks/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 @@ -13,12 +13,12 @@ * limitations under the License. */ // time_picker7.js -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/picker_view"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/picker_view'; export default { data: { status: true }, - ...backPage("pages/component/picker_view/time_picker/indexAttr/index"), + ...backPage('pages/component/picker_view/time_picker/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/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 index f7f5a1c2..c37dd51d 100644 --- a/frameworks/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 @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { status: true, forData: [0, 1] }, - ...backPage("pages/component/picker_view/time_picker/indexAttr/index") -}; + ...backPage('pages/component/picker_view/time_picker/indexAttr/index') +}; \ No newline at end of file diff --git a/frameworks/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 index 5c2dd1d7..c12c0b25 100644 --- a/frameworks/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 @@ -13,7 +13,7 @@ * limitations under the License. */ // time_picker9.js -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/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 index 6a84251d..5dd1a611 100644 --- a/frameworks/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 @@ -35,7 +35,7 @@ export default { changeIfStatus: function() { if (this.ifStatus === true) { this.ifStatus = false; - } else if (this.ifStatus == false) { + } else if (this.ifStatus === false) { this.ifStatus = true; } }, diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js index 7ea013b0..5d53bf81 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js @@ -12,23 +12,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - clickValue: "点击文字改变", - longpressValue: "长按文字改变", - swipeValue: "滑动文字改变", + clickValue: '点击文字改变', + longpressValue: '长按文字改变', + swipeValue: '滑动文字改变', checkedValue: false }, - ...backPage("pages/component/switch/index/index"), + ...backPage('pages/component/switch/index/index'), click: function() { - this.clickValue = "点击已经触发"; + this.clickValue = '点击已经触发'; }, longpress: function() { - this.longpressValue = "长按已经触发"; + this.longpressValue = '长按已经触发'; }, swipeEvent: function(e) { - this.swipeValue = "swipe方向：" + e.direction; + this.swipeValue = 'swipe方向：' + e.direction; }, change: function() { if (this.checkedValue === false) { diff --git a/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h b/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h index b0655bf8..3d67dd2f 100644 --- a/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h +++ b/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h @@ -36,7 +36,7 @@ class RequireModuleTddTest { #endif public: RequireModuleTddTest(); - ~RequireModuleTddTest(){} + ~RequireModuleTddTest() {} void SetUp(); void TearDown(); void RequireModuleTest001(); diff --git a/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h b/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h index 39dbc82c..5fb9ea03 100644 --- a/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h +++ b/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h @@ -34,10 +34,10 @@ class JsAsyncWorkTddTest : public testing::Test { class JsAsyncWorkTddTest { #endif public: - JsAsyncWorkTddTest(){} - ~JsAsyncWorkTddTest(){} + JsAsyncWorkTddTest() {} + ~JsAsyncWorkTddTest() {} void SetUp(); - void TearDown(){} + void TearDown() {} void JsAsyncWorkTest001(); void JsAsyncWorkTest002(); void JsAsyncWorkTest003(); diff --git a/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h b/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h index ffbd2194..d46eb903 100644 --- a/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h +++ b/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h @@ -38,7 +38,7 @@ class JsiInterfaceTddTest { #endif public: JsiInterfaceTddTest(); - ~JsiInterfaceTddTest(){} + ~JsiInterfaceTddTest() {} void SetUp(); void TearDown(); static void OnDestroy(int8_t statusCode); diff --git a/frameworks/src/core/animation/transition_impl.h b/frameworks/src/core/animation/transition_impl.h index 4e259e78..ff344fcd 100644 --- a/frameworks/src/core/animation/transition_impl.h +++ b/frameworks/src/core/animation/transition_impl.h @@ -71,7 +71,7 @@ struct TransitionParams { opacity_from(-1), opacity_to(-1), background_color_from(RGB_COLOR_VALUE_MAX), - background_color_to(RGB_COLOR_VALUE_MAX){} + background_color_to(RGB_COLOR_VALUE_MAX) {} }; struct ViewStatus { diff --git a/frameworks/src/core/base/framework_min_bc.h b/frameworks/src/core/base/framework_min_bc.h index c730249c..80a28bad 100644 --- a/frameworks/src/core/base/framework_min_bc.h +++ b/frameworks/src/core/base/framework_min_bc.h @@ -25,8 +25,7 @@ #ifndef OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER #define OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER -const uint8_t g_frameworkBCBuffer[] = -{ +const uint8_t FRAMEWORK_BC_BUFFER[] = { 0x4a, 0x52, 0x52, 0x59, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x41, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x33, 0x2c, diff --git a/frameworks/src/core/base/keys.h b/frameworks/src/core/base/keys.h index 7bc649b3..64de90ed 100644 --- a/frameworks/src/core/base/keys.h +++ b/frameworks/src/core/base/keys.h @@ -276,7 +276,7 @@ enum { KEYWORD(START_ANGLE, startAngle) // circle progress start angle KEYWORD(STEP, step) KEYWORD(STROKE_WIDTH, strokeWidth) // horizon/arc progress style - KEYWORD(SWIPE, swipe) // swipe event listener + KEYWORD(SWIPE, swipe) // swipe event listener KEYWORD(SWIPER, swiper) // tag name KEYWORD(SWITCH, switch) // tag name #if (FEATURE_COMPONENT_TABS == 1) diff --git a/frameworks/src/core/base/product_adapter.cpp b/frameworks/src/core/base/product_adapter.cpp index d25db89f..c8213ef1 100644 --- a/frameworks/src/core/base/product_adapter.cpp +++ b/frameworks/src/core/base/product_adapter.cpp @@ -32,24 +32,24 @@ namespace ACELite { */ struct DFXWrapper { DFXWrapper() - : eventTag_(0), - eventSubTag_(0), - errCodeTag_(0), - errCodeSubTag_(0), - eventPrintHandler_(nullptr), - errCodePrintHandler_(nullptr), - jsLogOutputHandler_(nullptr), - nativeMemInfoGetter_(nullptr) + : 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_; + uint8_t eventTag; + uint8_t eventSubTag; + uint8_t errCodeTag; + uint8_t errCodeSubTag; + EventPrintHandler eventPrintHandler; + ErrCodePrintHandler errCodePrintHandler; + JSLogOutputHandler jsLogOutputHandler; + NativeMemInfoGetter nativeMemInfoGetter; }; static DFXWrapper g_dfxWrapper; @@ -87,26 +87,26 @@ void ProductAdapter::InitAceTags(uint8_t *aceTags, uint8_t tagCount) 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++]; + 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; + g_dfxWrapper.eventPrintHandler = eventHandler; + g_dfxWrapper.errCodePrintHandler = errCodeHandler; } void ProductAdapter::InitConsoleNativeHandler(JSLogOutputHandler handler) { - g_dfxWrapper.jsLogOutputHandler_ = handler; + g_dfxWrapper.jsLogOutputHandler = handler; } void ProductAdapter::InitNativeMemPoolHook(NativeMemInfoGetter getter) { - g_dfxWrapper.nativeMemInfoGetter_ = getter; + g_dfxWrapper.nativeMemInfoGetter = getter; } void ProductAdapter::InitExtraModulesGetter(ProductModulesGetter productModuleGetter, @@ -122,38 +122,38 @@ void ProductAdapter::InitExtraModulesGetter(ProductModulesGetter productModuleGe 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) { + 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); + 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) { + 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); + 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) { + if (g_dfxWrapper.jsLogOutputHandler == nullptr) { return; } - g_dfxWrapper.jsLogOutputHandler_(level, content); + g_dfxWrapper.jsLogOutputHandler(level, content); } void ProductAdapter::GetNativeMemInfo(NativeMemInfo *memInfo) { - if (g_dfxWrapper.nativeMemInfoGetter_ == nullptr) { + if (g_dfxWrapper.nativeMemInfoGetter == nullptr) { return; } - g_dfxWrapper.nativeMemInfoGetter_(memInfo); + g_dfxWrapper.nativeMemInfoGetter(memInfo); } void ProductAdapter::RegTerminatingHandler(TerminateAbilityHandler handler) diff --git a/frameworks/src/core/components/canvas_component.cpp b/frameworks/src/core/components/canvas_component.cpp index 73bf27c4..c415aa9e 100644 --- a/frameworks/src/core/components/canvas_component.cpp +++ b/frameworks/src/core/components/canvas_component.cpp @@ -2136,8 +2136,7 @@ jerry_value_t CanvasComponent::SetLineDash(const jerry_value_t func, delete[] buff; HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: value is nullptr error!"); return jerry_create_error(JERRY_ERROR_TYPE, - reinterpret_cast - ("canvas_component: value is nullptr error!")); + reinterpret_cast("canvas_component:value is nullptr error!")); } num = atof(value); ACE_FREE(value); diff --git a/frameworks/src/core/components/chart_component.h b/frameworks/src/core/components/chart_component.h index 2e515fdf..aabc5f6e 100644 --- a/frameworks/src/core/components/chart_component.h +++ b/frameworks/src/core/components/chart_component.h @@ -54,7 +54,7 @@ struct SeriesOptions : public MemoryHeap { bool isLoopSet; ACE_DISALLOW_COPY_AND_MOVE(SeriesOptions); SeriesOptions() : width(1), margin(1), head(nullptr), top(nullptr), bottom(nullptr), smooth(false), - isHeadSet(false), isTopSet(false), isBottomSet(false), isLoopSet(false){} + isHeadSet(false), isTopSet(false), isBottomSet(false), isLoopSet(false) {} }; class ChartComponent final : public Component { diff --git a/frameworks/src/core/components/component.h b/frameworks/src/core/components/component.h index 8b1fb426..727bb354 100644 --- a/frameworks/src/core/components/component.h +++ b/frameworks/src/core/components/component.h @@ -202,7 +202,7 @@ public: TransitionImpl *transitionImpl; AnimationsNode *next; - AnimationsNode() : transitionImpl(nullptr), next(nullptr){} + AnimationsNode() : transitionImpl(nullptr), next(nullptr) {} }; static void HandlerAnimations(); diff --git a/frameworks/src/core/components/input_button_component.h b/frameworks/src/core/components/input_button_component.h index 8b3c9fbe..455bd331 100644 --- a/frameworks/src/core/components/input_button_component.h +++ b/frameworks/src/core/components/input_button_component.h @@ -20,9 +20,9 @@ #include "ui_label_button.h" #ifdef FEATURE_EXTRA_TEXT_X_SUPPORT #include "ui_label_button_x.h" -#define UILabelButtonTypeWrapper UILabelButtonX +#define UI_LABEL_BUTTON_TYPE_WRAPPER UILabelButtonX #else -#define UILabelButtonTypeWrapper UILabelButton +#define UI_LABEL_BUTTON_TYPE_WRAPPER UILabelButton #endif // FEATURE_EXTRA_TEXT_X_SUPPORT namespace OHOS { @@ -57,7 +57,7 @@ public: protected: UIView *GetComponentRootView() const override { - return const_cast(&button_); + return const_cast(&button_); } private: @@ -68,7 +68,7 @@ private: bool SetColor(const AppStyleItem &style); bool HandleImage(const AppStyleItem &style); jerry_value_t options_; - UILabelButtonTypeWrapper button_; + UI_LABEL_BUTTON_TYPE_WRAPPER button_; ViewOnClickListener *clickListener_; int32_t pressedBackGroundColorValue_; uint8_t pressedOpacityValue_; diff --git a/frameworks/src/core/components/marquee_component.cpp b/frameworks/src/core/components/marquee_component.cpp index d528506d..4a4c01fb 100644 --- a/frameworks/src/core/components/marquee_component.cpp +++ b/frameworks/src/core/components/marquee_component.cpp @@ -31,7 +31,7 @@ MarqueeComponent::MarqueeComponent(jerry_value_t options, jerry_value_t children bool MarqueeComponent::CreateNativeViews() { if (TextComponent::CreateNativeViews()) { - UILabelTypeWrapper *uiLabel = TextComponent::GetUILabelView(); + UI_LABEL_TYPE_WRAPPER *uiLabel = TextComponent::GetUILabelView(); if (uiLabel != nullptr) { // default mode, speed uiLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); @@ -83,7 +83,7 @@ void MarqueeComponent::SetScrolldelay(uint16_t scrolldelay) void MarqueeComponent::SetRollSpeed() { - UILabelTypeWrapper *uiLabel = TextComponent::GetUILabelView(); + UI_LABEL_TYPE_WRAPPER *uiLabel = TextComponent::GetUILabelView(); if (uiLabel != nullptr) { const int32_t supportScrolldelayApiVersion = 5; if (JsAppContext::GetInstance()->GetTargetApi() >= supportScrolldelayApiVersion) { diff --git a/frameworks/src/core/components/tab_bar_component.h b/frameworks/src/core/components/tab_bar_component.h index e306fd0e..1ffabef9 100644 --- a/frameworks/src/core/components/tab_bar_component.h +++ b/frameworks/src/core/components/tab_bar_component.h @@ -30,7 +30,7 @@ public: ACE_DISALLOW_COPY_AND_MOVE(TabBarComponent); TabBarComponent() = delete; TabBarComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager); - ~TabBarComponent(){} + ~TabBarComponent() {} int16_t GetWidth() const { return width_; 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 index cba24af5..492ee91b 100644 --- a/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h @@ -38,7 +38,7 @@ class HorizonProgressTddTest { #endif public: HorizonProgressTddTest(); - ~HorizonProgressTddTest(){} + ~HorizonProgressTddTest() {} void SetUp(); void TearDown(); void HorizonProgressTest001(); 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 index 515107a8..cddf5d00 100644 --- a/frameworks/src/core/components/test/unittest/common/input_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/input_tdd_test.h @@ -26,7 +26,7 @@ namespace ACELite { class InputTddTest : public BaseTest { public: InputTddTest() {} - ~InputTddTest(){} + ~InputTddTest() {} void ComponentInputAttributeTest01(); void ComponentInputAttributeTest02(); void ComponentInputStyleTest03(); 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 index 1010d8c2..e8d73249 100644 --- a/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h @@ -36,7 +36,7 @@ class JsbundleTddTest { #endif public: JsbundleTddTest(); - ~JsbundleTddTest(){} + ~JsbundleTddTest() {} void SetUp(); void TearDown(); 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 index 4ba31194..4eb9335e 100644 --- a/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp +++ b/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp @@ -23,7 +23,7 @@ namespace ACELite { ListTddTest::ListTddTest() : objGlob(UNDEFINED), objAttrs(UNDEFINED), - objStaticStyle(UNDEFINED){} + objStaticStyle(UNDEFINED) {} void ListTddTest::SetUp() { JsAppEnvironment* appJsEnv = JsAppEnvironment::GetInstance(); 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 index 384a3a63..876ba780 100644 --- a/frameworks/src/core/components/test/unittest/common/list_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/list_tdd_test.h @@ -36,7 +36,7 @@ class ListTddTest { #endif public: ListTddTest(); - ~ListTddTest(){} + ~ListTddTest() {} void SetUp(); void TearDown(); void ListTest001(); 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 index c5693e2e..f9c4fa76 100644 --- 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 @@ -44,7 +44,7 @@ class PickerViewTddTest { public: PickerViewTddTest(); - ~PickerViewTddTest(){} + ~PickerViewTddTest() {} void SetUp(); void TearDown(); Component* GetRenderedComponent(uint16_t componentKeyId) const; diff --git a/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h b/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h index 5235db1d..7b2a45cf 100644 --- a/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h @@ -44,7 +44,7 @@ class StackTddTest { #endif public: StackTddTest(); - ~StackTddTest(){} + ~StackTddTest() {} void SetUp(); void TearDown(); void ComponentStackTest001(); 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 index b911bcee..ab039961 100644 --- a/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h @@ -38,7 +38,7 @@ class SwiperTddTest { #endif public: SwiperTddTest(); - ~SwiperTddTest(){} + ~SwiperTddTest() {} void SetUp(); void TearDown(); void ComponentSwiperAttributeSetTest001(); 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 index 5556d10e..446a66ab 100644 --- a/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h @@ -37,7 +37,7 @@ class SwitchTddTest { #endif public: SwitchTddTest(); - ~SwitchTddTest(){} + ~SwitchTddTest() {} void SetUp(); void TearDown(); void ComponentSwitchAttributeSetTest001(); diff --git a/frameworks/src/core/components/text_component.cpp b/frameworks/src/core/components/text_component.cpp index 82dab9c9..8c979c82 100644 --- a/frameworks/src/core/components/text_component.cpp +++ b/frameworks/src/core/components/text_component.cpp @@ -70,12 +70,12 @@ void TextComponent::ReleaseNativeViews() inline UIView *TextComponent::GetComponentRootView() const { - return const_cast(&uiLabel_); + return const_cast(&uiLabel_); } -UILabelTypeWrapper *TextComponent::GetUILabelView() const +UI_LABEL_TYPE_WRAPPER *TextComponent::GetUILabelView() const { - return const_cast(&uiLabel_); + return const_cast(&uiLabel_); } bool TextComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) @@ -224,17 +224,17 @@ bool TextComponent::ApplyPrivateStyle(const AppStyleItem *styleItem) return true; } -void TextComponent::SetTextLetterSpace(UILabelTypeWrapper &label, const AppStyleItem *styleItem) const +void TextComponent::SetTextLetterSpace(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) const { label.SetStyle(STYLE_LETTER_SPACE, (int16_t)GetStylePixelValue(styleItem)); } -void TextComponent::SetTextLineHeight(UILabelTypeWrapper &label, const AppStyleItem *styleItem) const +void TextComponent::SetTextLineHeight(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) const { label.SetStyle(STYLE_LINE_HEIGHT, (int16_t)GetStylePixelValue(styleItem)); } -void TextComponent::SetTextOverflow(UILabelTypeWrapper &label, const AppStyleItem *styleItem) +void TextComponent::SetTextOverflow(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) { if (!IsStyleValueTypeString(styleItem)) { HILOG_ERROR(HILOG_MODULE_ACE, "text overflow style value is invalid!"); @@ -263,7 +263,7 @@ void TextComponent::SetTextOverflow(UILabelTypeWrapper &label, const AppStyleIte label.SetLineBreakMode(overflowMode_); } -void TextComponent::SetTextColor(UILabelTypeWrapper &label, const AppStyleItem *styleItem) const +void TextComponent::SetTextColor(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) const { uint32_t color = 0; uint8_t alpha = OPA_OPAQUE; @@ -332,7 +332,7 @@ void TextComponent::PostUpdate(uint16_t attrKeyId) } } -void TextComponent::SetTextAlign(UILabelTypeWrapper &label, const AppStyleItem *styleItem) +void TextComponent::SetTextAlign(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) { if (!IsStyleValueTypeString(styleItem)) { HILOG_ERROR(HILOG_MODULE_ACE, "text text align style value is invalid!"); @@ -359,7 +359,7 @@ void TextComponent::SetTextAlign(UILabelTypeWrapper &label, const AppStyleItem * UpdateTextAlignToLabel(label); } -void TextComponent::UpdateTextAlignToLabel(UILabelTypeWrapper& label) +void TextComponent::UpdateTextAlignToLabel(UI_LABEL_TYPE_WRAPPER& label) { const int32_t defaultVerticalAlignCenterApiVersion = 5; if (JsAppContext::GetInstance()->GetTargetApi() < defaultVerticalAlignCenterApiVersion) { diff --git a/frameworks/src/core/components/text_component.h b/frameworks/src/core/components/text_component.h index 2f6b5f7c..8985a9c6 100644 --- a/frameworks/src/core/components/text_component.h +++ b/frameworks/src/core/components/text_component.h @@ -23,9 +23,9 @@ #include "ui_label.h" #ifdef FEATURE_EXTRA_TEXT_X_SUPPORT #include "ui_label_x.h" -#define UILabelTypeWrapper UILabelX +#define UI_LABEL_TYPE_WRAPPER UILabelX #else -#define UILabelTypeWrapper UILabel +#define UI_LABEL_TYPE_WRAPPER UILabel #endif // FEATURE_EXTRA_TEXT_X_SUPPORT namespace OHOS { @@ -66,28 +66,28 @@ protected: UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; bool ApplyPrivateStyle(const AppStyleItem* styleItem) override; - UILabelTypeWrapper *GetUILabelView() const; + UI_LABEL_TYPE_WRAPPER *GetUILabelView() const; void OnViewAttached() override; void PostUpdate(uint16_t attrKeyId) override; private: // parse js text align style to ui_label - void SetTextAlign(UILabelTypeWrapper& label, const AppStyleItem* styleItem); - void UpdateTextAlignToLabel(UILabelTypeWrapper& label); + void SetTextAlign(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem); + void UpdateTextAlignToLabel(UI_LABEL_TYPE_WRAPPER& label); // parse js text size style to fontSize_ void SetTextSize(const AppStyleItem* styleItem); // parse js text color style to ui_label - void SetTextColor(UILabelTypeWrapper& label, const AppStyleItem* styleItem) const; + void SetTextColor(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem) const; // parse js text overflow style to ui_label - void SetTextOverflow(UILabelTypeWrapper& label, const AppStyleItem* styleItem); + void SetTextOverflow(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem); // parse js text letter space style to ui_label - void SetTextLetterSpace(UILabelTypeWrapper& label, const AppStyleItem* styleItem) const; + void SetTextLetterSpace(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem) const; // parse js text line height style to ui_label - void SetTextLineHeight(UILabelTypeWrapper& label, const AppStyleItem* styleItem) const; + void SetTextLineHeight(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem) const; #if FEATURE_COMPONENT_TEXT_SPANNABLE void SetRichTextSpan(); #endif - UILabelTypeWrapper uiLabel_; + UI_LABEL_TYPE_WRAPPER uiLabel_; uint8_t fontSize_; char* fontFamily_; char* textValue_; diff --git a/frameworks/src/core/context/js_framework_raw.cpp b/frameworks/src/core/context/js_framework_raw.cpp index 7498091f..95291962 100644 --- a/frameworks/src/core/context/js_framework_raw.cpp +++ b/frameworks/src/core/context/js_framework_raw.cpp @@ -28,8 +28,8 @@ namespace ACELite { const char *GetFrameworkRawBuffer(bool snapshotMode, size_t &bufLen) { if (snapshotMode) { - bufLen = sizeof(g_frameworkBCBuffer); - return reinterpret_cast(g_frameworkBCBuffer); + bufLen = sizeof(FRAMEWORK_BC_BUFFER); + return reinterpret_cast(FRAMEWORK_BC_BUFFER); } bufLen = strlen(g_frameworkJSBuffer); return g_frameworkJSBuffer; 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 index 0a0345ac..91f7718d 100644 --- a/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h +++ b/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h @@ -36,7 +36,7 @@ class JSfwkTddTest { #endif public: JSfwkTddTest(); - ~JSfwkTddTest(){} + ~JSfwkTddTest() {} void SetUp(); void TearDown(); void JudeTestCaseResult() const; diff --git a/frameworks/src/core/modules/presets/app_data_module.cpp b/frameworks/src/core/modules/presets/app_data_module.cpp index 6966cf07..a04cb61b 100644 --- a/frameworks/src/core/modules/presets/app_data_module.cpp +++ b/frameworks/src/core/modules/presets/app_data_module.cpp @@ -22,11 +22,11 @@ namespace OHOS { namespace ACELite { -const char * const AppDataModule::GETAPP_METHOD_NAME = "getApp"; -const char * const AppDataModule::GETAPP_DATA_STR = "data"; +const char * const AppDataModule::getAppMethodName = "getApp"; +const char * const AppDataModule::getAppDataStr = "data"; void AppDataModule::Init() { - CreateNamedFunction(GETAPP_METHOD_NAME, GetApp); + CreateNamedFunction(getAppMethodName, GetApp); } jerry_value_t AppDataModule::GetApp(const jerry_value_t func, @@ -52,7 +52,7 @@ jerry_value_t AppDataModule::GetApp(const jerry_value_t func, return UNDEFINED; } - jerry_value_t dataObj = jerryx_get_property_str(abilityVM, GETAPP_DATA_STR); + jerry_value_t dataObj = jerryx_get_property_str(abilityVM, getAppDataStr); if (IS_UNDEFINED(dataObj)) { return UNDEFINED; } diff --git a/frameworks/src/core/modules/presets/app_data_module.h b/frameworks/src/core/modules/presets/app_data_module.h index dfba14dd..ec7461d1 100644 --- a/frameworks/src/core/modules/presets/app_data_module.h +++ b/frameworks/src/core/modules/presets/app_data_module.h @@ -54,8 +54,8 @@ private: const jerry_value_t context, const jerry_value_t args[], const jerry_length_t argsNum); - static const char * const GETAPP_METHOD_NAME; - static const char * const GETAPP_DATA_STR; + static const char * const getAppMethodName; + static const char * const getAppDataStr; }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/modules/presets/console_log_impl.cpp b/frameworks/src/core/modules/presets/console_log_impl.cpp index 220bd6aa..7852dbb3 100644 --- a/frameworks/src/core/modules/presets/console_log_impl.cpp +++ b/frameworks/src/core/modules/presets/console_log_impl.cpp @@ -143,9 +143,9 @@ static uint16_t logBufferIndex = 0; void LogChar(char c, const LogLevel logLevel, bool endFlag) { #if (defined(TARGET_SIMULATOR) && (TARGET_SIMULATOR == 1)) - char tempBuffer[2] = {0}; - tempBuffer[0] = c; - Output(logLevel, tempBuffer, 1); + char tempBuffer[2] = {0}; + tempBuffer[0] = c; + Output(logLevel, tempBuffer, 1); #else logBuffer[logBufferIndex++] = c; if ((logBufferIndex == (LOG_BUFFER_SIZE - 1)) || (c == '\n')) { diff --git a/frameworks/src/core/stylemgr/condition_arbitrator.cpp b/frameworks/src/core/stylemgr/condition_arbitrator.cpp index f5498115..b85cef04 100644 --- a/frameworks/src/core/stylemgr/condition_arbitrator.cpp +++ b/frameworks/src/core/stylemgr/condition_arbitrator.cpp @@ -33,6 +33,8 @@ constexpr uint32_t SPACE_CHAR_LIMIT_SCOPE = 5; constexpr int32_t SLICE_FROM_CURRENT_POS = 0; constexpr uint8_t MAX_LENGTH_PER_CONDITION = 32; constexpr uint8_t MAX_LENGTH_PER_CONDITION_ADD_BRACKETS = 35; +constexpr uint8_t ASSICLL_DIGIT_START = 48; +constexpr uint8_t ASSICLL_DIGIT_END = 57; /** * @brief Absolute value of x. @@ -165,7 +167,7 @@ bool ConditionArbitrator::JudgeConditionByStrValue(ConditionName conditionId, co bool ConditionArbitrator::JudgeConditionByNumberValue(ConditionName conditionId, const char *targetValue) const { // must be started with number character - if (!(targetValue[0] >= 48 && targetValue[0] <= 57)) { + if (!(targetValue[0] >= ASSICLL_DIGIT_START && targetValue[0] <= ASSICLL_DIGIT_END)) { return false; } switch (conditionId) { 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 index f519ae3f..bb0d2a96 100644 --- a/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h +++ b/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h @@ -41,7 +41,7 @@ class StyleMgrTddTest { #endif public: StyleMgrTddTest(); - ~StyleMgrTddTest(){} + ~StyleMgrTddTest() {} void SetUp(); void TearDown(); void TestCaseB(const char* name) const; diff --git a/frameworks/tools/snapshot/framework2char.py b/frameworks/tools/snapshot/framework2char.py index 500b1799..0d696f99 100644 --- a/frameworks/tools/snapshot/framework2char.py +++ b/frameworks/tools/snapshot/framework2char.py @@ -79,7 +79,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 uint8_t g_frameworkBCBuffer[] =\n{\n ") + output.write("const uint8_t FRAMEWORK_BC_BUFFER[] =\n{\n ") index = 1 max_count = len(byte_code_buffer) for data in byte_code_buffer: diff --git a/test/moduletest/common/base_test.h b/test/moduletest/common/base_test.h index 4dd413f4..9be742a3 100644 --- a/test/moduletest/common/base_test.h +++ b/test/moduletest/common/base_test.h @@ -42,7 +42,7 @@ class BaseTest { #endif public: BaseTest(); - virtual ~BaseTest(){} + virtual ~BaseTest() {} void SetUp(); void TearDown(); -- Gitee