From ac9c046c22df05ee9b504e6fb778b54280a10921 Mon Sep 17 00:00:00 2001
From: hcj <1224667075@qq.com>
Date: Sat, 14 Sep 2024 16:31:30 +0800
Subject: [PATCH] =?utf8?q?=E6=97=A5=E5=8E=86=E4=BF=AE=E5=A4=8D=EF=BC=88?=
 =?utf8?q?=E8=A1=A5=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/calendar/src/CalendarView.cpp    | 67 +++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarView.cpp b/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarView.cpp
index 1f0d3ce6c..0864c98a3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarView.cpp
@@ -106,6 +106,7 @@ bool CalendarView::updata_label(int8_t type)
     {
         is_run=1;
     }
+
     if(show_m==2)
     {
         mon_max_day=28+is_run;
@@ -117,7 +118,9 @@ bool CalendarView::updata_label(int8_t type)
     else
     {
         mon_max_day=30;
+       
     }
+
     int y=show_y;
     int m=show_m;
     int week=0;
@@ -180,19 +183,27 @@ bool CalendarView::Label_init()
     {
         is_run=1;
     }
+
     if(m==2)
     {
         mon_max_day=28+is_run;
     }
-    else if (m==1||m==3||m==5 ||m==7||m== 8||m==10||m==12)
+    else if ( m==1 || 
+               m==3||
+               m==5||
+               m==7||
+               m== 8||
+               m==10||
+                 m==12)
     {
         mon_max_day=31;
-
+      
     }
     else
     {
         mon_max_day=30;
     }
+
     show_y=y;
     show_m=m;
     show_d=d;
@@ -244,53 +255,55 @@ bool CalendarView::Label_init()
         week_label[i]->SetVisible(true);
     }
     // Add Label to App
+        if (imageview == nullptr) {
+            imageview = new UIImageView();
+        }
+   
+        imageview->SetPosition(58, 140);      
+        imageview->Resize(50, 50);      
+        imageview->SetViewId("image1");
+        imageview->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36);
+        imageview->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
+        imageview->SetStyle(STYLE_BORDER_RADIUS, 100);
+        group->Add(imageview);
+        imageview->SetVisible(false);
+
   
     for(int i=0;i<31;i++)
     {
         if (day_label[i] == nullptr) {
         day_label[i] = new UILabel();
         }
+
+        day_label[i]->SetPosition(58, 140);         // widget's left position and top position
+        day_label[i]->Resize(50, 44);          // widget's width and height
+        day_label[i]->SetViewId("label3");// Set style
+        day_label[i]->SetStyle(STYLE_TEXT_FONT, 20);
+
+        day_label[i]->SetStyle(STYLE_BORDER_RADIUS, 100);
+
+        day_label[i]->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
+        day_label[i]->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+        day_label[i]->SetRollSpeed(0);
+        day_label[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+
         group->Add( day_label[i]);
         day_label[i]->SetVisible(false);
+
     }
-    
     for(int i=0;i<mon_max_day;i++)
     {
         int x=((i+week)%7);
         int y=((i+week)/7);
-
         day_label[i]->SetPosition(58+50*x, 140+44*y);         // widget's left position and top position
-        day_label[i]->Resize(50, 44);          // widget's width and height
-        day_label[i]->SetViewId("label3");// Set style
-        day_label[i]->SetStyle(STYLE_TEXT_FONT, 20);
-
         char day[5];
         sprintf(day,"%d",i+1);;
         day_label[i]->SetText(day);
-
         if(i+1==d)
         {
-            if (imageview == nullptr) {
-                imageview = new UIImageView();
-            }
             imageview->SetPosition(58+50*x, 140+44*y);      
-            imageview->Resize(50, 50);      
-            imageview->SetViewId("image1");
-            imageview->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36);
-            imageview->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-            imageview->SetStyle(STYLE_BORDER_RADIUS, 100);
-            group->Add(imageview);
             imageview->SetVisible(true);
         }
-       
-
-        day_label[i]->SetStyle(STYLE_BORDER_RADIUS, 100);
-
-        day_label[i]->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        day_label[i]->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        day_label[i]->SetRollSpeed(0);
-        day_label[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-
         day_label[i]->SetVisible(true);
     }
    
-- 
2.17.1