From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 628 ++++++++++++++++++++++++++------------------------------
1 files changed, 292 insertions(+), 336 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index bc4aa84..5a338c3 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -166,45 +166,25 @@
{
var light = deviceUI.CommonDevice as ToggleLight;
light.DeviceStatusReport = common.DeviceStatusReport;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
+ //璁板綍銆佹洿鏂扮姸鎬�
+ 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;
}
+ 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;
}
if (common.DeviceStatusReport.CluterID == 3)
{
- var light = deviceUI.CommonDevice as ToggleLight;
- light.IsOnline = 1;
- //璁板綍鍥炲鏃堕棿
- 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 = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(true);
}
break;
@@ -214,66 +194,55 @@
{
var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
airSwitch.DeviceStatusReport = common.DeviceStatusReport;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
+ //璁板綍銆佹洿鏂扮姸鎬�
+ 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;
}
+ 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;
}
if (common.DeviceStatusReport.CluterID == 3)
{
- var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
- airSwitch.IsOnline = 1;
- //璁板綍鍥炲鏃堕棿
- 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 = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(true);
}
break;
case DeviceType.WindowCoveringDevice:
+
+ if (common.DeviceStatusReport.CluterID == 258)
+ {
+ if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
+ {
+ //绐楀笜绫诲瀷
+ 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)
{
- var rollerShape = deviceUI.CommonDevice as Rollershade;
- //璁板綍鍥炲鏃堕棿
- rollerShape.LastDateTime = DateTime.Now;
- rollerShape.IsOnline = 1;
- 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.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
+ row.SetStatu(true);
}
break;
@@ -360,47 +329,27 @@
//璋冨厜鐏姛鑳�
if (common.DeviceStatusReport.CluterID == 6)
{
- var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
+ var dimmableLight = deviceUI.CommonDevice as DimmableLight;
dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
- for (int j = 0; j < rowLayout.ChildrenCount; j++)
+ //璁板綍銆佹洿鏂扮姸鎬�
+ 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;
}
+ 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;
}
if (common.DeviceStatusReport.CluterID == 3)
{
- var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
- dimmableLight.IsOnline = 1;
- //璁板綍鍥炲鏃堕棿
- 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;
- }
- }
+ deviceUI.CommonDevice.IsOnline = 1;
+ deviceUI.CommonDevice.LastDateTime = DateTime.Now;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatu(true);
}
break;
}
@@ -433,77 +382,35 @@
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 row4 = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ //row4.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
break;
}
}
@@ -808,6 +715,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
@@ -820,15 +736,19 @@
functionSceneAutoBodyView.RemoveAll();
if (functionBtn.IsSelected)
{
+ HidenFloor(false);
ShowFunction();
}
else if (sceneBtn.IsSelected)
{
+ HidenFloor(false);
ShowScene();
}
else if (automationBtn.IsSelected)
{
+ HidenFloor(true);
ShowAutotion();
+
}
}
@@ -1000,8 +920,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) =>
@@ -1020,6 +941,7 @@
{
light.SwitchControl(0);
}
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1037,11 +959,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()
@@ -1088,7 +1029,7 @@
var deviceTypeRowLayout = new RowLayout()
{
- Height = Application.GetRealHeight(127 + 35),
+ Height = Application.GetRealHeight(129 + 35),
LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
@@ -1097,8 +1038,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) =>
@@ -1108,8 +1050,8 @@
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
- (send2 as CommonForm.SelectedStatuButton).IsSelected = !(send2 as CommonForm.SelectedStatuButton).IsSelected;
- if ((send2 as CommonForm.SelectedStatuButton).IsSelected)
+ (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+ if ((send2 as Button).IsSelected)
{
airSwitch.SwitchControl(1);
}
@@ -1117,6 +1059,7 @@
{
airSwitch.SwitchControl(0);
}
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1134,10 +1077,10 @@
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);
};
@@ -1196,8 +1139,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) =>
@@ -1207,8 +1151,8 @@
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
- (send2 as CommonForm.SelectedStatuButton).IsSelected = !(send2 as CommonForm.SelectedStatuButton).IsSelected;
- if ((send2 as CommonForm.SelectedStatuButton).IsSelected)
+ (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+ if ((send2 as Button).IsSelected)
{
dimmableLight.SwitchControl(1);
}
@@ -1216,6 +1160,7 @@
{
dimmableLight.SwitchControl(0);
}
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1237,7 +1182,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);
};
@@ -1302,10 +1247,12 @@
};
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(ac.IsOnline == 1);
+ deviceRow.SetOnLineStatu(ac.IsOnline == 1);
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.SetStatu(ac.currentSystemMode != 1);
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1324,6 +1271,7 @@
{
ac.Close();
}
+ deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
//鎺у埗寤舵椂鍥炶皟
DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
{
@@ -1369,6 +1317,7 @@
UserHomeView.ReadStatus(rollerShade, () =>
{
rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ rollerShade.ReadWcdCurrentPositionLiftPercentage();
});
}
else
@@ -1377,23 +1326,44 @@
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()
{
@@ -1411,42 +1381,19 @@
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
{
-
+
}
}
};
@@ -1862,7 +1809,6 @@
{
functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
-
var bjFrameLayout = new FrameLayout
{
Width = Application.GetRealWidth(1080 - 58),
@@ -2014,7 +1960,7 @@
Yheight = 0;
}
logicScrolView.Y = scenehorizontalScrol.Bottom + Yheight;
- logicScrolView.Height = functionSceneBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
+ logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
Automationview(logicScrolView);
};
@@ -2040,6 +1986,7 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
+
}
/// <summary>
@@ -2051,32 +1998,26 @@
refresview.RemoveAll();
foreach (var logic in Common.Logic.LogicList)
{
- var bjRow = new RowLayout
- {
- Width = Application.GetRealWidth(1080 - 58),
- Height = Application.GetRealHeight(220),
- LineColor = ZigbeeColor.Current.LogicBackgroundColor,
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- refresview.AddChidren(bjRow);
var logicRowlayout = new RowLayout
{
- Y = Application.GetRealHeight(220 - 190),
- Height = Application.GetRealHeight(190),
- Width = Application.GetRealWidth(1080 - 58 - 46),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- X = Application.GetRealWidth(46),
+ Height = Application.GetRealHeight(190 + 30),
+ Width = Application.GetRealWidth(1080),
+ LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
- bjRow.AddChidren(logicRowlayout);
+ refresview.AddChidren(logicRowlayout);
+
+
var logicnameBtn = new Button
{
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(350),
Text = logic.LogicName,
- X = Application.GetRealWidth(12),
+ X = Application.GetRealWidth(12 + 46),
+ Y = Application.GetRealHeight(30),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
@@ -2089,8 +2030,8 @@
Height = Application.GetMinRealAverage(63),
UnSelectedImagePath = "ZigeeLogic/logicclose.png",
SelectedImagePath = "ZigeeLogic/logicopen.png",
- X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
- Y = Application.GetRealHeight(58 + 30 + 9),
+ X = logicRowlayout.Width - Application.GetRealWidth(104 + 58 + 58),
+ Y = Application.GetRealHeight(58 + 30 + 9 + 30),
};
logicRowlayout.AddChidren(logicswitchBtn);
@@ -2167,91 +2108,32 @@
alert.Show();
};
-
- }
-
-
- }
-
- #region 鈼� 鎺у埗鐘舵�乢________________________
-
- /// <summary>
- /// 鏄剧ず璁惧鎺у埗鐘舵��
- /// </summary>
- /// <param name="command">Command.</param>
- /// <param name="objValue">Object value.</param>
- private void UpdateDeviceControllStatu(string command, object objValue)
- {
- if (command != "DeviceDefaultAck" || objValue == null)
- {
- return;
- }
- var tempDevice = (CommonDevice)objValue;
- if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == tempDevice.DeviceEpoint && obj.DeviceAddr == tempDevice.DeviceAddr))
- {
- return;
- }
- //鏍囪宸茬粡鍙戦�佹帶鍒跺懡浠ゅ埌缃戝叧
- sendedControlCommand = true;
- //DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
- }
-
- /// <summary>
- /// 绉婚櫎鍏ㄩ儴鏇存柊鎺у埗璁惧鐨刟ction
- /// </summary>
- private void RemoveAllUpdateControlDeviceStatuAction()
- {
- foreach (var gateway in zbGatewayList)
- {
- //绉婚櫎action
- if (gateway != null)
+ var line = new Button
{
- gateway.ReportAction -= UpdateDeviceControllStatu;
- }
+ 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>
- /// 绉婚櫎鍗曚釜鎺у埗璁惧鐨勬洿鏂扮姸鎬乤ction
+ /// 鏄剧ず鍥炬爣鐨勯鑹�
/// </summary>
- /// <param name="gateway">Gateway.</param>
- private void RemoveUpdateControlDeviceStatuAction(ZbGateway gateway)
- {
- //绉婚櫎action
- if (gateway != null)
- {
- gateway.ReportAction -= UpdateDeviceControllStatu;
- }
- }
-
- /// <summary>
- /// 娣诲姞闇�瑕佺洃鎺у洖璋冪姸鎬佺殑缃戝叧鍜岃澶�
- /// </summary>
- /// <param name="gatewayList">Gateway list.</param>
- /// <param name="gateway">Gateway.</param>
- /// <param name="deviceList">Device list.</param>
- /// <param name="common">Common.</param>
- private void AddZbGateway(List<ZbGateway> gatewayList, ZbGateway gateway, List<CommonDevice> deviceList, CommonDevice common)
- {
- if (null == gatewayList.Find((obj) => obj.getGatewayBaseInfo.gwID == gateway.getGatewayBaseInfo.gwID))
- {
- gatewayList.Add(gateway);
- }
- if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == common.DeviceEpoint && obj.DeviceAddr == common.DeviceAddr))
- {
- commonDeviceList.Add(common);
- }
- }
-
- #endregion
-
+ /// <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),
+ Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350 + 58),
+ Y = Application.GetRealHeight(30),
X = Application.GetRealWidth(365),
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
@@ -2542,8 +2424,8 @@
{
Width = Application.GetRealWidth(82),
Height = Application.GetRealHeight(82),
- X = Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
- Y = Application.GetRealHeight(58 + 30),
+ 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,
};
@@ -2561,7 +2443,7 @@
var connectIconBtn = new Button
{
Y = typebjBtn.Y + Application.GetRealHeight(35),
- X = Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
+ 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",
@@ -2639,5 +2521,79 @@
}
}
#endregion
+
+ #region 鈼� 鎺у埗鐘舵�乢________________________
+
+ /// <summary>
+ /// 鏄剧ず璁惧鎺у埗鐘舵��
+ /// </summary>
+ /// <param name="command">Command.</param>
+ /// <param name="objValue">Object value.</param>
+ private void UpdateDeviceControllStatu(string command, object objValue)
+ {
+ if (command != "DeviceDefaultAck" || objValue == null)
+ {
+ return;
+ }
+ var tempDevice = (CommonDevice)objValue;
+ if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == tempDevice.DeviceEpoint && obj.DeviceAddr == tempDevice.DeviceAddr))
+ {
+ return;
+ }
+ //鏍囪宸茬粡鍙戦�佹帶鍒跺懡浠ゅ埌缃戝叧
+ sendedControlCommand = true;
+ //DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
+ }
+
+ /// <summary>
+ /// 绉婚櫎鍏ㄩ儴鏇存柊鎺у埗璁惧鐨刟ction
+ /// </summary>
+ private void RemoveAllUpdateControlDeviceStatuAction()
+ {
+ foreach (var gateway in zbGatewayList)
+ {
+ //绉婚櫎action
+ if (gateway != null)
+ {
+ gateway.ReportAction -= UpdateDeviceControllStatu;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 绉婚櫎鍗曚釜鎺у埗璁惧鐨勬洿鏂扮姸鎬乤ction
+ /// </summary>
+ /// <param name="gateway">Gateway.</param>
+ private void RemoveUpdateControlDeviceStatuAction(ZbGateway gateway)
+ {
+ //绉婚櫎action
+ if (gateway != null)
+ {
+ gateway.ReportAction -= UpdateDeviceControllStatu;
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞闇�瑕佺洃鎺у洖璋冪姸鎬佺殑缃戝叧鍜岃澶�
+ /// </summary>
+ /// <param name="gatewayList">Gateway list.</param>
+ /// <param name="gateway">Gateway.</param>
+ /// <param name="deviceList">Device list.</param>
+ /// <param name="common">Common.</param>
+ private void AddZbGateway(List<ZbGateway> gatewayList, ZbGateway gateway, List<CommonDevice> deviceList, CommonDevice common)
+ {
+ if (null == gatewayList.Find((obj) => obj.getGatewayBaseInfo.gwID == gateway.getGatewayBaseInfo.gwID))
+ {
+ gatewayList.Add(gateway);
+ }
+ if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == common.DeviceEpoint && obj.DeviceAddr == common.DeviceAddr))
+ {
+ commonDeviceList.Add(common);
+ }
+ }
+
+ #endregion
+
+
}
}
--
Gitblit v1.8.0