From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index edb4c08..5230ed5 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -96,7 +96,7 @@
middle.AddChidren(textBtn);
string s1 = "";
string s2 = "";
- textBox.TextChangeEventHandler += (sender, e) =>
+ textBox.TextChangeEventHandler += (sender, e) =>
{
var leng = e.Length;
if (leng > 50)
@@ -135,7 +135,6 @@
}
};
-
var btnsave = new Button
{
Y = middle.Height - Application.GetRealHeight(260),
@@ -163,15 +162,14 @@
alert.Show();
return;
}
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- ///鍙敼鎺ㄩ�佸唴瀹癸紱
- Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
- }
+ Send.Zj(true, Common.Logic.CurrentLogic);
RemoveFromParent();
};
+
+
+
+
}
}
}
--
Gitblit v1.8.0