From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
index b10aae1..fea62b3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
@@ -56,7 +56,7 @@
             FrameLayout frameLayout = new FrameLayout
             {
                 Y = Application.GetRealHeight(64 + 84),
-                Height = Application.GetRealHeight(667 - 64 - 84),
+                Height = Application.GetRealHeight(667 - 64 - 84-104),
                 Width = Application.GetRealWidth(TextSize.view375),
             };
             this.AddChidren(frameLayout);
@@ -143,7 +143,7 @@
                 //绉婚櫎褰撳墠鐣岄潰
                 this.RemoveFromParent();
                 //鍙兘涔嬪墠宸茬粡瀛樺湪璇ョ晫闈�
-                Method.RemoveView("AddControlComplete");
+                PirMethod.RemoveView("AddControlComplete");
                 AddControlComplete addControlComplete = new AddControlComplete();
                 MainPage.BasePageView.AddChidren(addControlComplete);
                 addControlComplete.Show(control, false);
@@ -162,7 +162,7 @@
             View.Buttons buttons = new View.Buttons();
             buttons.AddButton2(vv, control.status, (obj) =>
             {
-                Method.ThreadSend(control, (responsePackNew) =>
+                PirMethod.ThreadSend(control, (responsePackNew) =>
                 {
                     var buttonObj = control.status.Find((c) => c.value == obj.value);
                     if (buttonObj != null)

--
Gitblit v1.8.0