From: hcj <1224667075@qq.com>
Date: Sat, 20 Jul 2024 08:43:00 +0000 (+0800)
Subject: 表冠测试修改
X-Git-Tag: release_V1.2.70_20241020_135402~745^2~23
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=08ecb3e84175d560a209350e7db4c30db09396ca;p=mirrors%2FFD230.git

表冠测试修改
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h
index 9c646c29d..0a3d4da92 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h
@@ -51,7 +51,7 @@ namespace OHOS
         bool testBUTTONScrollViewcrollViewinit(uint8_t);
         UIScrollView *testBUTTONScrollView{nullptr};
         UILabelButtonExt* labelButton_next = nullptr;
-        UILabelButtonExt* button[3]{nullptr};
+        UILabelButtonExt* button[10]{nullptr};
         UILabel *label_crown{nullptr};
         UILabel *Title{nullptr};           // 标题
         bool initViewStatus{false};
diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
index 1702f6b01..af099e860 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
@@ -48,21 +48,13 @@ namespace OHOS
         {
             testBUTTONScrollView->RemoveAll();
             testBUTTONScrollView->ClearFocus();
-
-            if(button[0])
-            {
-                delete button[0];
-                button[0]=nullptr;
-            }
-            if(button[1])
+            for(int i=0;i<10;i++)
             {
-                delete button[1];
-                button[1]=nullptr;
-            }
-            if(button[2])
-            {
-                delete button[2];
-                button[2]=nullptr;
+                if(button[i])
+                {
+                    delete button[i];
+                    button[i]=nullptr;
+                }
             }
             
             if(labelButton_next)
@@ -262,7 +254,7 @@ namespace OHOS
         testBUTTONScrollView->Add(button[1]);
 
         buttonconfig.x = 80;
-        buttonconfig.y = 300;
+        buttonconfig.y = 400;
         buttonconfig.w = 200;
         buttonconfig.h = 80;
         buttonconfig.label_x=40;
@@ -275,6 +267,26 @@ namespace OHOS
         testBUTTONScrollView->Add(button[2]);
 
 
+        
+        for(int i=3;i<10;i++)
+        {
+            buttonconfig.x = 80;
+            buttonconfig.y +=250;
+            buttonconfig.w = 200;
+            buttonconfig.h = 80;
+            buttonconfig.label_x=40;
+            buttonconfig.label_y=0;
+            buttonconfig.Fontsize=25; 
+            char buf[16]={0};
+            sprintf(buf,"%d",buttonconfig.y );
+            buttonconfig.ViewId="crown::";
+            buttonconfig.str=buf;
+            buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
+            button[i]=SetTheButton_ext(buttonconfig);
+            testBUTTONScrollView->Add(button[i]);
+        }
+
+        testBUTTONScrollView ->SetYScrollBarVisible(true); // 设置滑动滚动条
 
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::testPresenter::GetInstance();
         RootView::GetInstance()->SetOnKeyActListener(keyactListener);