From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
index ea61167..053765d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
@@ -38,22 +38,24 @@
                 };
                 page.LoadPage(brand_Iot);
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-            }; 
-            new TopViewDiv(bodyView, brand_Iot.brandName).LoadTopView_3tyIot(action);
+            };
+            var topView = new TopViewDiv(bodyView, brand_Iot.brandName);
+            topView.maginY = 10;
+            topView.LoadTopView_3tyIot(action);
 
             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,
@@ -74,8 +76,8 @@
 
             contentView = new FrameLayout()
             {
-                Y = Application.GetRealHeight(150),
-                Height = Application.GetRealHeight(573),
+                Y = Application.GetRealHeight(150+10),
+                Height = Application.GetRealHeight(573-10),
             };
             bodyView.AddChidren(contentView);
 
@@ -121,7 +123,7 @@
                 Y = Application.GetRealHeight(667 - 80),
                 Height = Application.GetRealHeight(90),
                 Radius = (uint)Application.GetRealWidth(22),
-                Visible = false,
+                //Visible =false,
             };
             bodyView.AddChidren(optionView);
 
@@ -147,7 +149,7 @@
                 {
                     if (pack.Code == StateCode.SUCCESS)
                     {
-                        btnComfirm.Visible = false;
+                        optionView.Visible = false;
                     }
                 }
                 //var pack = http.Set3tyIotFunctionToHouse(function.deviceId, "0", brand_Iot.companyId);
@@ -317,16 +319,18 @@
                 Button btnClick = new Button();
                 view.AddChidren(btnClick);
                 btnClick.MouseUpEventHandler = (sender, e) => {
-                    btnCheckIcon.IsSelected = function.collect = !function.collect;
                     if (optionList.Contains(function.deviceId))
                     {
+                        btnCheckIcon.IsSelected = function.collect = false;
                         optionList.Remove(function.deviceId);
                     }
                     else
                     {
+                        btnCheckIcon.IsSelected = function.collect = true;
                         optionList.Add(function.deviceId);
                     }
-                    optionView.Visible = true;
+                
+                    optionView.Visible =true;
                 };
                 if (function.homeId == DB_ResidenceData.Instance.CurrentRegion.id )
                 {
@@ -351,7 +355,7 @@
             var btnTip = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(88),
+                Y = Application.GetRealHeight(88 + 10),
                 Width = Application.GetRealWidth(180),
                 Height = Application.GetRealWidth(180),
                 UnSelectedImagePath = "TipNot.png",

--
Gitblit v1.8.0