From 7584dea0241cefc276a4b5311331aee1dcda6c80 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 11:44:41 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
index 0d28f9d..76f446d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs
@@ -9,7 +9,7 @@
{
public AddControl()
{
- Tag = "Pir";
+ Tag = "PirView";
}
public void Show(Control control)
{
@@ -103,7 +103,7 @@
VerticalScrolViewLayout vv = new VerticalScrolViewLayout();
frameLayout.AddChidren(vv);
- RefreshView(vv, false);
+ RefreshView(vv, false, control);
#endregion
#region 鐣岄潰鐐瑰嚮浜嬩欢
@@ -117,13 +117,13 @@
topView.topIconBtn.Text = Language.StringByID(StringId.wancheng);
topView.topIconBtn.TextSize = TextSize.text14;
topView.topIconBtn.TextColor = CSS.CSS_Color.textColor;
- RefreshView(vv, true);
+ RefreshView(vv, true, control);
}
else
{
topView.topIconBtn.UnSelectedImagePath = "PirIcon/del.png";
topView.topIconBtn.Text = "";
- RefreshView(vv, false);
+ RefreshView(vv, false, control);
}
@@ -151,7 +151,6 @@
view.RemoveFromParent();
}
}
- //MainPage.BasePageView.RemoveViewByTag("Pir");
AddControlComplete addControlComplete = new AddControlComplete();
MainPage.BasePageView.AddChidren(addControlComplete);
addControlComplete.Show(control,false);
@@ -164,18 +163,18 @@
/// </summary>
/// <param name="vv">涓婁笅婊戝姩鎺т欢</param>
/// <param name="if_bool">琛ㄧず鏄惁鏄剧ず鍒犻櫎鍥炬爣</param>
- void RefreshView(VerticalScrolViewLayout vv, bool if_bool)
+ void RefreshView(VerticalScrolViewLayout vv, bool if_bool, Control control)
{
vv.RemoveAll();
//瀹氫箟涓�涓彉閲忚褰曡鏁�
int sum = 0;
- if (Pir.BuottonList.Count % 3 == 0)
+ if (control.status.Count % 3 == 0)
{
- sum = Pir.BuottonList.Count / 3;
+ sum = control.status.Count / 3;
}
else
{
- sum = Pir.BuottonList.Count / 3 + 1;
+ sum = control.status.Count / 3 + 1;
}
//璁＄畻鍔犺浇鍑烘潵鐨勬暟鎹渶瑕佺殑楂樺害
int h = 16 + sum * (16 + 44) + 104 + 76;
@@ -186,9 +185,9 @@
Height = Application.GetRealWidth(h),
};
vv.AddChidren(FLayout);
- for (int i = 1, j = 0; i <= Pir.BuottonList.Count; i++, j++)
+ for (int i = 1, j = 0; i <= control.status.Count; i++, j++)
{
- var nameObj = Pir.BuottonList[i - 1];
+ var nameObj = control.status[i - 1];
//鎸夐挳
var buttonNameBtn = new Button
{
@@ -223,7 +222,7 @@
//鍒犻櫎鍥炬爣鐨勭偣鍑讳簨浠�
delIconBtn.MouseUpEventHandler += (sender, e) =>
{
- var obj = delIconBtn.Tag as ButtonObj;
+ var obj = delIconBtn.Tag as Entity.AttributesStatus;
//鍔犺浇log
Loading loading = new Loading();
this.AddChidren(loading);
@@ -234,7 +233,7 @@
try
{
//鍙戦�佹寜閿垹闄わ紱
- responsePackNew = PirSend.CodeRemove(obj);
+ responsePackNew = PirSend.CodeRemove(obj, control.deviceId);
}
catch { }
finally
@@ -245,12 +244,12 @@
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
///杩欓噷锛氱洃鍚琈TTP鎺ㄩ�佷笅鏉ヤ富棰橈紝鎵嶇煡閬撴槸鍚︽坊鍔犳垚鍔�
- var buttonObj = Pir.BuottonList.Find((c) => c.value == obj.value);
+ var buttonObj = control.status.Find((c) => c.value == obj.value);
if (buttonObj != null)
{
- Pir.BuottonList.Remove(buttonObj);
+ control.status.Remove(buttonObj);
}
- RefreshView(vv, true);
+ RefreshView(vv, true, control);
}
else {
Method method = new Method();
--
Gitblit v1.8.0