合并设置表盘

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp
index 8c8ca90..ad5ee87 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp
@@ -20,8 +20,8 @@
  #include "components/ui_label.h"
  #include "custom_runtime.h"
 
-//  #include "main/include/PullUpDownView.h"
-//  #include "message/include/MessageControlView.h"
+ #include "main/include/PullUpDownView.h"
+ #include "message/include/MessageControlView.h"
 #include "uicomponents/UIComponents.h"
 
  #include "ui_resource_image.h"
@@ -155,26 +155,26 @@
      /*配置自定义表盘*/
      void MainClockView::SetCustomId(int Id)
      {
-        //  // 默认表盘和异常表盘采用原表盘配置
-        //  if (Id == DIAL_CLOCK || Id > DIAL_MAX)
-        //      return;
- 
-        //  DialLayout dialconfig;
-        //  if (SetDialModel::GetInstance().loadDialConfig(Id, dialconfig))
-        //  {
-        //      // 设置背景
-        //      dialFile = SetDialModel::GetInstance().GetSaveDir(Id) + "/" + "main_bg.bin";
-        //      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dialFile is %s", dialFile.c_str());
- 
-        //      // 设置表盘配置
-        //      timePosition = static_cast<TimeDisplayPosition>(dialconfig.timeDisplay);
-        //      batterySetting = static_cast<BatteryDisplayType>(dialconfig.batteryDisplay);
-        //      colorType = static_cast<ColorTypeSet>(dialconfig.colorTypeSet);
-        //  }
-        //  else
-        //  {
-        //      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "custom_id [%d] file is error! ", Id);
-        //  }
+         // 默认表盘和异常表盘采用原表盘配置
+         if (Id == DIAL_CLOCK || Id > DIAL_MAX)
+             return;
+ 
+         DialLayout dialconfig;
+         if (SetDialModel::GetInstance().loadDialConfig(Id, dialconfig))
+         {
+             // 设置背景
+             dialFile = SetDialModel::GetInstance().GetSaveDir(Id) + "/" + "main_bg.bin";
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dialFile is %s", dialFile.c_str());
+ 
+             // 设置表盘配置
+             timePosition = static_cast<TimeDisplayPosition>(dialconfig.timeDisplay);
+             batterySetting = static_cast<BatteryDisplayType>(dialconfig.batteryDisplay);
+             colorType = static_cast<ColorTypeSet>(dialconfig.colorTypeSet);
+         }
+         else
+         {
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "custom_id [%d] file is error! ", Id);
+         }
      }
  
      /*设置表盘背景*/

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
index 6271840..171c632 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
@@ -601,22 +601,23 @@ int32_t SetDialModel::ParseDialHeader(int type, const std::string &dialFileName,
     return -1;
   }
   DialPreviewInfo preInfo{0};
-  bool ret = DialBinParserManager::GetInstance()->GetDialPreviewInfo(fp, &preInfo);
+  bool ret =
+      DialBinParserManager::GetInstance()->GetDialPreviewInfo(fp, &preInfo);
   if (!ret) {
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetDialPreviewInfo %s fail",
                   dialFullName.c_str());
     fclose(fp);
     return -1;
   }
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialFullName: %s",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialFullName: %s",
                 dialFullName.c_str());
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialName: %s",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader dialName: %s",
                 preInfo.dialName);
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader description: %s",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader description: %s",
                 preInfo.description);
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader previewImgId: %u",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader previewImgId: %u",
                 preInfo.imgId);
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader imageOffset: %u",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ParseDialHeader imageOffset: %u",
                 preInfo.offset);
   ImageInfo *info = ImageCacheManager::GetInstance().LoadOneInMultiRes(
       preInfo.imgId, dialFullName, fp, false, preInfo.offset);
@@ -958,7 +959,8 @@ void SetDialModel::CheckDialSpace() {
   //   if (offlinedial_num <= 0) {
   //     //离线表盘个数已到上限
   //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
-  //                   "CheckDialSpace: Offline dial count %d", offlinedial_num);
+  //                   "CheckDialSpace: Offline dial count %d",
+  //                   offlinedial_num);
   //     downloadstate = false;
   //     return;
   //   } else {
@@ -966,7 +968,8 @@ void SetDialModel::CheckDialSpace() {
   //     downloadstate = SystemLogModel::GetInstance()->canSyncFile(
   //         TOTAL_DIAL_SPACE_PATH, TOTAL_DIAL_SPACE, download_dialSize);
   //     //离线表盘
-  //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDialSpace: Offline dial %d",
+  //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDialSpace: Offline dial
+  //     %d",
   //                   downloadstate);
   //     return;
   //   }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
index 3d696e8..462eb97 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
@@ -56,6 +56,7 @@ namespace OHOS
     void SetDialPresenter::OnClickAction(void)
     {
         uint8_t pageIndex = view_->GetCoverflowPage();
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetDialPresenter::OnClickAction pageIndex:%d", pageIndex);
         model->SaveDialSetting(pageIndex);
         /*切换当前表盘*/
         NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);