去除不必要的打印

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