From 649f0223cf1bacbc3df0eada80a839b0d58c7039 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:46:06 +0800
Subject: [PATCH] 更新温居城自动化代码
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 66 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index a7ced2e..6f9eee0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -38,7 +38,7 @@
this.AddChidren(topView.FLayoutView());
topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
-
+
RemoveFromParent();
};
@@ -57,35 +57,30 @@
Width = Application.GetRealWidth(82),
Height = Application.GetRealWidth(84),
UnSelectedImagePath = "PirIcon/add.png",
- Visible=false,
+ Visible = false,
};
middFLayout.AddChidren(addDevice);
- if (Pir.currPir.FunctioList.Count < 10)
- {
- //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
- // middFLayout.AddChidren(addDevice);
- addDevice.Visible = true;
- }
+
#endregion
#region 鐣岄潰鐐瑰嚮浜嬩欢
///涓嬫媺鍒锋柊鐣岄潰浜嬩欢
vv.BeginHeaderRefreshingAction += () =>
+ {
+ ////鍏抽棴鍒锋柊View锛�
+ vv.EndHeaderRefreshing();
+
+ PirMethod.GetControlList(this, () =>
{
- ////鍏抽棴鍒锋柊View锛�
- vv.EndHeaderRefreshing();
-
- Method.GetControlList(this, () =>
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
- {
- //鍒锋柊鐣岄潰
- UIView(vv);
- });
- }, Pir.currPir);
+ //鍒锋柊鐣岄潰
+ UIView(vv);
+ });
+ }, Pir.currPir);
- };
+ };
///璁剧疆鍥炬爣鐐瑰嚮浜嬩欢
topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -101,18 +96,18 @@
//杩涙潵涓嶅厑璁稿乏婊�
MainPage.BasePageView.ScrollEnabled = false;
View.Buttons buttons = new View.Buttons();
- buttons.AddFrameLayout(this, (if_value, view) =>
+ buttons.AddFrameLayout(this, (if_value, view) =>
{
//鍏抽棴鍏佽宸︽粦
MainPage.BasePageView.ScrollEnabled = true;
//1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�;
if (if_value == 7)
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.AddControl(this, (control) =>
{
- //鎴愬姛鍚庣Щ闄�;
- view.RemoveFromParent();
+ //鎴愬姛鍚庣Щ闄�;
+ view.RemoveFromParent();
AddButton addButton = new AddButton();
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(control);
@@ -121,7 +116,7 @@
}
else
{
- if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
+ if (if_value == 6)
{
new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
return;
@@ -131,8 +126,8 @@
GetDeviceTypeList(true, () =>
{
DeviceTypeViewClick(if_value);
- //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
- view.RemoveFromParent();
+ //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
+ view.RemoveFromParent();
});
}
@@ -141,7 +136,6 @@
DeviceTypeViewClick(if_value);
view.RemoveFromParent();
}
-
}
}, 7);
};
@@ -149,13 +143,18 @@
///鍒濆鍖栫晫闈�
UIView(vv);
}
-
/// <summary>
/// 鍔犺浇UI鐣岄潰
/// </summary>
/// <param name="vv">涓婁笅婊戞帶浠�</param>
private void UIView(VerticalRefreshLayout vv)
{
+ if (Pir.currPir.FunctioList.Count < 10)
+ {
+ //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
+ // middFLayout.AddChidren(addDevice);
+ addDevice.Visible = true;
+ }
vv.RemoveAll();
#region 绾㈠瀹濆浘鏍� 鐗堟湰鍙� 鍚嶇О 鐘舵��
FrameLayout fLayout = new FrameLayout
@@ -209,7 +208,7 @@
TipPopView tipPopView = new TipPopView();
tipPopView.TipBox(StringId.tip, text, (dialog) =>
{
- Method.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
+ PirMethod.ThreadSend(new Control { deviceId = control.deviceId }, (responsePackNew) =>
{
dialog.Close();
var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid);
@@ -233,7 +232,7 @@
{
EditControl editControl = new EditControl();
MainPage.BasePageView.AddChidren(editControl);
- editControl.Show(control,(device) =>
+ editControl.Show(control, (device) =>
{
//鍥炶皟鏇存柊鍚嶅瓧/鍖哄煙
controlView.nameBtn.Text = device.name;
@@ -258,7 +257,6 @@
/// <param name="if_value">鎺т欢绱㈠紩鍊�</param>
private void DeviceTypeViewClick(int if_value)
{
-
var strings = View.Buttons.GetTypeString(if_value).Split('-');
var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
if (jobDeviceType == null)
@@ -274,7 +272,6 @@
});
});
-
}
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
@@ -285,7 +282,6 @@
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
-
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
//娓呯┖涔嬪墠鏁版嵁
@@ -317,7 +313,7 @@
{
if (tag)
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.ErrorShow(responsePackNew, "");
}
}
@@ -364,7 +360,7 @@
}
else
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.ErrorShow(responsePackNew, "");
}
}, id, "鍝佺墝鍒楄〃");
--
Gitblit v1.8.0