From 733721cbff7c075c0dff4bf5227f996926e1cf97 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Sat, 6 Jul 2024 18:03:23 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E5=8D=A1=E7=89=87=E7=AE=A1?= =?utf8?q?=E7=90=86=E6=8C=89=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/add_card/src/AddCardItem.cpp | 8 +++--- .../fd230app/nativeui/main/src/MainModel.cpp | 28 ++++++++----------- .../traingrecord/src/TraingRecordView.cpp | 9 +++--- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp index 2a2864bed..65eea3a65 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp @@ -1,7 +1,7 @@ /*** * @Date: 2024-04-15 10:55:58 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-02 16:12:03 + * @LastEditTime: 2024-07-06 17:57:00 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp */ /*** @@ -41,9 +41,9 @@ namespace OHOS cardImg_.SetResizeMode(UIImageView::FILL); cardImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); - cardToggleButton_.SetPosition(33, 366); - cardToggleButton_.Resize(400, 100); - cardToggleButton_.SetViewId("toggleButton1"); + cardToggleButton_.SetPosition(153, 296); + cardToggleButton_.Resize(160, 160); + cardToggleButton_.SetViewId("toggleButton"); cardToggleButton_.SetStyle(STYLE_BACKGROUND_OPA, 0x00); canvas_.SetPosition(73, 65); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index dd5a768a1..1965c6031 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -76,7 +76,7 @@ namespace OHOS for (uint8_t m = 0; m < (sizeof(cardInfoSet) / sizeof(cardInfoSet[0])); m++) { - // printf("cardInfoSet[%d]:Id %d, Visible: %s\n", m, cardInfoSet[m].id, cardInfoSet[m].isVisible ? "true" : "false"); + printf("cardInfoSet[%d]:Id %d, Visible: %s\n", m, cardInfoSet[m].id, cardInfoSet[m].isVisible ? "true" : "false"); } printf("_____________________________________________________\r\n"); } @@ -110,7 +110,7 @@ namespace OHOS } void MainModel::InitCardSettings(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitCardSettings"); char temp[CARD_SETTING_VALUE_LEN] = {0}; int len; int index = 0; @@ -158,11 +158,9 @@ namespace OHOS { /* 表盘卡片[不被卡片管理，必须设置] */ cardSettings[index++] = WATCH_FACE; - printf("cardSettings[%d] is set [%d]\r\n", index, i, WATCH_FACE); } if (cardInfoMap[i].isVisible) { - printf("cardSettings[%d] is set cardInfoMap[%d]:%d\r\n", index, i, cardInfoMap[i].id); cardSettings[index++] = cardInfoMap[i].id; } } @@ -172,13 +170,13 @@ namespace OHOS cardSettingCount = index; } - printCardSettings(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings"); + // printCardSettings(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitCardSettings"); } void MainModel::DeleteCardSetting(uint8_t index) { /*设置卡片类型为false cardsetting 重新遍历map里面为ture的卡片{表盘必须存在}*/ - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting"); printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]); // printCardSettings(); char temp[CARD_SETTING_VALUE_LEN] = {0}; @@ -214,7 +212,7 @@ namespace OHOS { cardSettings[i] = MAX_CARD; } - printCardSettings(); + // printCardSettings(); for (uint8_t i = 0; i < (sizeof(cardInfoSet) / sizeof(cardInfoSet[0])); i++) { if (mapindex == 0) @@ -241,9 +239,8 @@ namespace OHOS } (void)UtilsSetValue("card_setting", temp); - // printf("index:%d\r\n", index); - printCardSettings(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting"); + // printCardSettings(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting"); } void MainModel::AddCardSetting(uint8_t index) @@ -299,9 +296,8 @@ namespace OHOS } (void)UtilsSetValue("card_setting", temp); - printf("index:%d\r\n", index); - printCardSettings(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddCardSetting"); + // printCardSettings(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardSetting"); } uint8_t MainModel::GetCardSettingCount(void) { @@ -446,7 +442,7 @@ namespace OHOS for (uint8_t i = 0; i < cardSettingCount; i++) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]); } (void)UtilsSetValue("card_setting", temp); @@ -473,7 +469,7 @@ namespace OHOS cardSettings[cardSettingCount++] = cardInfoMap[index].id; for (uint8_t i = 0; i < cardSettingCount; i++) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]); } (void)UtilsSetValue("card_setting", temp); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp index 2849708fe..83adffa5a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp @@ -206,13 +206,13 @@ namespace OHOS TraingRecordList->SetThrowDrag(true); TraingRecordList->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); // 设置手指抬起屏幕后的最大滚动距离 - TraingRecordList->SetMaxScrollDistance(1000); // 1000: max scroll distance + TraingRecordList->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的补偿距离 - TraingRecordList->SetSwipeACCLevel(800); // 800: compensation distance + TraingRecordList->SetSwipeACCLevel(800); // 设置拖动加速 - TraingRecordList->SetDragACCLevel(5); // 5: drag acceleration + TraingRecordList->SetDragACCLevel(5); TraingRecordList->SetYScrollBarVisible(true); - + recordView->SetVisible(false); // 隐藏界面 TraingRecordList->SetOnClickListener(static_cast(TraingRecordPresenter::GetInstance())); UIView::OnDragListener *recorddraglistener = static_cast(TraingRecordPresenter::GetInstance()); @@ -221,7 +221,6 @@ namespace OHOS return; } recordView->SetOnDragListener(recorddraglistener); - recordView->SetVisible(false); // 隐藏界面 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowRecordView end"); } /*控制显示界面*/ -- 2.17.1