From ea1170dbf995a8bd72d919ba48301a8063911578 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 08 四月 2022 13:45:04 +0800
Subject: [PATCH] 2022年04月08日13:44:59
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index 7402009..dbe2972 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -9,13 +9,13 @@
{
public FunTpye(string str)
{
- if_type = str;
+ if_Type = str;
}
/// <summary>
/// 琛ㄧず鏄�(鏉′欢/鐩爣)
/// </summary>
- private string if_type;
-
+ private string if_Type;
+ Loading loading = new Loading();
/// <summary>
/// 璁惧鍔熻兘ui
/// </summary>
@@ -23,6 +23,7 @@
/// <param name="bottm"></param>
/// <param name="funCount">鏀寔鍔熻兘绫诲瀷涓暟<琛ㄧず涓婇潰鎵�鍗犻珮搴�></param>
public void FunTypeView(FrameLayout viewLayout,int bottm,int funCount) {
+ viewLayout.AddChidren(loading);
LogicView.FunAllAreaView funAllAreaView = new LogicView.FunAllAreaView();
funAllAreaView.frameLayout.Y = bottm + Application.GetRealHeight(8);
viewLayout.AddChidren(funAllAreaView.FLayoutView());
@@ -120,7 +121,7 @@
///鍒囨崲鎴块棿榛樿:鍏ㄩ儴鍔熻兘
UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);
///鑾峰彇鏄剧ず璁惧鍒楄〃
- var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_type);
+ var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_Type);
this.LoadingDeviceListView(vv, list);
};
@@ -138,7 +139,7 @@
{
//鑾峰彇鏈�缁堟樉绀哄垪琛�
- var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_type);
+ var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);
//鑾峰彇璁惧鍒楄〃鐨勭被鍨嬶紙渚嬪锛氱伅鍏夌被锛岀獥甯樼被銆傘�傘�傦級
var deviceTypeList = LogicMethod.CurrLogicMethod.GetDeviceTypeList(functionList);
if (deviceTypeList.Count == 0)
@@ -237,7 +238,7 @@
funAllAreaView.btnText2.MouseUpEventHandler += funClick;
funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;
///鑾峰彇鎴块棿鏀寔鐨勮澶囧垪琛�
- var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_type);
+ var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);
///鑾峰彇璁惧鍗曚釜澶х被spk鍒楄〃锛堜緥濡�:鐏厜绫�,绌鸿皟绫�...锛�
var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
@@ -247,6 +248,7 @@
///璁惧澶х被鍚嶇О<鐏厜绫汇�傘�傘�傘�傘��>
funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
this.LoadingDeviceListView(vv, lists);
+
}
@@ -257,10 +259,12 @@
/// <param name="deviceList"></param>
private void LoadingDeviceListView(VerticalScrolViewLayout verticalScrolView, List<HDL_ON.Entity.Function> deviceList)
{
+ loading.Start();
System.Threading.Tasks.Task.Run(() =>
{
Application.RunOnMainThread(() =>
{
+ loading.Hide();
verticalScrolView.RemoveAll();
foreach (var dev in deviceList)
{
@@ -276,7 +280,7 @@
funView.btnRoomName.Text = dev.GetRoomListName();
funView.btnClick.MouseUpEventHandler += (sen, e) =>
{
- if (if_type == LogicMethod.condition_if)
+ if (if_Type == LogicMethod.condition_if)
{
ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
MainPage.BasePageView.AddChidren(conditionDeviceFunList);
@@ -293,7 +297,9 @@
};
}
+
});
+
});
}
}
--
Gitblit v1.8.0