优化卡片管理按键

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 2a2864b..65eea3a 100644 (file)
--- 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 @@
 /*** \r
  * @Date: 2024-04-15 10:55:58\r
  * @LastEditors: Caisking 3449750381@qq.com\r
- * @LastEditTime: 2024-07-02 16:12:03\r
+ * @LastEditTime: 2024-07-06 17:57:00\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp\r
  */\r
 /***\r
@@ -41,9 +41,9 @@ namespace OHOS
         cardImg_.SetResizeMode(UIImageView::FILL);\r
         cardImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);\r
 \r
-        cardToggleButton_.SetPosition(33, 366);\r
-        cardToggleButton_.Resize(400, 100);\r
-        cardToggleButton_.SetViewId("toggleButton1");\r
+        cardToggleButton_.SetPosition(153, 296);\r
+        cardToggleButton_.Resize(160, 160);\r
+        cardToggleButton_.SetViewId("toggleButton");\r
         cardToggleButton_.SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
 \r
         canvas_.SetPosition(73, 65);\r

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 dd5a768..1965c60 100644 (file)
--- 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
 \r
         for (uint8_t m = 0; m < (sizeof(cardInfoSet) / sizeof(cardInfoSet[0])); m++)\r
         {\r
-            // printf("cardInfoSet[%d]:Id %d, Visible: %s\n", m, cardInfoSet[m].id, cardInfoSet[m].isVisible ? "true" : "false");\r
+            printf("cardInfoSet[%d]:Id %d, Visible: %s\n", m, cardInfoSet[m].id, cardInfoSet[m].isVisible ? "true" : "false");\r
         }\r
         printf("_____________________________________________________\r\n");\r
     }\r
@@ -110,7 +110,7 @@ namespace OHOS
     }\r
     void MainModel::InitCardSettings(void)\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitCardSettings");\r
         char temp[CARD_SETTING_VALUE_LEN] = {0};\r
         int len;\r
         int index = 0;\r
@@ -158,11 +158,9 @@ namespace OHOS
                 {\r
                     /* 表盘卡片[不被卡片管理，必须设置] */\r
                     cardSettings[index++] = WATCH_FACE;\r
-                    printf("cardSettings[%d] is set [%d]\r\n", index, i, WATCH_FACE);\r
                 }\r
                 if (cardInfoMap[i].isVisible)\r
                 {\r
-                    printf("cardSettings[%d] is set cardInfoMap[%d]:%d\r\n", index, i, cardInfoMap[i].id);\r
                     cardSettings[index++] = cardInfoMap[i].id;\r
                 }\r
             }\r
@@ -172,13 +170,13 @@ namespace OHOS
             cardSettingCount = index;\r
         }\r
 \r
-        printCardSettings();\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings");\r
+        // printCardSettings();\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitCardSettings");\r
     }\r
     void MainModel::DeleteCardSetting(uint8_t index)\r
     {\r
         /*设置卡片类型为false cardsetting 重新遍历map里面为ture的卡片{表盘必须存在}*/\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting");\r
         printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]);\r
         // printCardSettings();\r
         char temp[CARD_SETTING_VALUE_LEN] = {0};\r
@@ -214,7 +212,7 @@ namespace OHOS
         {\r
             cardSettings[i] = MAX_CARD;\r
         }\r
-        printCardSettings();\r
+        // printCardSettings();\r
         for (uint8_t i = 0; i < (sizeof(cardInfoSet) / sizeof(cardInfoSet[0])); i++)\r
         {\r
             if (mapindex == 0)\r
@@ -241,9 +239,8 @@ namespace OHOS
         }\r
         (void)UtilsSetValue("card_setting", temp);\r
 \r
-        // printf("index:%d\r\n", index);\r
-        printCardSettings();\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting");\r
+        // printCardSettings();\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting");\r
     }\r
 \r
     void MainModel::AddCardSetting(uint8_t index)\r
@@ -299,9 +296,8 @@ namespace OHOS
         }\r
         (void)UtilsSetValue("card_setting", temp);\r
 \r
-        printf("index:%d\r\n", index);\r
-        printCardSettings();\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddCardSetting");\r
+        // printCardSettings();\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardSetting");\r
     }\r
     uint8_t MainModel::GetCardSettingCount(void)\r
     {\r
@@ -446,7 +442,7 @@ namespace OHOS
 \r
         for (uint8_t i = 0; i < cardSettingCount; i++)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);\r
         }\r
         (void)UtilsSetValue("card_setting", temp);\r
@@ -473,7 +469,7 @@ namespace OHOS
         cardSettings[cardSettingCount++] = cardInfoMap[index].id;\r
         for (uint8_t i = 0; i < cardSettingCount; i++)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);\r
         }\r
         (void)UtilsSetValue("card_setting", temp);\r

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 2849708..83adffa 100644 (file)
--- 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<UIView::OnClickListener *>(TraingRecordPresenter::GetInstance()));
 
         UIView::OnDragListener *recorddraglistener = static_cast<UIView::OnDragListener *>(TraingRecordPresenter::GetInstance());
@@ -221,7 +221,6 @@ namespace OHOS
             return;
         }
         recordView->SetOnDragListener(recorddraglistener);
-        recordView->SetVisible(false); // 隐藏界面
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowRecordView end");
     }
     /*控制显示界面*/