From 05ce435c3b58e53eeab04c672affdeeab75f3036 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 15 十一月 2019 14:41:39 +0800
Subject: [PATCH] 2019.11.15-1
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 1320 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 902 insertions(+), 418 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index b601b50..7fefc25 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -5,6 +5,8 @@
using Shared.R;
using ZigBee.Device;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.AC;
+using Shared.Phone.UserCenter.DoorLock;
namespace Shared.Phone.Device.Category
{
@@ -162,245 +164,189 @@
{
case DeviceType.OnOffOutput:
//寮�鍏冲姛鑳�
- if ((common as ToggleLight).DeviceStatusReport.CluterID == 6)
+ if (common.DeviceStatusReport.CluterID == 6)
{
var light = deviceUI.CommonDevice as ToggleLight;
- light.DeviceStatusReport = (common as ToggleLight).DeviceStatusReport;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
+ light.DeviceStatusReport = common.DeviceStatusReport;
+ if (light.DeviceStatusReport.AttriBute == null || light.DeviceStatusReport.AttriBute.Count == 0)
{
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
- {
- //璁板綍銆佹洿鏂扮姸鎬�
- if (light.DeviceStatusReport.AttriBute == null || light.DeviceStatusReport.AttriBute.Count == 0)
- {
- continue;
- }
- light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
- (tempView as Button).IsSelected = light.OnOffStatus == 1;
- //璁板綍鍥炲鏃堕棿
- light.LastDateTime = DateTime.Now;
- }
+ continue;
}
- }
- if ((common as ToggleLight).DeviceStatusReport.CluterID == 3)
- {
- var light = deviceUI.CommonDevice as ToggleLight;
- light.IsOnline = 1;
- //璁板綍鍥炲鏃堕棿
+ light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(light.OnOffStatus == 1);
+ row.SetStatuText(deviceUI.GetDeviceStatu());
light.LastDateTime = DateTime.Now;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = light.IsOnline == 1;
- }
- }
+ }
+ if (common.DeviceStatusReport.CluterID == 3)
+ {
+ deviceUI.CommonDevice.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(true);
}
break;
case DeviceType.AirSwitch:
//寮�鍏冲姛鑳�
- if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 6)
+ if (common.DeviceStatusReport.CluterID == 6)
{
var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
- airSwitch.DeviceStatusReport = (common as ZigBee.Device.AirSwitch).DeviceStatusReport;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
+ airSwitch.DeviceStatusReport = common.DeviceStatusReport;
+ if (airSwitch.DeviceStatusReport.AttriBute == null || airSwitch.DeviceStatusReport.AttriBute.Count == 0)
{
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
- {
- //璁板綍銆佹洿鏂扮姸鎬�
- if (airSwitch.DeviceStatusReport.AttriBute == null || airSwitch.DeviceStatusReport.AttriBute.Count == 0)
- {
- return;
- }
- airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
- (tempView as Button).IsSelected = airSwitch.OnOffStatus == 1;
- //璁板綍鍥炲鏃堕棿
- airSwitch.LastDateTime = DateTime.Now;
- }
+ return;
}
- }
- if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 3)
- {
- var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
- airSwitch.IsOnline = 1;
- //璁板綍鍥炲鏃堕棿
+ airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(airSwitch.OnOffStatus == 1);
+ row.SetStatuText(deviceUI.GetDeviceStatu());
airSwitch.LastDateTime = DateTime.Now;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = airSwitch.IsOnline == 1;
- }
- }
+ }
+ if (common.DeviceStatusReport.CluterID == 3)
+ {
+ deviceUI.CommonDevice.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(true);
}
break;
case DeviceType.WindowCoveringDevice:
- if ((common as Rollershade).DeviceStatusReport.CluterID == 3)
+
+ if (common.DeviceStatusReport.CluterID == 258)
{
- var rollerShape = deviceUI.CommonDevice as Rollershade;
- //璁板綍鍥炲鏃堕棿
- rollerShape.LastDateTime = DateTime.Now;
- rollerShape.IsOnline = 1;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
+ if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
{
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = rollerShape.IsOnline == 1;
- }
+ //绐楀笜绫诲瀷
+ var rollerShade = deviceUI.CommonDevice as Rollershade;
+ rollerShade.DeviceStatusReport = common.DeviceStatusReport;
+ rollerShade.WcdType = common.DeviceStatusReport.AttriBute[0].AttriButeData;
+ rollerShade.LastDateTime = DateTime.Now;
}
+ if (common.DeviceStatusReport.AttriBute[0].AttributeId == 8)
+ {
+ var row = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
+ //绐楀笜鐧惧垎姣�
+ var rollerShade = deviceUI.CommonDevice as Rollershade;
+ rollerShade.DeviceStatusReport = common.DeviceStatusReport;
+ rollerShade.WcdCurrentPositionLiftPercentage = common.DeviceStatusReport.AttriBute[0].AttriButeData;
+ row.SetStatuText($"{Language.StringByID(R.MyInternationalizationString.Current)} { deviceUI.GetDeviceStatu()}");
+ rollerShade.LastDateTime = DateTime.Now;
+ }
+ }
+ if (common.DeviceStatusReport.CluterID == 3)
+ {
+ deviceUI.CommonDevice.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
+ row.SetStatu(true);
}
break;
case DeviceType.Thermostat:
//AC鍔熻兘
- if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 513)
+ if (common.DeviceStatusReport.CluterID == 513)
{
- var attriButeList = (common as ZigBee.Device.AC).DeviceStatusReport.AttriBute;
+ var attriButeList = common.DeviceStatusReport.AttriBute;
if (attriButeList == null || attriButeList.Count == 0)
{
return;
}
var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
- ac.DeviceStatusReport = (common as ZigBee.Device.AC).DeviceStatusReport;
+ ac.DeviceStatusReport = common.DeviceStatusReport;
+
+ var curTemp = (attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default;
switch (attriButeList[0].AttributeId)
{
case 0:
- //姝ゅ睘鎬ц〃鏄庡鍐呭綋鍓嶇殑娓╁害 * 100锛屽疄闄呮俯搴︿负鈥淟ocalTemperature / 100鈥濓紝鍗曚綅锛氣剝
- ac.currentLocalTemperature = attriButeList[0].AttriButeData / 100;
+ ac.currentLocalTemperature = curTemp;
ac.LastDateTime = DateTime.Now;
break;
case 17:
- //姝ゅ睘鎬ц〃鏄庢璁惧褰撳墠鐨勫埗鍐锋俯搴︼紝瀹為檯娓╁害涓衡�淐oolingSetpoint / 100鈥濓紝鍗曚綅锛氣剝銆�
- ac.currentCoolingSetpoint = attriButeList[0].AttriButeData / 100;
+ ac.currentCoolingSetpoint = curTemp;
ac.LastDateTime = DateTime.Now;
break;
case 18:
- //姝ゅ睘鎬ц〃鏄庢璁惧褰撳墠鐨勫埗鐑俯搴︼紝瀹為檯娓╁害涓衡�淗eatingSetpoint / 100鈥濓紝鍗曚綅锛氣剝銆�
- ac.currentHeatingSetpoint = attriButeList[0].AttriButeData / 100;
+ ac.currentHeatingSetpoint = curTemp;
+ ac.LastDateTime = DateTime.Now;
+ break;
+
+ case 4096:
+ ac.currentAutoSetpoint = curTemp;
ac.LastDateTime = DateTime.Now;
break;
case 28:
//姝ゅ睘鎬ф弿杩版亽娓╄澶囨澶勪簬鍝妯″紡
- //Off = 0 Auto = 1 Cool = 3 Heat = 4 FanOnly = 7 Dry = 8
ac.currentSystemMode = attriButeList[0].AttriButeData;
ac.LastDateTime = DateTime.Now;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
- {
- if (ac.currentSystemMode == 0)
- {
- (tempView as Button).IsSelected = false;
- }
- else
- {
- (tempView as Button).IsSelected = true;
- }
- }
- }
break;
}
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(ac.currentSystemMode != 0);
+ row.SetStatuText(deviceUI.GetDeviceStatu());
}
- if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 3)
+
+ if (common.DeviceStatusReport.CluterID == 514)
+ {
+ var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
+ var attriButeList = common.DeviceStatusReport.AttriBute;
+ if (attriButeList == null || attriButeList.Count == 0)
+ {
+ return;
+ }
+ ac.DeviceStatusReport = common.DeviceStatusReport;
+ switch (attriButeList[0].AttributeId)
+ {
+ case 0:
+ ac.currentFanMode = attriButeList[0].AttriButeData;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ case 4096:
+ ac.currentFanSwingMode = attriButeList[0].AttriButeData;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ }
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(ac.currentSystemMode != 0);
+ row.SetStatuText(deviceUI.GetDeviceStatu());
+ }
+
+ if (common.DeviceStatusReport.CluterID == 3)
{
var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
ac.IsOnline = 1;
- //璁板綍鍥炲鏃堕棿
ac.LastDateTime = DateTime.Now;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = ac.IsOnline == 1;
- }
- }
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(true);
}
break;
case DeviceType.DimmableLight:
//璋冨厜鐏姛鑳�
- if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 6)
+ if (common.DeviceStatusReport.CluterID == 6)
{
- var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
- dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
+ var dimmableLight = deviceUI.CommonDevice as DimmableLight;
+ dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
+ //璁板綍銆佹洿鏂扮姸鎬�
+ if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
{
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
- {
- //璁板綍銆佹洿鏂扮姸鎬�
- if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
- {
- return;
- }
- dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
- (tempView as Button).IsSelected = dimmableLight.OnOffStatus == 1;
- //璁板綍鍥炲鏃堕棿
- dimmableLight.LastDateTime = DateTime.Now;
- }
+ continue;
}
- }
- if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 3)
- {
- var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
- dimmableLight.IsOnline = 1;
- //璁板綍鍥炲鏃堕棿
+ dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(dimmableLight.OnOffStatus == 1);
+ row.SetStatuText(deviceUI.GetDeviceStatu());
dimmableLight.LastDateTime = DateTime.Now;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = dimmableLight.IsOnline == 1;
- }
- }
+ }
+ if (common.DeviceStatusReport.CluterID == 3)
+ {
+ deviceUI.CommonDevice.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(true);
}
break;
}
@@ -433,77 +379,38 @@
switch (deviceUI.CommonDevice.Type)
{
case DeviceType.OnOffOutput:
- var light = deviceUI.CommonDevice as ToggleLight;
- light.IsOnline = (common as ToggleLight).IsOnline;
- //璁板綍鍥炲鏃堕棿
- light.LastDateTime = DateTime.Now;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = light.IsOnline == 1;
- }
- }
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
break;
+
case DeviceType.AirSwitch:
- var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
- airSwitch.IsOnline = (common as ZigBee.Device.AirSwitch).IsOnline;
- //璁板綍鍥炲鏃堕棿
- airSwitch.LastDateTime = DateTime.Now;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = airSwitch.IsOnline == 1;
- }
- }
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ var row1 = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row1.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
break;
+
case DeviceType.WindowCoveringDevice:
- var rollerShape = deviceUI.CommonDevice as Rollershade;
- //璁板綍鍥炲鏃堕棿
- rollerShape.LastDateTime = DateTime.Now;
- rollerShape.IsOnline = (common as Rollershade).IsOnline;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = rollerShape.IsOnline == 1;
- }
- }
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ var row2 = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
+ row2.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
+ break;
+
+ case DeviceType.DimmableLight:
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ var row3 = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row3.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
break;
case DeviceType.Thermostat:
- var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
- //璁板綍鍥炲鏃堕棿
- ac.LastDateTime = DateTime.Now;
- ac.IsOnline = (common as ZigBee.Device.AC).IsOnline;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
- var tempView = rowLayout.GetChildren(j);
- if (tempView.Tag == null)
- {
- continue;
- }
- if (tempView.Tag.ToString() == deviceStatus_Online)
- {
- (tempView as Button).IsSelected = ac.IsOnline == 1;
- }
- }
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ deviceUI.CommonDevice.IsOnline = common.IsOnline;
+ var row5 = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row5.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
break;
}
}
@@ -535,6 +442,7 @@
{
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
instance = this;
+ ZbGateway.StatusList.Add(this);
}
/// <summary>
@@ -543,8 +451,6 @@
/// <param name="selectedBtn">閫変腑閭ｄ釜鐣岄潰 0--鍔熻兘 1--鍦烘櫙 2--鑷姩鍖� </param>
public void Show(int selectedBtn = 1)
{
-
- ZbGateway.StatusList.Add(this);
RemoveAll();
#region topview
@@ -746,7 +652,12 @@
/// <param name="sender">Sender.</param>
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void AutomationBtn_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
- {
+ {
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
functionBtn.IsSelected = false;
sceneBtn.IsSelected = false;
automationBtn.IsSelected = true;
@@ -802,6 +713,15 @@
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
}
+ /// <summary>
+ /// HidenFloor
+ /// </summary>
+ /// <param name="statu"></param>
+ private void HidenFloor(bool statu)
+ {
+ selectFloorBtn.Visible = !statu;
+ floorBtn.Visible = !statu;
+ }
#endregion
@@ -814,14 +734,17 @@
functionSceneAutoBodyView.RemoveAll();
if (functionBtn.IsSelected)
{
+ HidenFloor(false);
ShowFunction();
}
else if (sceneBtn.IsSelected)
{
+ HidenFloor(false);
ShowScene();
}
else if (automationBtn.IsSelected)
{
+ HidenFloor(true);
ShowAutotion();
}
}
@@ -956,10 +879,10 @@
detailInfo.action = RefreshBodyView;
};
- if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.OnOffOutput)
+ if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
{
//鐏�
- var light = deviceUI.CommonDevice as ZigBee.Device.ToggleLight;
+ var light = deviceUI.CommonDevice as ToggleLight;
//琛ヤ笂闈炶繙绋�
if (light.Gateway == null)
{
@@ -994,8 +917,9 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetStatu(light.IsOnline == 1);
- deviceRow.SetZoneText(deviceUI.GetZone());
+ deviceRow.SetOnLineStatu(light.IsOnline == 1);
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.SetStatu(light.OnOffStatus == 1);
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1014,6 +938,7 @@
{
light.SwitchControl(0);
}
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1031,11 +956,30 @@
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
- var lightControl = new Phone.Device.Light.LightControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.action = RefreshBodyView;
- lightControl.Show(deviceUI, room);
+ if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ var lightControl = new Phone.Device.Light.OnOffControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
+ }
+ else if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ var lightControl = new Phone.Device.Light.PlugControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
+ }
+ else
+ {
+ var lightControl = new Phone.Device.Light.LightControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ //lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
+ }
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1082,7 +1026,7 @@
var deviceTypeRowLayout = new RowLayout()
{
- Height = Application.GetRealHeight(127 + 35),
+ Height = Application.GetRealHeight(129 + 35),
LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
@@ -1091,8 +1035,9 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetStatu(airSwitch.IsOnline == 1);
- deviceRow.SetZoneText(deviceUI.GetZone());
+ deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
+ deviceRow.SetStatu(airSwitch.OnOffStatus == 1);
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1111,6 +1056,7 @@
{
airSwitch.SwitchControl(0);
}
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1128,10 +1074,11 @@
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
- var lightControl = new Phone.Device.Light.LightControl();
+
+ var lightControl = new Phone.Device.Light.AirSwitchControl();
UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
- lightControl.action = RefreshBodyView;
+ //lightControl.action = RefreshBodyView;
lightControl.Show(deviceUI, room);
};
@@ -1190,8 +1137,9 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetStatu(dimmableLight.IsOnline == 1);
- deviceRow.SetZoneText(deviceUI.GetZone());
+ deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.SetStatu(dimmableLight.OnOffStatus == 1);
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1210,6 +1158,7 @@
{
dimmableLight.SwitchControl(0);
}
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1231,7 +1180,7 @@
UserView.HomePage.Instance.AddChidren(dimmableLightControl);
UserView.HomePage.Instance.PageIndex += 1;
UserView.HomePage.Instance.ScrollEnabled = false;
- dimmableLightControl.action = RefreshBodyView;
+ //dimmableLightControl.action = RefreshBodyView;
dimmableLightControl.Show(deviceUI, room);
};
@@ -1267,11 +1216,13 @@
UserView.UserHomeView.ReadStatus(ac, () =>
{
ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadFanMode();
- ac.ReadSystemMode();
ac.ReadLocalTemperature();
ac.ReadCoolingSetpoint();
ac.ReadHeatingSetpoint();
+ ac.ReadAutoSetpoint();
+ ac.ReadFanMode();
+ ac.ReadSystemMode();
+ ac.ReadSystemFansSwingMode();
});
}
else
@@ -1279,67 +1230,50 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- });
- }
- else
- {
- //闃叉鐭椂闂村唴澶氭璇诲彇
- if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
- {
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ac.ReadLocalTemperature();
+ ac.ReadCoolingSetpoint();
+ ac.ReadHeatingSetpoint();
+ ac.ReadAutoSetpoint();
+ ac.ReadFanMode();
+ ac.ReadSystemMode();
+ ac.ReadSystemFansSwingMode();
}
}
-
var deviceTypeRowLayout = new RowLayout()
{
Height = Application.GetRealHeight(127 + 35),
- LineColor = ZigbeeColor.Current.GXCLineColor,
+ LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
deviceListScrolView.AddChidren(deviceTypeRowLayout);
- var deviceRow = new FunctionRow(0, 35);
+ var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetStatu(rollerShade.IsOnline == 1);
+ deviceRow.SetOnLineStatu(ac.IsOnline == 1);
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.SetStatu(ac.currentSystemMode != 1);
deviceTypeRowLayout.AddChidren(deviceRow);
- var editBtn = new CommonForm.RowLayoutEditButton()
- {
- Tag = deviceUI,
- Radius = 0
- };
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
- var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
- {
- Tag = deviceUI,
- Radius = 0
- };
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
-
-
- deviceRow.SwitchBtn.MouseUpEventHandler += (sender, e) =>
+ deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
{
zbGateway = deviceUI.CommonDevice.Gateway;
sendedControlCommand = false;
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
- (sender as CommonForm.SelectedStatuButton).IsSelected = !(sender as CommonForm.SelectedStatuButton).IsSelected;
- if ((sender as CommonForm.SelectedStatuButton).IsSelected)
+ (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+ if ((send2 as Button).IsSelected)
{
- rollerShade.CurtainUpDownStopControl(0);
+ ac.Open();
}
else
{
- rollerShade.CurtainUpDownStopControl(1);
+ ac.Close();
}
-
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1370,6 +1304,16 @@
};
deviceTypeRowLayout.AddRightView(delBtn);
delBtn.MouseUpEventHandler += delEvent;
+
+ deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+ {
+ var acControl = new Phone.Device.AC.ACControl();
+ UserView.HomePage.Instance.AddChidren(acControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ UserView.HomePage.Instance.ScrollEnabled = false;
+ //rollerShadeControl.action = RefreshBodyView;
+ acControl.Show(deviceUI, room);
+ };
}
else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
{
@@ -1385,6 +1329,7 @@
UserHomeView.ReadStatus(rollerShade, () =>
{
rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ rollerShade.ReadWcdCurrentPositionLiftPercentage();
});
}
else
@@ -1393,23 +1338,43 @@
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ rollerShade.ReadWcdCurrentPositionLiftPercentage();
}
}
-
var deviceTypeRowLayout = new RowLayout()
{
- Height = Application.GetRealHeight(127 + 35),
- LineColor = ZigbeeColor.Current.GXCLineColor,
+ Height = Application.GetRealHeight(129 + 35),
+ LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
deviceListScrolView.AddChidren(deviceTypeRowLayout);
- var deviceRow = new FunctionRow(0, 35);
- deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+ var deviceRow = new CategoryFunctionForWinRow(0, 35);
+ deviceRow.Init(deviceUI);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetStatu(rollerShade.IsOnline == 1);
+ deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.SetStatu(rollerShade.WcdCurrentPositionLiftPercentage != 0);
+ deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
deviceTypeRowLayout.AddChidren(deviceRow);
+
+ if (rollerShade.WcdType == -1)
+ {
+ CommonPage.Loading.Start();
+ new System.Threading.Thread(() =>
+ {
+ Rollershade.ReadWcdTypeAction(rollerShade, () =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
+ CommonPage.Loading.Hide();
+ });
+ });
+ })
+ { IsBackground = true }.Start();
+ }
var editBtn = new CommonForm.RowLayoutEditButton()
{
@@ -1427,42 +1392,56 @@
deviceTypeRowLayout.AddRightView(delBtn);
delBtn.MouseUpEventHandler += delEvent;
-
- deviceRow.SwitchBtn.MouseUpEventHandler += (sender, e) =>
+ deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
- zbGateway = deviceUI.CommonDevice.Gateway;
- sendedControlCommand = false;
- zbGateway.ReportAction += UpdateDeviceControllStatu;
- AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
-
- (sender as CommonForm.SelectedStatuButton).IsSelected = !(sender as CommonForm.SelectedStatuButton).IsSelected;
- if ((sender as CommonForm.SelectedStatuButton).IsSelected)
- {
- rollerShade.CurtainUpDownStopControl(0);
- }
- else
- {
- rollerShade.CurtainUpDownStopControl(1);
- }
-
- //鎺у埗寤舵椂鍥炶皟
- DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
- {
- if (Parent == null)
- {
- return;
- }
- RemoveUpdateControlDeviceStatuAction(zbGateway);
- if (sendedControlCommand == false)
- {
- DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
- }
- });
+ var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
+ UserView.HomePage.Instance.AddChidren(rollerShadeControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ UserView.HomePage.Instance.ScrollEnabled = false;
+ //rollerShadeControl.action = RefreshBodyView;
+ rollerShadeControl.Show(deviceUI, room);
};
}
else
{
+ var deviceTypeRowLayout = new RowLayout()
+ {
+ Height = Application.GetRealHeight(129 + 35),
+ LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+ Tag = deviceUI
+ };
+ deviceListScrolView.AddChidren(deviceTypeRowLayout);
+ var deviceRow = new CategoryFunctionRow(0, 35);
+ deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+ deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+ deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.HideSwitchBtn(true);
+ deviceTypeRowLayout.AddChidren(deviceRow);
+
+
+ deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+ {
+ var userDoorLockPage = new UserDoorLockPage(room, deviceUI);
+ HomePage.Instance.AddChidren(userDoorLockPage);
+ HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
+ };
+
+ var editBtn = new CommonForm.RowLayoutEditButton()
+ {
+ Tag = deviceUI
+ };
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+
+ var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+ {
+ Tag = deviceUI
+ };
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
}
}
};
@@ -1633,7 +1612,6 @@
X = Application.GetRealWidth(179),
Width = Application.GetRealWidth(844),
Height = Application.GetRealHeight(400),
- BackgroundColor = ZigbeeColor.Current.GXCRedColor,
UnSelectedImagePath = scene.IconPath,
Radius = (uint)Application.GetRealHeight(17)
};
@@ -1720,11 +1698,24 @@
Tag = scene
};
- if (!room.IsSharedRoom)
+
+ if(room.IsSharedRoom)
{
- sceneRowLayout.AddRightView(settingBtn);
- sceneRowLayout.AddRightView(deleteBtn);
+
}
+ else
+ {
+ if(room.IsLove)
+ {
+ sceneRowLayout.AddRightView(deleteBtn);
+ }
+ else
+ {
+ sceneRowLayout.AddRightView(settingBtn);
+ sceneRowLayout.AddRightView(deleteBtn);
+ }
+ }
+
//璋冪敤鍦烘櫙
EventHandler<MouseEventArgs> sceneUpHandler = async (sender, e) =>
@@ -1867,6 +1858,7 @@
#endregion
+
#region 鈼� 鑷姩鍖朹_________________________
/// <summary>
@@ -1923,22 +1915,16 @@
bjFrameLayout.AddChidren(recommendswitchBtn);
- /// <summary>
- /// 鏄剧ず娌℃湁鍦烘櫙
- /// </summary>
- private void ShowNoSceneTip()
- {
- var noFunction = new Button()
+ var scenehorizontalScrol = new HorizontalScrolViewLayout
{
- Y = Application.GetRealHeight(320),
- Width = Application.GetMinRealAverage(757),
- Height = Application.GetMinRealAverage(435),
- UnSelectedImagePath = "Item/NoFunction.png",
- Gravity = Gravity.CenterHorizontal
+ Width = Application.GetRealWidth(1080 - 58),
+ X = Application.GetRealWidth(58),
+ Y = bjFrameLayout.Bottom + Application.GetRealHeight(30),
+ Height = Application.GetRealHeight(0),
};
- functionSceneBodyView.AddChidren(noFunction);
+ functionSceneAutoBodyView.AddChidren(scenehorizontalScrol);
- var noScenceTip = new Button()
+ var logicScrolView = new VerticalScrolViewLayout
{
Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
@@ -1946,134 +1932,214 @@
Radius = (uint)Application.GetRealHeight(50),
Y = scenehorizontalScrol.Bottom,
};
- functionSceneBodyView.AddChidren(noScenceTip);
- }
+ functionSceneAutoBodyView.AddChidren(logicScrolView);
- #endregion
+ recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ int Yheight = 0;
+ recommendswitchBtn.IsSelected = !recommendswitchBtn.IsSelected;
+ scenehorizontalScrol.RemoveAll();
+ if (recommendswitchBtn.IsSelected)
+ {
+ scenehorizontalScrol.Height = Application.GetRealHeight(246);
+ Yheight = 20;
+ for (int i = 1; i < 4; i++)
+ {
- #region 鈼� 鑷姩鍖朹_________________________
+ var frameLayout = new FrameLayout
+ {
+ Width = Application.GetMinRealAverage(369 + 46),
+ Height = Application.GetMinRealAverage(246),
+ };
+ scenehorizontalScrol.AddChidren(frameLayout);
+ var logiciocnBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(369),
+ Height = Application.GetMinRealAverage(246),
+ UnSelectedImagePath = "ZigeeLogic/" + i + ".png",
+ Tag = i,
+ };
+ frameLayout.AddChidren(logiciocnBtn);
+
+ var logicnameBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(250),
+ Height = Application.GetMinRealAverage(80),
+ X = Application.GetRealWidth(23),
+ Y = Application.GetRealHeight(246 - 23 - 80),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ };
+ frameLayout.AddChidren(logicnameBtn);
+
+ if (i == 1)
+ {
+ logicnameBtn.Text = Language.StringByID(MyInternationalizationString.onlight);
+ }
+ else if (i == 2)
+ {
+ logicnameBtn.Text = Language.StringByID(MyInternationalizationString.offlight);
+ }
+ else if (i == 3)
+ {
+ logicnameBtn.Text = Language.StringByID(MyInternationalizationString.automation1);
+ }
+
+
+ EventHandler<MouseEventArgs> iconclick = (sender1, e1) =>
+ {
+ Common.Logic.CurrentLogic = new Common.Logic();
+ Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
+ if (logiciocnBtn.Tag.ToString() == "3")
+ {
+ Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;// Language.StringByID(MyInternationalizationString.automation1);
+ var addLogicPage = new Logic.AddLogicPage();
+ HomePage.Instance.AddChidren(addLogicPage);
+ HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ }
+ else
+ {
+
+ Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
+ Logic.TemplatePage templatePage = new Logic.TemplatePage();
+ Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
+ HomePage.Instance.AddChidren(templatePage);
+ HomePage.Instance.PageIndex += 1;
+ templatePage.Show();
+ }
+ };
+ logiciocnBtn.MouseUpEventHandler += iconclick;
+ logicnameBtn.MouseUpEventHandler += iconclick;
+ }
+ }
+ else
+ {
+ scenehorizontalScrol.Height = Application.GetRealHeight(0);
+ Yheight = 0;
+ }
+ logicScrolView.Y = scenehorizontalScrol.Bottom + Yheight;
+ logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
+ Automationview(logicScrolView);
+ };
CommonPage.Loading.Start();
if (Common.Logic.LogicList.Count == 0)
{
- //var Idlist = await Logic.Send.GetLogicId();
- //if (Idlist.Count != 0)
- //{
- // foreach (var LogicId in Idlist)
- // {
- // var logic = await Logic.Send.GetLogic(LogicId);
- // if (logic != null)
- // {
- // Common.Logic.LogicList.Add(logic);
- // }
- // }
- //}
- var Idlist = await Logic.Send.GetLogicId();
+ var Idlist = await Logic.Send.GetLogicId(0);
if (Idlist.Count != 0)
{
- var listlogic = await Logic.Send.ReadList(Idlist.Count);
- foreach (var LogicId in Idlist)
+ var listlogic = await Logic.Send.ReadList(Idlist.Count, 0);
+ //foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆�
+ for (int j = 0; j < listlogic.Count; j++)
{
- foreach (var logic in listlogic)
+ var logic = listlogic[j];
+ if (logic.LogicType != 0)
{
- if (logic.LogicId == LogicId)
- {
- Common.Logic.LogicList.Add(logic);
- }
+ continue;
}
+ Common.Logic.LogicList.Add(logic);
}
}
}
-
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
+
}
/// <summary>
/// 鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
/// <param name="refresview">Refresview.</param>
- public async void Automationview(VerticalScrolViewLayout refresview)
+ private async void Automationview(VerticalScrolViewLayout refresview)
{
refresview.RemoveAll();
foreach (var logic in Common.Logic.LogicList)
{
- var logicrowlayout = new RowLayout
- {
- Height = Application.GetRealHeight(180),
- LineColor = ZigbeeColor.Current.LogicLineColor,
- };
- refresview.AddChidren(logicrowlayout);
- var btnname = new Button
+
+ var logicRowlayout = new RowLayout
{
- //Text = "閫昏緫涓�",
+ Height = Application.GetRealHeight(190 + 30),
+ Width = Application.GetRealWidth(1080),
+ LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ };
+ refresview.AddChidren(logicRowlayout);
+
+
+
+ var logicnameBtn = new Button
+ {
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(350),
Text = logic.LogicName,
- X = Application.GetRealWidth(50),
+ X = Application.GetRealWidth(12 + 46),
+ Y = Application.GetRealHeight(30),
TextAlignment = TextAlignment.CenterLeft,
- Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- logicrowlayout.AddChidren(btnname);
+ logicRowlayout.AddChidren(logicnameBtn);
- var btnswitch = new Button
+
+ var logicswitchBtn = new Button
{
- Width = Application.GetMinRealAverage(183),
- Height = Application.GetMinRealAverage(123),
- UnSelectedImagePath = "ZigeeLogic/Switch.png",
- SelectedImagePath = "ZigeeLogic/SwitchSelected.png",
- X = Application.GetRealWidth(1080 - 200),
- Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(63),
+ UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+ SelectedImagePath = "ZigeeLogic/logicopen.png",
+ X = logicRowlayout.Width - Application.GetRealWidth(104 + 58 + 58),
+ Y = Application.GetRealHeight(58 + 30 + 9 + 30),
};
- logicrowlayout.AddChidren(btnswitch);
+ logicRowlayout.AddChidren(logicswitchBtn);
- btnswitch.MouseUpEventHandler += (sender1, e1) =>
+
+
+ logicswitchBtn.MouseUpEventHandler += (sender1, e1) =>
{
- btnswitch.IsSelected = !btnswitch.IsSelected;
- if (btnswitch.IsSelected)
+ logicswitchBtn.IsSelected = !logicswitchBtn.IsSelected;
+ if (logicswitchBtn.IsSelected)
{
//閫昏緫寮�
logic.IsEnable = 1;
+ StatusColor(logic, logicRowlayout, 1);
}
else
{
//閫昏緫鍏�
logic.IsEnable = 0;
+ StatusColor(logic, logicRowlayout, 0);
}
Logic.Send.LogicControlSwitch(logic);
//Logic.Send.AddModifyLogic(logic);
};
if (logic.IsEnable == 1)
{
- btnswitch.IsSelected = true;
+ logicswitchBtn.IsSelected = true;
+ StatusColor(logic, logicRowlayout, 1);
}
else if (logic.IsEnable == 0)
{
- btnswitch.IsSelected = false;
+ logicswitchBtn.IsSelected = false;
+ StatusColor(logic, logicRowlayout, 0);
}
///缂栬緫
var edit = new Button
{
- //TextID = MyInternationalizationString.Musicdel
- BackgroundColor = 0xFF00aaf0,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
- logicrowlayout.AddRightView(edit);
+ logicRowlayout.AddRightView(edit);
edit.MouseUpEventHandler += (sender, e) =>
{
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
Common.Logic.CurrentLogic = logic;
var logicCommunalPage = new Logic.LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { btnname.Text = logic.LogicName; Automationview(refresview); });
+ HomePage.Instance.AddChidren(logicCommunalPage);
+ HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview); });
};
@@ -2081,23 +2147,439 @@
///鍒犻櫎
var del = new Button
{
- //TextID = MyInternationalizationString.Musicdel,
- BackgroundColor = 0xFFFF0000,
+ BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
Text = Language.StringByID(MyInternationalizationString.del),
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
- logicrowlayout.AddRightView(del);
+ logicRowlayout.AddRightView(del);
del.MouseUpEventHandler += (sender, e) =>
{
- Common.Logic.LogicList.Remove(logic);
- Automationview(refresview);
- Logic.Send.DelLogic(logic.LogicId);
- };
+ var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
+ alert.ResultEventHandler += (sender1, e1) =>
+ {
+ if (e1)
+ {
+ Common.Logic.LogicList.Remove(logic);
+ Automationview(refresview);
+ Logic.Send.DelLogic(logic.LogicId);
+ }
+ };
+ alert.Show();
+ };
+ var line = new Button
+ {
+ Y = Application.GetRealHeight(215),
+ Height = Application.GetRealHeight(5),
+ Width = Application.GetRealWidth(1080 - 58),
+ BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ X = Application.GetRealWidth(58),
+ };
+ logicRowlayout.AddChidren(line);
}
-
}
+ /// <summary>
+ /// 鏄剧ず鍥炬爣鐨勯鑹�
+ /// </summary>
+ /// <param name="logic"></param>
+ /// <param name="logicRowlayout"></param>
+ /// <param name="intvalue"></param>
+ private void StatusColor(Common.Logic logic, RowLayout logicRowlayout, int intvalue)
+ {
+ var logictimeBtn = new Button
+ {
+ Height = Application.GetRealHeight(58),
+ Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350 + 58),
+ Y = Application.GetRealHeight(30),
+ X = Application.GetRealWidth(365),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
+ };
+ logicRowlayout.AddChidren(logictimeBtn);
+
+ ///鏄剧ず鎵ц鍛ㄦ湡
+ switch (logic.TimeAttribute.Repeat)
+ {
+ ///0:鍙墽琛屼竴娆★紝鎵ц鍚嶪sEnable鍊肩疆;1,浠婂勾鍐呮墽琛�;2锛氭瘡澶╂墽琛�;3锛氭瘡鏈堟墽琛�;4锛氭瘡骞存墽琛�;5锛氬懆閲嶅銆�
+ case 0:
+ {
+ logictimeBtn.Text = Language.StringByID(MyInternationalizationString.executeonce);
+ }; break;
+ case 1: { }; break;
+ case 2:
+ {
+ logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyday);
+ }; break;
+ case 3:
+ {
+
+ string len = "", value = "";
+ var stringvalue = Convert.ToString(logic.TimeAttribute.MonthDate, 2);
+ var str = stringvalue.Insert(0, new string('0', 32 - stringvalue.Length));
+ for (int j = 31; j >= 0; j--)
+ {
+ len += str.Substring(j, 1);
+ }
+ for (int j = 0; j < len.Length; j++)
+ {
+ var strvalue = len.Substring(j, 1);
+ if (strvalue == "1")
+ {
+ value += (j + 1).ToString() + ",";
+ }
+ }
+ logictimeBtn.Text = Language.StringByID(MyInternationalizationString.monthly) + value.TrimEnd(',') + Language.StringByID(MyInternationalizationString.day);
+
+ }; break;
+ case 4:
+ {
+
+ Dictionary<int, int> dictionary = new Dictionary<int, int>();
+ ///鎵惧嚭鎵ц鐨勬湀浠藉拰澶╂暟
+ if (logic.TimeAttribute.SelectMonDate.Count != 0)
+ {
+ for (int i = 0; i < logic.TimeAttribute.SelectMonDate.Count; i++)
+ {
+ var dayvalue = logic.TimeAttribute.SelectMonDate[i];
+ if (dayvalue != 0)
+ {
+ dictionary.Add(i + 1, dayvalue);
+ }
+ }
+ }
+ if (dictionary.Count != 0 && dictionary.Count == 1)
+ {
+ string len = "", leng = "";
+ int minvalue = 0, Maximum = 0;
+ foreach (var value in dictionary)
+ {
+ ///鍙栧嚭鏈堜唤
+ var month = value.Key;
+ ///鍙栧嚭鏃ユ暟
+ var day = value.Value;
+ var maxvalue = Convert.ToString(day, 2);
+ var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
+ for (int j = 31; j >= 0; j--)
+ {
+ len += str.Substring(j, 1);
+ }
+
+ for (int j = 0; j < len.Length; j++)
+ {
+ var strvalue = len.Substring(j, 1);
+ if (strvalue == "1")
+ {
+ minvalue = j + 1;
+ break;
+ }
+ }
+ for (int j = 0; j < len.Length; j++)
+ {
+ var strvalue = len.Substring(j, 1);
+ if (strvalue == "1")
+ {
+ Maximum = j + 1;
+ }
+ }
+
+ if (month.ToString().Length < 2)
+ {
+ leng = "0" + month.ToString();
+ }
+ else
+ {
+ leng = month.ToString();
+ }
+ if (minvalue == Maximum)
+ {
+ logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString());
+ }
+ else
+ {
+ logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-" + leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
+ }
+ }
+
+ }
+ else
+ {
+ int b = 0;
+ string stringtext = "";
+ foreach (var value in dictionary)
+ {
+ string len = "", leng = "";
+ int minvalue = 0, Maximum = 0;
+ ///鍙栧嚭鏈堜唤
+ var month = value.Key;
+ ///鍙栧嚭鏃ユ暟
+ var day = value.Value;
+ var maxvalue = Convert.ToString(day, 2);
+ var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
+ for (int j = 31; j >= 0; j--)
+ {
+ len += str.Substring(j, 1);
+ }
+
+
+ if (month.ToString().Length < 2)
+ {
+ leng = "0" + month.ToString();
+ }
+ else
+ {
+ leng = month.ToString();
+ }
+
+
+
+ if (b == 0)
+ {
+ for (int j = 0; j < len.Length; j++)
+ {
+ var strvalue = len.Substring(j, 1);
+ if (strvalue == "1")
+ {
+ minvalue = j + 1;
+ break;
+ }
+ }
+ stringtext += leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-";
+
+ }
+
+ if (b == dictionary.Count - 1)
+ {
+ for (int j = 0; j < len.Length; j++)
+ {
+ var strvalue = len.Substring(j, 1);
+ if (strvalue == "1")
+ {
+ Maximum = j + 1;
+ }
+ }
+ stringtext += leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
+
+ }
+ b++;
+ }
+ logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + stringtext;
+ }
+
+ }; break;
+ case 5:
+ {
+ string len = "", text = "";
+ List<int> listvalueInt = new List<int>();
+ listvalueInt.Clear();
+ var maxvalue = Convert.ToString(logic.TimeAttribute.WeekDay, 2);
+ var str = maxvalue.Insert(0, new string('0', 8 - maxvalue.Length));
+ for (int j = 7; j >= 0; j--)
+ {
+ len += str.Substring(j, 1);
+ }
+
+ for (int j = 0; j < len.Length; j++)
+ {
+ var strvalue = len.Substring(j, 1);
+ if (strvalue == "1")
+ {
+ listvalueInt.Add(j + 1);
+
+
+ if ((j + 1) == 1)
+ {
+ text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.mon1) + ",";
+ //text += Language.StringByID(MyInternationalizationString.mon) + ",";
+ }
+ else if ((j + 1) == 2)
+ {
+ text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.tue1) + ",";
+ //text += Language.StringByID(MyInternationalizationString.tue) + ",";
+ }
+ else if ((j + 1) == 3)
+ {
+ text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.wed1) + ",";
+ //text += Language.StringByID(MyInternationalizationString.wed) + ",";
+ }
+ else if ((j + 1) == 4)
+ {
+ text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.thu1) + ",";
+ //text += Language.StringByID(MyInternationalizationString.thu) + ",";
+ }
+ else if ((j + 1) == 5)
+ {
+ text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.frl1) + ",";
+ //text += Language.StringByID(MyInternationalizationString.frl) + ",";
+ }
+ else if ((j + 1) == 6)
+ {
+ text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sat1) + ",";
+ //text += Language.StringByID(MyInternationalizationString.sat) + ",";
+ }
+ else if ((j + 1) == 7)
+ {
+ text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sun1) + ",";
+ //text += Language.StringByID(MyInternationalizationString.sun) + ",";
+ }
+
+
+ }
+ }
+ //鏆傛椂闅愯棌鎺夛紝闇�瑕佹樉绀哄懆鏈拰宸ヤ綔鏃ュ啀鏀惧紑锛�
+ //if (listvalueInt.Count == 5 && !listvalueInt.Contains(6) && !listvalueInt.Contains(7))
+ //{
+ // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.workingday);
+ //}
+ //else if (listvalueInt.Count == 2 && listvalueInt.Contains(6) && listvalueInt.Contains(7))
+ //{
+ // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.weekend);
+ //}
+ //else if (listvalueInt.Count == 7)
+ //{
+ // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyday);
+ //}
+ //else
+ //{
+ // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
+ //}
+ logictimeBtn.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
+ //btndisplaycycle.Text = text.TrimEnd(',');
+ }; break;
+ }
+
+ List<string> indexlist = new List<string>();
+ List<string> iconIndexlist = new List<string>();
+ for (int i = 0; i < logic.Actions.Count; i++)
+ {
+ var linkType = logic.Actions[i]["LinkType"].ToString();
+ var d = indexlist.Find((value) => { return value == linkType; });
+ if (d == null)
+ {
+ indexlist.Add(linkType);
+ }
+ }
+ if (indexlist.Contains("0"))
+ {
+ iconIndexlist.Add("0");
+ }
+ if (indexlist.Contains("2"))
+ {
+ iconIndexlist.Add("2");
+ }
+ if (indexlist.Contains("6"))
+ {
+ iconIndexlist.Add("6");
+ }
+ if (indexlist.Contains("7"))
+ {
+ iconIndexlist.Add("7");
+ }
+ for (int i = 0; i < iconIndexlist.Count; i++)
+ {
+ var iconindex = iconIndexlist[i];
+ var typebjBtn = new FrameLayout
+ {
+ Width = Application.GetRealWidth(82),
+ Height = Application.GetRealHeight(82),
+ X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
+ Y = Application.GetRealHeight(58 + 30 + 30),
+ Radius = (uint)Application.GetRealHeight(41),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ };
+ logicRowlayout.AddChidren(typebjBtn);
+
+ var typeIconBtn = new Button
+ {
+ Width = Application.GetRealWidth(58),
+ Height = Application.GetRealHeight(58),
+ Gravity = Gravity.Center,
+
+ };
+ typebjBtn.AddChidren(typeIconBtn);
+
+ var connectIconBtn = new Button
+ {
+ Y = typebjBtn.Y + Application.GetRealHeight(35),
+ X = Application.GetRealWidth(58) + Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
+ Width = Application.GetRealWidth(48),
+ Height = Application.GetRealHeight(15),
+ UnSelectedImagePath = "ZigeeLogic/connect.png",
+ };
+ logicRowlayout.AddChidren(connectIconBtn);
+ if (iconIndexlist.Count - 1 == i)
+ {
+ connectIconBtn.Visible = false;
+ }
+ switch (iconindex)
+ {
+ case "0":
+ {
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/function1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicFunction1Color;
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+ }
+ break;
+ case "2":
+ {
+
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/scene1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicScene1Color;
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/noscene.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+
+ }
+ break;
+ case "6":
+ {
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/security1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicSecurity1Color;
+
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nosecurity.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+
+ }
+ break;
+ case "7":
+ {
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/delay1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicDelay1Color;
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nodelay.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+
+ }
+ break;
+
+ }
+ }
+ }
#endregion
#region 鈼� 鎺у埗鐘舵�乢________________________
@@ -2171,5 +2653,7 @@
}
#endregion
+
+
}
}
--
Gitblit v1.8.0