修复编译bug

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp
index 2b6b696..c7bed52 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaView.cpp
@@ -712,7 +712,7 @@ namespace OHOS
             progress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, Color::Red().full); // 红色
         } else {
             // 正常状态显示蓝色
-            progress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); // 蓝色
+            progress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, Color::White().full); // 蓝色
         }
 
         // 更新充电图标显示

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdGuideView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdGuideView.cpp
index c7b9e61..4ccec7e 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdGuideView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdGuideView.cpp
@@ -258,6 +258,14 @@ namespace OHOS
         if (qrcode_)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "start qrcode path:%s", ThunderBirdModel::GetInstance()->GetQrcodeContent().c_str());
+            
+            // 重新设置二维码的尺寸和样式，防止变小
+            qrcode_->SetPosition(133, 169, 104, 104);
+            qrcode_->SetStyle(STYLE_PADDING_LEFT, 4);
+            qrcode_->SetStyle(STYLE_PADDING_RIGHT, 4);
+            qrcode_->SetStyle(STYLE_PADDING_TOP, 4);
+            qrcode_->SetStyle(STYLE_PADDING_BOTTOM, 4);
+            
             qrcode_->SetQrcodeInfo(ThunderBirdModel::GetInstance()->GetQrcodeContent().c_str());
             //打印
             qrcode_->Invalidate();//刷新

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
index 9f1a511..2ae1307 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
@@ -1633,7 +1633,7 @@
                 //绑定成功
                 if(ThunderBirdMainView::GetInstance()){
                     int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图
-                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_BIND_SUCCESS);
+                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_BIND_SUCCESS);
                 }
                 bind_status = true;
                 return;