From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
index 93a3a2a..637efc3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
@@ -15,7 +15,12 @@
{
Tag = "Logic";
}
- public void Show ()
+ /// <summary>
+ /// 娣诲姞鐩爣鍔熻兘绫�
+ /// </summary>
+ /// <param name="str1">璁惧鐣岄潰璇嗗埆瀛楃涓�</param>
+ /// <param name="str2">鍦烘櫙鐣岄潰璇嗗埆瀛楃涓�</param>
+ public void Show (string str1,string str2)
{
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -30,7 +35,7 @@
var middle = new FrameLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -46,7 +51,7 @@
var roomAndDeviceView = new RoomAndDeviceView();
UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
UserView.HomePage.Instance.PageIndex += 1;
- roomAndDeviceView.IfType = LogicView.IfString.Action_Logic;
+ roomAndDeviceView.IfType = str1;
roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.addaction));
};
@@ -63,7 +68,7 @@
var addScenePage = new AddScenePage();
UserView.HomePage.Instance.AddChidren(addScenePage);
UserView.HomePage.Instance.PageIndex += 1;
- addScenePage.Show(LogicView.IfString.Action_LogicScene);
+ addScenePage.Show(str2);
};
#endregion
@@ -72,7 +77,16 @@
securityview.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
securityview.funnameBtn.TextID = MyInternationalizationString.securitymode;
securityview.funFrameLayout.Y = sceneview.funFrameLayout.Bottom;
- middle.AddChidren(securityview.FunFrameView());
+ if (str1 == LogicView.IfString.Action_Logic)
+ { ///鑱斿姩浜嬩欢杈撳嚭-涓嶆敮鎸佸畨闃叉ā寮�
+ ///鑷姩鍖栬緭鍑�-鏀寔瀹夐槻妯″紡
+ middle.AddChidren(securityview.FunFrameView());
+ }
+ else
+ {
+ ///鏀瑰彉鏈�鍚庡姛鑳藉揩绾挎潯棰滆壊
+ sceneview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ }
securityview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var securityMode = new SecurityMode();
@@ -89,8 +103,14 @@
delayedview.iconBtn.UnSelectedImagePath = "ZigeeLogic/delay.png";
delayedview.funnameBtn.TextID = MyInternationalizationString.delayed;
delayedview.funFrameLayout.Y = securityview.funFrameLayout.Bottom;
- delayedview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
- middle.AddChidren(delayedview.FunFrameView());
+ delayedview.funFrameLayout.Height = Application.GetRealHeight(160 + 20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
+ delayedview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor; ///鏀瑰彉鏈�鍚庡姛鑳藉揩绾挎潯棰滆壊
+ if (str1 == LogicView.IfString.Action_Logic)
+ {
+ ///鑱斿姩浜嬩欢杈撳嚭-涓嶆敮鎸佸欢鏃�
+ ///鑷姩鍖栬緭鍑�-鏀寔寤舵椂
+ middle.AddChidren(delayedview.FunFrameView());
+ }
delayedview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var delayTime = new DelayTime();
--
Gitblit v1.8.0