From 690d82c6e7498096b915965b28a4313bde9933d0 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 23 Oct 2024 20:35:26 +0800 Subject: [PATCH] =?utf8?q?#477=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=9B=B4?= =?utf8?q?=E6=96=B0=E7=95=8C=E9=9D=A2=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=94=B9?= =?utf8?q?=E6=88=90=E7=81=B0=E8=89=B2=E9=80=8F=E6=98=8E=E5=BC=B9=E7=AA=97?= =?utf8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E8=BF=99=E4=B8=AA=E4=B8=8D=E6=98=BE?= =?utf8?q?=E7=9C=BC=EF=BC=88=E9=9C=80=E6=B1=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/system/src/SystemView.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp index 8bc05f6ff..a0d2e1258 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp @@ -171,7 +171,7 @@ namespace OHOS LabelSetup labelSetups[] = { {153, STR_ABOUT_WATCH}, - {273, STR_SYSTEM_UPDATE}, + // {273, STR_SYSTEM_UPDATE}, {393, STR_WATCH_QR_CODE}, {513, STR_SYSTEM_LANGUAGE}, {633, STR_RESTART}, @@ -188,10 +188,11 @@ namespace OHOS .textId = STR_ABOUT_WATCH, .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; + int pos_y = 153; for (int i = 0; i < sizeof(labelSetups) / sizeof(labelSetups[0]); ++i) { - labelConfig.top = labelSetups[i].y; + labelConfig.top = pos_y + 120*i; labelConfig.textId = labelSetups[i].textId; SystemViewLabel[i] = SystemViewLabelInit(labelConfig); if (SystemViewLabel[i] == nullptr) @@ -215,7 +216,7 @@ namespace OHOS }; ButtonSetup buttonSetups[] = { {120, ABOUT_THE_WATCH}, - {240, SYSTEM_UPGRADE}, + // {240, SYSTEM_UPGRADE}, {360, WATCH_QR_CODE}, {480, SYSTEM_LANGUAGE}, {600, RESTART}, @@ -223,11 +224,13 @@ namespace OHOS {840, FACTORY_RESET}, }; + int pos_y = 120; for (int i = 0; i < sizeof(buttonSetups) / sizeof(buttonSetups[0]); ++i) { ButtonConfig buttonconfig = { .x = 43, - .y = buttonSetups[i].y, + // .y = buttonSetups[i].y, + .y = pos_y + 120*i, .w = 380, .h = 100, .viewId = buttonSetups[i].viewId, @@ -308,7 +311,7 @@ namespace OHOS { return; } - temp->SetPosition(43, 960, 380, 40); + temp->SetPosition(43, 840, 380, 40); temp->SetVisible(false); SystemScrollView[SYSTEMVIEW]->Add(temp); } -- 2.17.1