From 5b40f1da1d28616de3880857b38357eef7859b64 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 26 十一月 2020 17:51:35 +0800
Subject: [PATCH] 2020-11-26-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index e407af8..f09d0b0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -15,9 +15,14 @@
/// 榛樿閫変腑鏄埧闂存椂锛氬叏閮ㄥ尯鍩�
/// </summary>
private Entity.Room selectedRoom = new Entity.Room { sid = Language.StringByID(StringId.allAreas) };
-
- public void Show()
+ /// <summary>
+ /// 琛ㄧず鏄�(鏉′欢/鐩爣)
+ /// </summary>
+ private string if_type;
+ public void Show(string str)
{
+
+ if_type = str;
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
LogicView.TopView topView = new LogicView.TopView();
this.AddChidren(topView.FLayoutView());
@@ -115,7 +120,7 @@
funAllAreaView.btnText2.Text = Language.StringByID(StringId.allFun);
selectedRoom = (areaView.btnClick.Tag as Entity.Room);
///鑾峰彇鏄剧ず璁惧鍒楄〃
- var list = LogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room,LogicMethod.condition_if);
+ var list = LogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room,if_type);
DeviceListView(vv, list);
};
@@ -163,7 +168,7 @@
};
//鑾峰彇鏈�缁堟樉绀哄垪琛�
- var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, LogicMethod.condition_if);
+ var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
//鑾峰彇璁惧鍒楄〃鐨勭被鍨嬶紙渚嬪锛氱伅鍏夌被锛岀獥甯樼被銆傘�傘�傦級
var deviceTypeList = LogicMethod.GetDeviceTypeList(functionList);
@@ -213,7 +218,7 @@
funAllAreaView.btnText2.MouseUpEventHandler += funClick;
funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;
///鑾峰彇鏄剧ず璁惧鍒楄〃
- var deviceList = LogicMethod.GetFunctionDeviceList(selectedRoom, LogicMethod.condition_if);
+ var deviceList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
DeviceListView(vv, deviceList);
}
@@ -240,7 +245,7 @@
funView.btnClick.MouseUpEventHandler += (sen,e) => {
DeviceFunList deviceFunList = new DeviceFunList();
MainPage.BasePageView.AddChidren(deviceFunList);
- deviceFunList.Show(dev,0,false);
+ deviceFunList.Show(dev,0,false,if_type);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
--
Gitblit v1.8.0