From bba578c2f0acf2eca747edcb69426771e0cadd32 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 18:20:50 +0800
Subject: [PATCH] 2020-03-23-3
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 139 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 122 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
old mode 100755
new mode 100644
index 317bb6c..203f4c8
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -22,7 +22,10 @@
completeView.Btntitle.Text = common.DeviceEpointName;
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
- UserView.HomePage.Instance.ScrollEnabled = true;
+ if (!edit)
+ {
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ }
flMain.RemoveFromParent();
};
flMain.MouseUpEventHandler += clickcancel;
@@ -34,29 +37,31 @@
openView.titleBtn.TextID = MyInternationalizationString.open;
mFunView closeView = new mFunView();
- closeView.frameLayout.Y = openView.frameLayout.Bottom;
+ closeView.frameLayout.Y = Application.GetRealHeight(140 + 20+160);
+ // closeView.frameLayout.Y = openView.frameLayout.Bottom;
//completeView.Show(l).AddChidren(closeView.Show());
closeView.titleBtn.TextID = MyInternationalizationString.close;
mFunView takebackView = new mFunView();
- takebackView.frameLayout.Y = closeView.frameLayout.Bottom;
+ takebackView.frameLayout.Y = Application.GetRealHeight(140+20+160+160);
+ // takebackView.frameLayout.Y = closeView.frameLayout.Bottom;
//completeView.Show(l).AddChidren(takebackView.Show());
takebackView.titleBtn.TextID = MyInternationalizationString.onoff;
takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
-
+ #region -------杩涘害鏉℃帶浠�
var horizontalSeekBarRowLien = new RowLayout
{
- Y = openView.frameLayout.Bottom,
- Width = Application.GetRealWidth(920),
+ //Y = openView.frameLayout.Bottom,
+ Width = Application.GetRealWidth(915),
Height = Application.GetRealHeight(160),
X = Application.GetRealWidth(80),
LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
var horizontalSeekBarVol = new DiyImageSeekBar
{
- Y = openView.frameLayout.Bottom,
+ //Y = openView.frameLayout.Bottom,
X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(920),
+ Width = Application.GetRealWidth(915),
Height = Application.GetRealHeight(160),
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
@@ -64,9 +69,10 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
- SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
+ ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ SeekBarViewHeight = Application.GetRealHeight(5),//杩涘害鏉＄殑楂樺害10
};
+ #endregion
#endregion
#region -------鏁版嵁澶勭悊閮ㄥ垎
@@ -207,7 +213,9 @@
completeView.Show(l).AddChidren(openView.Show());
completeView.Show(l).AddChidren(closeView.Show());
+ //closeView.frameLayout.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(takebackView.Show());
+ //takebackView.frameLayout.Y = closeView.frameLayout.Bottom;
takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
#endregion
@@ -485,13 +493,96 @@
break;
case DeviceType.DoorLock:
{
+ if (_if[0] == "condition")
+ {
+ flMain.RemoveFromParent();
+ var memberList = new MemberList();
+ UserView.HomePage.Instance.AddChidren(memberList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ MemberList.edit = false;
+ memberList.Show(common);
+ }
+ else
+ {
+ completeView.Btntitle.TextID = MyInternationalizationString.openmode;
+ completeView.Show(2).AddChidren(openView.Show());
+ completeView.Show(2).AddChidren(closeView.Show());
+ openView.titleBtn.TextID = MyInternationalizationString.logicopen;
+ closeView.titleBtn.TextID = MyInternationalizationString.logicclose;
+ //闂ㄩ攣鏁版嵁鐗规畩锛岃繘琛岀壒娈婂鐞�;
+ if (actionsInfo.ContainsKey("LinkType"))
+ {
+ actionsInfo.Remove("LinkType");
+ }
+ //鐩爣闂ㄩ攣绫诲瀷鏄�8锛�
+ actionsInfo.Add("LinkType", 8);
+ if (actionsInfo.ContainsKey("TaskList"))
+ {
+ actionsInfo.Remove("TaskList");
+ }
+ if (actionsInfo.ContainsKey("Time"))
+ {
+ actionsInfo.Remove("Time");
+ }
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ ///
+ openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ openView.selectedIconBtn.Visible = true;
+ closeView.selectedIconBtn.Visible = false;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ SelectedDeviceStatus = "DoorLock";
+ if (actionsInfo.ContainsKey("PassData"))
+ {
+ actionsInfo.Remove("PassData");
+ }
+ actionsInfo.Add("PassData", "055704010112");//闂ㄩ攣甯稿紑
+ };
+ ///鐐瑰嚮鍙栨秷浜嬩欢
+ closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ openView.selectedIconBtn.Visible = false;
+ closeView.selectedIconBtn.Visible = true;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ SelectedDeviceStatus = "DoorLock";
+ if (actionsInfo.ContainsKey("PassData"))
+ {
+ actionsInfo.Remove("PassData");
+ }
+ actionsInfo.Add("PassData", "055704010113");//闂ㄩ攣甯稿叧
- flMain.RemoveFromParent();
- var memberList = new MemberList();
- UserView.HomePage.Instance.AddChidren(memberList);
- UserView.HomePage.Instance.PageIndex += 1;
- MemberList.edit = false;
- memberList.Show(common);
+ };
+ if (edit)
+ {
+ foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+ {
+ if (deviceinfo["LinkType"].ToString() == "8")
+ {
+ if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ {
+ if (deviceinfo["PassData"].ToString() == "055704010112")
+ {//寮�鍚�
+ openView.selectedIconBtn.Visible = true;
+ closeView.selectedIconBtn.Visible = false;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ }
+ else
+ {//鍏抽棴
+ openView.selectedIconBtn.Visible = false;
+ closeView.selectedIconBtn.Visible = true;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
}
break;
case DeviceType.TemperatureSensor:
@@ -631,8 +722,12 @@
taskListInfo.Add(switchdictionary);
completeView.Show(l).AddChidren(openView.Show());
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+ horizontalSeekBarRowLien.Y = openView.frameLayout.Bottom;
+ horizontalSeekBarVol.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(horizontalSeekBarRowLien);
completeView.Show(l).AddChidren(horizontalSeekBarVol);
+
closeView.frameLayout.Y = horizontalSeekBarRowLien.Bottom;
completeView.Show(l).AddChidren(closeView.Show());
@@ -748,6 +843,9 @@
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+ horizontalSeekBarRowLien.Y = openView.frameLayout.Bottom;
+ horizontalSeekBarVol.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(horizontalSeekBarRowLien);
completeView.Show(l).AddChidren(horizontalSeekBarVol);
@@ -1194,7 +1292,14 @@
}
else
{ //娣诲姞鐩爣
- LogicIfon.AddDeviceactions(common, actionsInfo);
+ if (SelectedDeviceStatus == "DoorLock")
+ {//闂ㄩ攣鏁版嵁鐗规畩,杩涜鐗规畩澶勭悊;
+ LogicIfon.AddDoorLockActions(common, actionsInfo);
+ }
+ else
+ {
+ LogicIfon.AddDeviceActions(common, actionsInfo);
+ }
}
}
else
--
Gitblit v1.8.0