From b1ced15165c0c120483f821079fc23c63d455e8e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 17:54:49 +0800
Subject: [PATCH] 2021-3-5-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
index 7a72667..d7b7c56 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
@@ -11,7 +11,8 @@
{
Tag = "PirView";
}
- public void Show() {
+ public void Show()
+ {
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
PirDevice.View.TopView topView = new View.TopView();
@@ -19,10 +20,25 @@
topView.topIconBtn.Visible = true;
this.AddChidren(topView.FLayoutView());
topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { this.RemoveFromParent(); };
- VerticalScrolViewLayout vv = new VerticalScrolViewLayout();
+ VerticalRefreshLayout vv = new VerticalRefreshLayout();
vv.Height = Application.GetRealHeight(667 - 64);
vv.Y = Application.GetRealHeight(64);
this.AddChidren(vv);
+ vv.BeginHeaderRefreshingAction += () =>
+ {
+ //鍏抽棴鍒锋柊View锛�
+ vv.EndHeaderRefreshing();
+ //鑾峰彇鍒楄〃
+ Method.GetPirDeviceList(this,() =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //鍒锋柊鐣岄潰
+ UIView(vv);
+ });
+ });
+
+ };
#endregion
UIView(vv);
@@ -31,16 +47,17 @@
/// 鍔犺浇UI鐣岄潰
/// </summary>
/// <param name="vv">涓婁笅婊戞帶浠�</param>
- void UIView(VerticalScrolViewLayout vv) {
+ void UIView(VerticalRefreshLayout vv)
+ {
vv.RemoveAll();
- int a = 3;
for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
+ var pirDevice = Pir.pirDeviceList[i];
#region 绾㈠瀹濆浘鏍� 鐗堟湰鍙� 鍚嶇О 鐘舵��
FrameLayout fLayout = new FrameLayout
{
Width = Application.GetRealWidth(375),
- Height = Application.GetRealHeight(12 + 92 + (50 * a)),
+ Height = Application.GetRealHeight(12 + 92 + (50 * pirDevice.FunctioList.Count)),
};
vv.AddChidren(fLayout);
@@ -50,7 +67,7 @@
Y = Application.GetRealHeight(12),
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(375 - 16 * 2),
- Height = Application.GetRealHeight(92 + (50 * a)),
+ Height = Application.GetRealHeight(92 + (50 * pirDevice.FunctioList.Count)),
BackgroundColor = CSS.CSS_Color.view,
Radius = (uint)Application.GetRealHeight(12),
};
@@ -75,7 +92,7 @@
X = priequipmentBtn.Right + Application.GetRealWidth(7),
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(20),
- Text = "绾㈠瀹滱" + i.ToString(),
+ Text = pirDevice.name,
TextAlignment = TextAlignment.CenterLeft,
TextSize = TextSize.text14,
TextColor = CSS.CSS_Color.textColor,
@@ -102,7 +119,7 @@
X = priequipmentBtn.Right + Application.GetRealWidth(7),
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(17),
- Text = "2",
+ Text = pirDevice.FunctioList.Count.ToString(),
TextAlignment = TextAlignment.CenterLeft,
TextSize = TextSize.text12,
TextColor = CSS.CSS_Color.textConfirmColor,
@@ -163,15 +180,16 @@
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(375 - 16 * 2),
Height = Application.GetRealHeight(92),
- BackgroundColor = CSS.CSS_Color.view,
+ BackgroundColor = 0x00000000, //CSS.CSS_Color.view,
Radius = (uint)Application.GetRealHeight(12),
Tag = Pir.pirDeviceList[i],
};
fLayout.AddChidren(clickFram);
- clickFram.MouseUpEventHandler += (sender, e) => {
+ clickFram.MouseUpEventHandler += (sender, e) =>
+ {
var pirclick = (clickFram.Tag as Pir);
- NewSwitchView( pirclick, vv);
+ NewSwitchView(pirclick, vv);
};
if (Pir.pirDeviceList.Count - 1 == i)
@@ -181,8 +199,9 @@
}
#endregion
- for (int j = 0; j < a; j++)
+ for (int j = 0; j < pirDevice.FunctioList.Count; j++)
{
+ var control = pirDevice.FunctioList[i];
RowLayout funControlRow = new RowLayout
{
Y = Application.GetRealHeight(92 + (50 * j)),
@@ -198,7 +217,7 @@
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(150),
Height = Application.GetRealHeight(20),
- Text = j.ToString(),
+ Text = control.name,
TextAlignment = TextAlignment.CenterLeft,
TextSize = TextSize.text14,
TextColor = CSS.CSS_Color.textColor,
@@ -239,6 +258,7 @@
TextColor = CSS.CSS_Color.textWhiteColor,
IsBold = true,
BackgroundColor = CSS.CSS_Color.textRedColor,
+ Tag = control,
};
funControlRow.AddRightView(delBtn);
//绾�
@@ -251,15 +271,54 @@
BackgroundColor = CSS.CSS_Color.viewLine,
};
funControlRow.AddChidren(line1Btn);
- if (j == a - 1)
+ if (j == pirDevice.FunctioList.Count - 1)
{
//鏈�鍚庢敼鍙樹竴涓嚎鐨勯鑹�
line1Btn.BackgroundColor = CSS.CSS_Color.viewTranslucence;
funControlRow.LineColor = CSS.CSS_Color.viewTranslucence;
}
- delBtn.MouseUpEventHandler += (sender, e) => {
+ delBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var Function = delBtn.Tag as Entity.Function;
+ //鍔犺浇log
+ Loading loading = new Loading();
+ this.AddChidren(loading);
+ HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
+ loading.Start();
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ responsePackNew = PirSend.DeleteDevice(Function.deviceId);
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ try
+ {
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ pirDevice.FunctioList.Remove(Function);
+ UIView(vv);
+ }
+ else
+ {
+ Method method = new Method();
+ method.ErrorShow(responsePackNew);
+ }
+ }
+ catch { }
+
+ });
+ }
+
+ })
+ { IsBackground = true }.Start();
};
}
@@ -272,7 +331,8 @@
/// </summary>
/// <param name="pirclick"></param>
/// <param name="vv"></param>
- void NewSwitchView(Pir pirclick,VerticalScrolViewLayout vv) {
+ void NewSwitchView(Pir pirclick, VerticalRefreshLayout vv)
+ {
FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
this.AddChidren(frame);
SwitchView switchView = new SwitchView();
@@ -324,7 +384,8 @@
})
{ IsBackground = true }.Start();
- }, () => {
+ }, () =>
+ {
NewSwitchView(pirclick, vv);
}, false);
@@ -333,7 +394,8 @@
{
string text = Language.StringByID(StringId.shanchushebei) + pirclick.name + "?";
TipPopView tipPopView = new TipPopView();
- tipPopView.TipBox(StringId.tip, text, (dialog) => {
+ tipPopView.TipBox(StringId.tip, text, (dialog) =>
+ {
//鍔犺浇log
Loading loading = new Loading();
dialog.AddChidren(loading);
@@ -368,12 +430,15 @@
})
{ IsBackground = true }.Start();
- }, () => {
+ }, () =>
+ {
NewSwitchView(pirclick, vv);
}, false);
}
});
}
+
+
}
}
--
Gitblit v1.8.0