From e35002d0869bd8b333eb4e8d1e4f96f18cd155a0 Mon Sep 17 00:00:00 2001
From: hcj <1224667075@qq.com>
Date: Sat, 19 Oct 2024 19:01:12 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E7=94=B5=E8=AF=9D=E7=95=8C?=
 =?utf8?q?=E9=9D=A2=E5=8A=A8=E7=94=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/phone/src/MainPhoneView.cpp      | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhoneView.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhoneView.cpp
index 2f7a118d2..78495ec68 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhoneView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhoneView.cpp
@@ -67,6 +67,8 @@ namespace OHOS
 
     void MainPhoneView::ClearAll(void)
     {
+        //container_->RemoveAll();
+
         if (MainPhoneViewScrollView != nullptr)
         {
             MainPhoneViewScrollView->RemoveAll();
@@ -147,14 +149,8 @@ namespace OHOS
             }
       
      
-            for(int i=0;i<CALL_LOG_MAX_NUM;i++)
-            {
-                if(info[i])
-                {
-                    UIFree(info[i]);
-                    info[i]=nullptr;
-                }
-            }
+           
+
             if(button_delete_all_calllog)
             {
                 delete button_delete_all_calllog;
@@ -179,6 +175,15 @@ namespace OHOS
                 p_LanguageSwitchListAdapter = nullptr;
             }
 
+            for(int i=0;i<CALL_LOG_MAX_NUM;i++)
+            {
+                if(info[i])
+                {
+                    UIFree(info[i]);
+                    info[i]=nullptr;
+                }
+            }
+
             
 
             delete MainPhoneViewScrollView;
@@ -224,8 +229,8 @@ namespace OHOS
         //CalllogList->SetReboundSize(30);
         //CalllogList->SetScrollBlankSize(20);
         CalllogList->SetStartIndex(0);
-        FocusManager::GetInstance()->RequestFocus(CalllogList);
-        FocusManager::GetInstance()->RequestFocusByDirection(FOCUS_DIRECTION_UP);
+        // FocusManager::GetInstance()->RequestFocus(CalllogList);
+        // FocusManager::GetInstance()->RequestFocusByDirection(FOCUS_DIRECTION_UP);
         CalllogList->SetRotateFactor(1.0);
 
         CalllogList->SetAdapter(p_LanguageSwitchListAdapter);
@@ -734,8 +739,11 @@ namespace OHOS
                 //    Init_button_calllog_SwipeView(info[i-1],y);
                 //    y++;
                 // }
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainPhoneViewListViewInit__");
                 MainPhoneViewListViewInit();
-               
+
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainPhoneViewListViewInit_end");
+
                MainPhoneView_ButtonConfig_ext_t buttonParam = {
                     .x = 38,
                     .y =  365+num*124,
@@ -828,8 +836,8 @@ namespace OHOS
         MainPhoneViewScrollView->Add(TelephoneLineImageView);
         MainPhoneViewScrollView->Add(NoCallsLabel);
         
-
-        RootView::GetInstance()->Add(MainPhoneViewScrollView);
+        container_=MainPhoneViewScrollView;
+        RootView::GetInstance()->Add(container_);
         Draw();
     }
 
-- 
2.17.1