From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:34:32 +0800
Subject: [PATCH] 2024年07月25日17:33:40

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs |   87 +++++++++++++++++++++----------------------
 1 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs
index f1091a7..46448a5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs
@@ -14,7 +14,7 @@
     {
         FrameLayout bodyView;
 
-        VerticalRefreshLayout contentView;
+        VerticalScrolViewLayout contentView;//VerticalRefreshLayout
 
         List<IntegratedBrand_Iot> brandList;
 
@@ -26,22 +26,24 @@
 
         public void LoadPage()
         {
-           
 
-            new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount)).LoadTopView(CSS_Color.MainBackgroundColor);
+
+            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount));
+            topView.maginY = 10;
+            topView.LoadTopView(CSS_Color.MainBackgroundColor);
 
             bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
 
             bodyView.AddChidren(new Button
             {
-                Y = Application.GetRealHeight(64),
+                Y = Application.GetRealHeight(64+10),
                 Height = Application.GetRealHeight(1),
                 BackgroundColor = CSS_Color.DividingLineColor,
             });
 
             Button btnTipText = new Button()
             {
-                Y = Application.GetRealHeight(80),
+                Y = Application.GetRealHeight(80+10),
                 Width = Application.GetRealWidth(347),
                 Height = Application.GetRealHeight(65),
                 Gravity = Gravity.CenterHorizontal,
@@ -55,11 +57,16 @@
                 TextAlignment = TextAlignment.CenterLeft,
             };
             bodyView.AddChidren(btnTipText);
-             
-            contentView = new VerticalRefreshLayout()
+            if (Language.CurrentLanguage != "Chinese")
             {
-                Y = Application.GetRealHeight(150),
-                Height = Application.GetRealHeight(573),
+                btnTipText.Text = "Synchronize your devices on the third-party platform to on Pro for control by binding the third-party platform account to the cloud connection";
+            }
+
+
+            contentView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(150+10),
+                Height = Application.GetRealHeight(573-10),
             };
             bodyView.AddChidren(contentView);
 
@@ -68,18 +75,15 @@
 
             GetBindList();
 
-            contentView.BeginHeaderRefreshingAction = () =>
-            {
-                contentView.EndHeaderRefreshing();
-                GetBindList();
-            };
-
-            LoadRow();
-
+            //contentView.BeginHeaderRefreshingAction = () =>
+            //{
+            //    contentView.EndHeaderRefreshing();
+            //    GetBindList();
+            //};
 
         }
         /// <summary>
-        /// 鑾峰彇缁戝畾鍒楄〃
+        /// 鑾峰彇鍒楄〃
         /// </summary>
         void GetBindList()
         {
@@ -130,14 +134,12 @@
         void LoadRow()
         {
             contentView.RemoveAll();
-            bool isFrist = true;
-
-            brandList.Add(new IntegratedBrand_Iot
-            {
-                authBrandNameCn = "Test Hdl",
-                authBrandNameEn = "Test Hdl",
-                hasAuthorization = false
-            });
+            //brandList.Add(new IntegratedBrand_Iot
+            //{
+            //    authBrandNameCn = "Test Hdl",
+            //    authBrandNameEn = "Test Hdl",
+            //    hasAuthorization = false
+            //});
 
             foreach (var brand in brandList)
             {
@@ -149,22 +151,15 @@
                 };
                 contentView.AddChidren(row);
 
-                //if (isFrist)
-                //{
-                //    isFrist = false;
-                //}
-                //else
+                Button btnLine = new Button()
                 {
-                    Button btnLine = new Button()
-                    {
-                        Y = Application.GetRealWidth(86),
-                        Gravity = Gravity.CenterHorizontal,
-                        Width = Application.GetRealWidth(343),
-                        Height = 1,
-                        BackgroundColor = CSS_Color.DividingLineColor,
-                    };
-                    row.AddChidren(btnLine);
-                }
+                    Y = Application.GetRealWidth(86),
+                    Gravity = Gravity.CenterHorizontal,
+                    Width = Application.GetRealWidth(343),
+                    Height = 1,
+                    BackgroundColor = CSS_Color.DividingLineColor,
+                };
+                row.AddChidren(btnLine);
 
                 ImageView btnIcon = new ImageView()
                 {
@@ -209,9 +204,8 @@
                 };
                 row.AddChidren(btnName);
                 //涓嬭浇绗笁鏂瑰搧鐗宨con
-                //ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.authrBandIconUrl, btnIcon);
-
-                btnName.MouseUpEventHandler = (sender, e) => {
+                ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.authBrandIconUrl, btnIcon);
+                EventHandler<MouseEventArgs> eventHandler =  (sender, e) => {
                     if (brand.hasAuthorization)
                     {
                         Action unboundAction = () =>
@@ -243,6 +237,11 @@
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                     }
                 };
+
+                btnRight.MouseUpEventHandler = eventHandler;
+                row.MouseUpEventHandler = eventHandler;
+                btnName.MouseUpEventHandler = eventHandler;
+                btnBindTip.MouseUpEventHandler = eventHandler;
             }
 
         }

--
Gitblit v1.8.0