From aa466d860767745cadc0e342c4cef5f15957319d Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 9 Jul 2024 16:03:40 +0800
Subject: [PATCH] =?utf8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?utf8?q?=E7=9A=84=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/main/src/MainModel.cpp  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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 1965c6031..c6a9eddbf 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -66,19 +66,19 @@ namespace OHOS
     void MainModel::printCardSettings(void)
     {
         uint8_t i;
-        printf("_____________________________________________________\r\n");
+        WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "_____________________________________________________\r\n");
         for (i = 0; i < cardSettingCount; i++)
         {
             uint8_t cardId = cardSettings[i];
             const char *cardname = getCardNameFromMap(cardId);
-            printf("cardSettings[%d]:Id: %d, CardName: %s\r\n", i, cardId, cardname);
+            WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "cardSettings[%d]:Id: %d, CardName: %s\r\n", i, cardId, cardname);
         }
 
         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");
+            WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "cardInfoSet[%d]:Id %d, Visible: %s\n", m, cardInfoSet[m].id, cardInfoSet[m].isVisible ? "true" : "false");
         }
-        printf("_____________________________________________________\r\n");
+        WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "_____________________________________________________\r\n");
     }
 
     const char *MainModel::getCardNameFromMap(uint8_t cardId) const
@@ -98,7 +98,7 @@ namespace OHOS
         {
             if (card == cardInfoMap[i].id)
             {
-                printf("cardInfoMap[%d]:%d\n", i, cardInfoMap[i].id);
+                WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "cardInfoMap[%d]:%d\n", i, cardInfoMap[i].id);
                 return &cardInfoMap[i];
             }
         }
@@ -142,7 +142,7 @@ namespace OHOS
                 {
                     if (cardInfoSet[i].id == cardSettings[j])
                     {
-                        printf("CardSettings:cardInfoSet[%d] is set cardSettings[%d]\r\n", i, j);
+                        //  WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "CardSettings:cardInfoSet[%d] is set cardSettings[%d]\r\n", i, j);
                         visible = true;
                         break;
                     }
@@ -177,7 +177,7 @@ namespace OHOS
     {
         /*设置卡片类型为false cardsetting 重新遍历map里面为ture的卡片{表盘必须存在}*/
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting");
-        printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]);
+        //  WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]);
         // printCardSettings();
         char temp[CARD_SETTING_VALUE_LEN] = {0};
 
@@ -193,7 +193,7 @@ namespace OHOS
             return;
         }
         int count = sizeof(cardInfoSet) / sizeof(cardInfoSet[0]);
-        printf("count:%d\r\n", count);
+        WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "count:%d\r\n", count);
         // 设置map里面的属性
         for (uint8_t i = 0; i < count; i++)
         {
@@ -201,10 +201,10 @@ namespace OHOS
             if (cardInfoMap[index].id == cardInfoSet[i].id)
             {
                 cardInfoSet[i].isVisible = false;
-                printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]);
-                printf("设置删除卡片属性:cardInfoSet[%d] is %d \r\n", i, cardInfoSet[i].isVisible);
+                WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]);
+                WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "设置删除卡片属性:cardInfoSet[%d] is %d \r\n", i, cardInfoSet[i].isVisible);
             }
-            printf("cardInfoSet[%d]:id%d\r\n", i, cardInfoSet[i].id);
+            WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "cardInfoSet[%d]:id%d\r\n", i, cardInfoSet[i].id);
         }
         int mapindex = 0;
         // 重新生成cardSettings
@@ -223,7 +223,7 @@ namespace OHOS
             // 设置其他卡片
             if (cardInfoSet[i].isVisible)
             {
-                // printf("cardSettings[%d]\r\n", i);
+                //  WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "cardSettings[%d]\r\n", i);
                 cardSettings[mapindex++] = cardInfoSet[i].id;
             }
         }
@@ -274,14 +274,14 @@ namespace OHOS
             if (cardInfoMap[index].id == cardInfoSet[i].id)
             {
                 cardInfoSet[i].isVisible = true;
-                printf("添加卡片:cardSettings[%d] is %d \r\n", index, cardInfoMap[index].id);
-                printf("设置添加卡片属性:cardInfoSet[%d] is %d \r\n", i, cardInfoSet[i].isVisible);
+                WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "添加卡片:cardSettings[%d] is %d \r\n", index, cardInfoMap[index].id);
+                WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "设置添加卡片属性:cardInfoSet[%d] is %d \r\n", i, cardInfoSet[i].isVisible);
             }
             // 设置其他卡片
             if (cardInfoSet[i].isVisible)
             {
                 cardSettings[mapindex++] = cardInfoSet[i].id;
-                printf("set cardInfoSet[%d]\r\n", i);
+                WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "set cardInfoSet[%d]\r\n", i);
             }
         }
         /*设置卡片[不被卡片管理，必须设置] */
@@ -447,9 +447,9 @@ namespace OHOS
         }
         (void)UtilsSetValue("card_setting", temp);
 
-        printf("\r\n***************DeleteCardSetting********************\r\n");
+         WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "\r\n***************DeleteCardSetting********************\r\n");
         printCardSettings();
-        printf("\r\n_____________________________________________________\r\n");
+         WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "\r\n_____________________________________________________\r\n");
     }
 
     void MainModel::AddCardSetting(uint8_t index)
@@ -474,7 +474,7 @@ namespace OHOS
         }
         (void)UtilsSetValue("card_setting", temp);
 
-        printf("\r\n***************AddCardSetting********************\r\n");
+         WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "\r\n***************AddCardSetting********************\r\n");
         printCardSettings();
     }
 
-- 
2.17.1