From: Caisking <Casiking@zhihuishixun.com>
Date: Fri, 15 Aug 2025 04:15:23 +0000 (+0800)
Subject: 修复绑定界面无法进入主界面的bug
X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~182^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F2083%2F1;p=mirrors%2FFD230.git

修复绑定界面无法进入主界面的bug
---

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownModelC.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownModelC.h
index 53d8e4888..fb76906cf 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownModelC.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownModelC.h
@@ -13,6 +13,10 @@ extern "C"
 void uapi_add_bind_vote(void);
 void uapi_remove_bind_vote(void);
 
+#ifdef BLE_INSTRUCT
+void ble_watch_first_paired(void);
+#endif
+
 #ifdef __cplusplus
 #if __cplusplus
 }
diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
index 062ceb534..1fd98fa0c 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -123,12 +123,29 @@ namespace OHOS
         }
     }
 
+    void HandWatchFirstTimePaired(void)
+    {
+        SendMsgToUIService(UI_HAND_WATCH_FIRST_PAIRED, 0, nullptr, 0);
+    }
+
+
+
 #ifdef __cplusplus
     extern "C"
     {
 #endif
 
 #include "input_app.h"
+
+#ifdef BLE_INSTRUCT
+    #include "bleEvent.h"
+    #include "bleInstruct.h"
+    void ble_watch_first_paired(void)
+    {
+        bleInstruct_t.hand_watch_first_time_Paired = HandWatchFirstTimePaired;
+    }
+#endif
+
 #ifdef __cplusplus
     }
 #endif
diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
index 3e10a59b3..12f56af39 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -612,7 +612,7 @@ void TraingCardView ::InitView() {
   //  swipe_->HorAdd(DetailView);
   // swipe_->VerAdd(DetailView, UICrossView::VPage::DOWN_PAGE);
 
-  swipe_->SetHorCurrentPage(Control_Card::CONTROL); // 设置进入索引 [数据]
+  swipe_->SetHorCurrentPage(Control_Card::DATA); // 设置进入索引 [数据]
 
 
   RootView::GetInstance()->SetOnKeyActListener(presenter_);
diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TrainingDataView.cpp
index be8bfeee6..771f8b7db 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TrainingDataView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TrainingDataView.cpp
@@ -66,10 +66,10 @@ bool TrainingDataView ::InitPage() {
   circleProgress->SetCenterPosition(235, 235);
   circleProgress->SetRadius(215);
   circleProgress->SetStartAngle(215);
-  circleProgress->SetEndAngle(505);
+  circleProgress->SetEndAngle(505 + 100);
   circleProgress->SetCapType(CAP_ROUND);
-  circleProgress->SetValue(0);
-  Add(circleProgress);
+  circleProgress->SetValue(100);
+
 
   // 初始化Lable
   UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent();
@@ -92,6 +92,8 @@ bool TrainingDataView ::InitPage() {
   Add(heartlabel);
   Add(ubpmlabel);
 
+  Add(circleProgress);
+
   return true;
 
 #if 0
diff --git a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
index e815f57a8..690c28bec 100644
--- a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
+++ b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
@@ -11,6 +11,7 @@
 #include "SleepModel.h"
 #include "PlayersModel.h"
 #include "app_store.h"
+#include "rebootandshutdown/include/RebootAndShutdownModelC.h"
 
 void ble_instruct_init(void)
 {
@@ -36,4 +37,6 @@ void ble_instruct_init(void)
 
     ble_app_store_init();
 
+    ble_watch_first_paired();
+
 }
\ No newline at end of file