From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 50 +++++++++++++++-----------------------------------
1 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 9412a75..1501165 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -19,7 +19,7 @@
UserView.HomePage.Instance.ScrollEnabled = false;
CompleteView completeView = new CompleteView();
flMain.AddChidren(completeView.Show(1));
- completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
+ completeView.Btntitle.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
if (edit)
@@ -69,8 +69,9 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
- SeekBarViewHeight = Application.GetRealHeight(5),//杩涘害鏉＄殑楂樺害10
+ ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ SeekBarViewHeight = Application.GetRealHeight(6),//杩涘害鏉＄殑楂樺害10
+ SeekBarPadding = 30,
};
#endregion
#endregion
@@ -108,17 +109,6 @@
}
}
- //foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
- //{
- // if (deviceinfo["Type"] == "1")
- // {
- // if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
- // {
- // devices = deviceinfo;
- // break;
- // }
- // }
- //}
}
else
{
@@ -131,17 +121,7 @@
TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
}
}
- //foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
- //{
- // if (deviceinfo["LinkType"].ToString() == "0")
- // {
- // if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
- // {
- // TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
- // break;
- // }
- // }
- //}
+
}
}
#endregion
@@ -329,7 +309,7 @@
closeView.selectedIconBtn.Visible = true;
}
Send.dictionary(deviceConditionsInfo, "Range", "5");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "1");
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//鏀寔1鍜�2;1+2=3
};
///鐐瑰嚮鍙栨秷浜嬩欢
closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -339,8 +319,8 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
openView.selectedIconBtn.Visible = false;
closeView.selectedIconBtn.Visible = true;
- Send.dictionary(deviceConditionsInfo, "Range", "1");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+ Send.dictionary(deviceConditionsInfo, "Range", "8");//1
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//0
if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
{
SelectedDeviceStatus = "";
@@ -510,13 +490,13 @@
{
if (devices["AttriButeId"] == "1281")
{
- if (devices.ContainsKey("IgnoreTime"))
+ if (devices.ContainsKey("IgnoreTime")&& devices["IgnoreTime"]!="0")
{
timeValue = int.Parse(devices["IgnoreTime"]);
}
else
{
- if (devices["AttriButeData1"] == "1")
+ if (devices["Range"]== "5")
{
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -550,7 +530,7 @@
Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
completeView.Show(l).AddChidren(openView.Show());
- openView.titleBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
+ openView.titleBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
//openView.titleBtn.Text =Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -569,7 +549,7 @@
}
break;
case DeviceType.DoorLock:
- {
+ {
flMain.RemoveFromParent();
var memberList = new MemberList();
@@ -699,8 +679,8 @@
break;
}
//鏌ユ壘绱㈠紩
- index1 = mList1.IndexOf(s);
- //杞崲娓╁害鍊�/100
+ index1 = mList1.IndexOf(s);
+ //杞崲娓╁害鍊�/100
var dd = (int.Parse(devices["AttriButeData1"])/100).ToString();
index2 = mList2.IndexOf(dd);
@@ -1320,7 +1300,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0