From b186c02eb9e44268727b769be477d1956e97fbb0 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 09:08:05 +0800
Subject: [PATCH] 2019.1.2
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 386 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 288 insertions(+), 98 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 75b3e76..e019f26 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -85,7 +85,7 @@
/// <summary>
/// 鍔熻兘绫诲瀷鎸夐挳
/// </summary>
- private FunctionButton functionTypeIMG;
+ //private FunctionButton functionTypeIMG;
/// <summary>
/// 鍔熻兘绫诲瀷
/// </summary>
@@ -93,7 +93,7 @@
/// <summary>
/// 璁惧绫诲瀷RowLayout
/// </summary>
- private FrameLayout typeRowLayout;
+ //private FrameLayout typeRowLayout;
/// <summary>
/// 妤煎眰
/// </summary>
@@ -122,7 +122,7 @@
/// <summary>
/// 褰撳墠閫変腑鎴块棿
/// </summary>
- private Common.Room room;
+ private Common.Room curRoom;
#endregion
#region 鈼� 鎺ュ彛____________________________
@@ -195,7 +195,7 @@
light.DeviceStatusReport = common.DeviceStatusReport;
light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(light.OnOffStatus == 1);
+ row.IsSelected = light.OnOffStatus == 1;
row.SetStatuText(deviceUI.GetDeviceStatu());
light.LastDateTime = DateTime.Now;
}
@@ -203,8 +203,6 @@
{
deviceUI.CommonDevice.IsOnline = 1;
deviceUI.CommonDevice.LastDateTime = DateTime.Now;
- var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(true);
}
break;
@@ -216,7 +214,7 @@
airSwitch.DeviceStatusReport = common.DeviceStatusReport;
airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(airSwitch.OnOffStatus == 1);
+ row.IsSelected = airSwitch.OnOffStatus == 1;
row.SetStatuText(deviceUI.GetDeviceStatu());
airSwitch.LastDateTime = DateTime.Now;
}
@@ -224,8 +222,6 @@
{
deviceUI.CommonDevice.IsOnline = 1;
deviceUI.CommonDevice.LastDateTime = DateTime.Now;
- var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(true);
}
break;
case DeviceType.WindowCoveringDevice:
@@ -248,6 +244,7 @@
rollerShade.DeviceStatusReport = common.DeviceStatusReport;
rollerShade.WcdCurrentPositionLiftPercentage = common.DeviceStatusReport.AttriBute[0].AttriButeData;
row.SetStatuText($"{Language.StringByID(R.MyInternationalizationString.Current)} { deviceUI.GetDeviceStatu()}");
+ row.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage != 0;
rollerShade.LastDateTime = DateTime.Now;
}
}
@@ -255,8 +252,6 @@
{
deviceUI.CommonDevice.IsOnline = 1;
deviceUI.CommonDevice.LastDateTime = DateTime.Now;
- var row = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
- row.SetStatu(true);
}
break;
@@ -307,7 +302,7 @@
}
}
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(ac.currentSystemMode != 0);
+ row.IsSelected = ac.currentSystemMode != 0;
row.SetStatuText(deviceUI.GetDeviceStatu());
}
@@ -331,7 +326,7 @@
}
}
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(ac.currentSystemMode != 0);
+ row.IsSelected = ac.currentSystemMode != 0;
row.SetStatuText(deviceUI.GetDeviceStatu());
}
@@ -340,8 +335,6 @@
var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
ac.IsOnline = 1;
ac.LastDateTime = DateTime.Now;
- var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(true);
}
break;
case DeviceType.DimmableLight:
@@ -352,7 +345,7 @@
dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(dimmableLight.OnOffStatus == 1);
+ row.IsSelected = dimmableLight.OnOffStatus == 1;
row.SetStatuText(deviceUI.GetDeviceStatu());
dimmableLight.LastDateTime = DateTime.Now;
}
@@ -362,7 +355,7 @@
dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
dimmableLight.Level = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(dimmableLight.OnOffStatus == 1);
+ row.IsSelected = dimmableLight.OnOffStatus == 1;
row.SetStatuText(deviceUI.GetDeviceStatu());
dimmableLight.LastDateTime = DateTime.Now;
}
@@ -370,8 +363,66 @@
{
deviceUI.CommonDevice.IsOnline = 1;
deviceUI.CommonDevice.LastDateTime = DateTime.Now;
- var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row.SetStatu(true);
+ }
+ break;
+
+ case DeviceType.TemperatureSensor:
+ //娓╁害
+ if (common.DeviceStatusReport.CluterID == 1026)
+ {
+ var tempera = deviceUI.CommonDevice as TemperatureSensor;
+ foreach (var data in common.DeviceStatusReport.AttriBute)
+ {
+ if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ if (data.AttriButeData == 0)
+ {
+ tempera.Temperatrue = 0;
+ }
+ else if (data.AttriButeData > 32767)
+ {
+ //璐熸暟(鐗规畩澶勭悊)
+ string strValue = (data.AttriButeData - 65536).ToString();
+ //灏忔暟鐐归渶瑕佷竴浣�
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ tempera.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ tempera.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatuText(deviceUI.GetDeviceStatu());
+ }
+ }
+ }
+ //婀垮害
+ if (common.DeviceStatusReport.CluterID == 1029)
+ {
+ var tempera = deviceUI.CommonDevice as TemperatureSensor;
+ foreach (var data in common.DeviceStatusReport.AttriBute)
+ {
+ if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ if (data.AttriButeData == 0)
+ {
+ tempera.Humidity = 0;
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ tempera.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ tempera.LastDateTime = DateTime.Now;
+ }
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.SetStatuText(deviceUI.GetDeviceStatu());
+ }
+ }
}
break;
}
@@ -405,37 +456,66 @@
{
case DeviceType.OnOffOutput:
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:
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:
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:
deviceUI.CommonDevice.LastDateTime = DateTime.Now;
deviceUI.CommonDevice.IsOnline = common.IsOnline;
- var row5 = rowLayout.GetChildren(0) as CategoryFunctionRow;
- row5.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
+ break;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"鍒嗙被璁惧鐘舵��-Error:{ex.Message}");
+ }
+ });
+ }
+ else if (typeTag == "IASInfoReport")
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ for (int i = 0; deviceListScrolView != null && i < deviceListScrolView.ChildrenCount; i++)
+ {
+ var rowLayout = deviceListScrolView.GetChildren(i) as RowLayout;
+ var deviceUI = rowLayout.Tag as DeviceUI;
+ if (deviceUI == null || deviceUI.CommonDevice == null)
+ {
+ continue;
+ }
+ if (deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr || deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint)
+ {
+ continue;
+ }
+ switch (deviceUI.CommonDevice.Type)
+ {
+ case DeviceType.IASZone:
+ //寮�鍏冲姛鑳�
+ var ias = common as IASZone;
+ var iAS = deviceUI.CommonDevice as ZigBee.Device.IASZone;
+ iAS.iASInfo = ias.iASInfo;
+ var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+ row.IsSelected = iAS.iASInfo?.Alarm1 == 1;
+ row.SetStatuText(deviceUI.GetDeviceStatu());
+ iAS.LastDateTime = DateTime.Now;
break;
}
}
@@ -799,18 +879,25 @@
{
devList = room.DeviceUIList;
sceneList = room.SceneUIList;
- var sameDevList = new List<DeviceUI> { };
typeDeviceDic.Clear();
typeIdDic.Clear();
foreach (var device in devList)
{
var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device.CommonDevice });
- if(info.BeloneType== DeviceBeloneType.A骞叉帴鐐� || info.BeloneType==DeviceBeloneType.A涓户鍣�)
+ if (info.BeloneType == DeviceBeloneType.A骞叉帴鐐� || info.BeloneType == DeviceBeloneType.A涓户鍣�)
{
continue;
}
- sameDevList.Add(device);
- typeDeviceDic[info.BeloneTextId] = sameDevList;
+ if (typeDeviceDic.ContainsKey(info.BeloneTextId) == false)
+ {
+ var sameDevList = new List<DeviceUI> { };
+ sameDevList.Add(device);
+ typeDeviceDic[info.BeloneTextId] = sameDevList;
+ }
+ else
+ {
+ typeDeviceDic[info.BeloneTextId].Add(device);
+ }
typeIdDic[info.BeloneTextId] = info.ConcreteType;
}
}
@@ -904,9 +991,9 @@
deviceListScrolView = new VerticalScrolViewLayout
{
X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Y = Application.GetRealHeight(35+275),
+ Y = Application.GetRealHeight(35+279),
Width = Application.GetRealWidth(1028),
- Height = Application.GetRealHeight(939),
+ Height = Application.GetRealHeight(942),
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(deviceListScrolView);
@@ -917,13 +1004,13 @@
foreach (var deviceType in typeIdDic)
{
- typeRowLayout = new FrameLayout()
+ var typeRowLayout = new FrameLayout()
{
Width = Application.GetRealWidth(220),
};
functionTypeScrowView.AddChidren(typeRowLayout);
- functionTypeIMG = new FunctionButton()
+ var functionTypeIMG = new FunctionButton()
{
Tag = deviceType.Key
};
@@ -936,7 +1023,7 @@
functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
- if (typeRowLayout.ChildrenCount == 1)
+ if (functionTypeScrowView.ChildrenCount == 1)
{
ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
}
@@ -979,13 +1066,22 @@
{
if (e2)
{
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.CommonDevice);
- deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
+ if(curRoom.IsLove)
{
- RefreshBodyView();
+ Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
+ deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
+ sameTypeList.Remove(deviceUI);
}
+ else
+ {
+ Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.CommonDevice);
+ deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
+ sameTypeList.Remove(deviceUI);
+ }
+ //if (sameTypeList.Count == 0)
+ //{
+ // RefreshBodyView();
+ //}
}
};
};
@@ -1036,9 +1132,9 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetOnLineStatu(light.IsOnline == 1);
+ //deviceRow.SetOnLineStatu(light.IsOnline == 1);
deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
- deviceRow.SetStatu(light.OnOffStatus == 1);
+ deviceRow.IsSelected = light.OnOffStatus == 1;
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1081,7 +1177,7 @@
UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
//lightControl.action = RefreshBodyView;
- lightControl.Show(deviceUI, room);
+ lightControl.Show(deviceUI, curRoom);
}
else if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A鎻掑骇)
{
@@ -1089,7 +1185,7 @@
UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
//lightControl.action = RefreshBodyView;
- lightControl.Show(deviceUI, room);
+ lightControl.Show(deviceUI, curRoom);
}
else
{
@@ -1097,7 +1193,7 @@
UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
//lightControl.action = RefreshBodyView;
- lightControl.Show(deviceUI, room);
+ lightControl.Show(deviceUI, curRoom);
}
};
@@ -1111,7 +1207,7 @@
Tag = deviceUI,
Radius = 0
};
- if (room.IsSharedRoom == false)
+ if (curRoom.IsSharedRoom == false)
{
deviceTypeRowLayout.AddRightView(editBtn);
editBtn.MouseUpEventHandler += deviceDetailHandler;
@@ -1157,8 +1253,8 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
- deviceRow.SetStatu(airSwitch.OnOffStatus == 1);
+ //deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
+ deviceRow.IsSelected = airSwitch.OnOffStatus == 1;
deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1168,8 +1264,8 @@
sendedControlCommand = false;
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
-
(send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+ deviceRow.IsSelected = (send2 as Button).IsSelected;
if ((send2 as Button).IsSelected)
{
airSwitch.SwitchControl(1);
@@ -1201,7 +1297,7 @@
UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
//lightControl.action = RefreshBodyView;
- lightControl.Show(deviceUI, room);
+ lightControl.Show(deviceUI, curRoom);
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1214,7 +1310,7 @@
Tag = deviceUI,
Radius = 0
};
- if (room.IsSharedRoom == false)
+ if (curRoom.IsSharedRoom == false)
{
deviceTypeRowLayout.AddRightView(editBtn);
editBtn.MouseUpEventHandler += deviceDetailHandler;
@@ -1260,9 +1356,9 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
+ //deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
- deviceRow.SetStatu(dimmableLight.OnOffStatus == 1);
+ deviceRow.IsSelected = dimmableLight.OnOffStatus == 1;
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1271,8 +1367,8 @@
sendedControlCommand = false;
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
-
(send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+ deviceRow.IsSelected = (send2 as Button).IsSelected;
if ((send2 as Button).IsSelected)
{
dimmableLight.SwitchControl(1);
@@ -1304,7 +1400,7 @@
UserView.HomePage.Instance.PageIndex += 1;
UserView.HomePage.Instance.ScrollEnabled = false;
//dimmableLightControl.action = RefreshBodyView;
- dimmableLightControl.Show(deviceUI, room);
+ dimmableLightControl.Show(deviceUI, curRoom);
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1317,7 +1413,7 @@
Tag = deviceUI,
Radius = 0
};
- if (room.IsSharedRoom == false)
+ if (curRoom.IsSharedRoom == false)
{
deviceTypeRowLayout.AddRightView(editBtn);
editBtn.MouseUpEventHandler += deviceDetailHandler;
@@ -1365,9 +1461,9 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetOnLineStatu(ac.IsOnline == 1);
+ //deviceRow.SetOnLineStatu(ac.IsOnline == 1);
deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
- deviceRow.SetStatu(ac.currentSystemMode != 1);
+ deviceRow.IsSelected = ac.currentSystemMode != 1;
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1378,6 +1474,7 @@
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
(send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+ deviceRow.IsSelected = (send2 as Button).IsSelected;
if ((send2 as Button).IsSelected)
{
ac.Open();
@@ -1412,7 +1509,7 @@
Tag = deviceUI,
Radius = 0
};
- if (room.IsSharedRoom == false)
+ if (curRoom.IsSharedRoom == false)
{
deviceTypeRowLayout.AddRightView(editBtn);
editBtn.MouseUpEventHandler += deviceDetailHandler;
@@ -1427,7 +1524,7 @@
UserView.HomePage.Instance.PageIndex += 1;
UserView.HomePage.Instance.ScrollEnabled = false;
//rollerShadeControl.action = RefreshBodyView;
- acControl.Show(deviceUI, room);
+ acControl.Show(deviceUI, curRoom);
};
}
}
@@ -1469,9 +1566,9 @@
var deviceRow = new CategoryFunctionForWinRow(0, 35);
deviceRow.Init(deviceUI);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
+ //deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
- deviceRow.SetStatu(rollerShade.WcdCurrentPositionLiftPercentage != 0);
+ deviceRow.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage != 0;
deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1502,7 +1599,7 @@
Tag = deviceUI,
Radius = 0
};
- if (room.IsSharedRoom == false)
+ if (curRoom.IsSharedRoom == false)
{
deviceTypeRowLayout.AddRightView(editBtn);
editBtn.MouseUpEventHandler += deviceDetailHandler;
@@ -1517,7 +1614,7 @@
UserView.HomePage.Instance.PageIndex += 1;
UserView.HomePage.Instance.ScrollEnabled = false;
//rollerShadeControl.action = RefreshBodyView;
- rollerShadeControl.Show(deviceUI, room);
+ rollerShadeControl.Show(deviceUI, curRoom);
};
}
}
@@ -1534,14 +1631,14 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
+ //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);
+ var userDoorLockPage = new UserDoorLockPage(curRoom, deviceUI);
HomePage.Instance.AddChidren(userDoorLockPage);
HomePage.Instance.PageIndex += 1;
userDoorLockPage.Show();
@@ -1555,12 +1652,118 @@
{
Tag = deviceUI
};
- if (room.IsSharedRoom == false)
+ if (curRoom.IsSharedRoom == false)
{
deviceTypeRowLayout.AddRightView(editBtn);
editBtn.MouseUpEventHandler += deviceDetailHandler;
deviceTypeRowLayout.AddRightView(delBtn);
delBtn.MouseUpEventHandler += delEvent;
+ }
+ }
+ else if (deviceUI.CommonDevice.Type == DeviceType.IASZone)
+ {
+ 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.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.IsSelected = (deviceUI.CommonDevice as IASZone).iASInfo?.Alarm1 == 1;
+ deviceRow.HideSwitchBtn(true);
+ deviceTypeRowLayout.AddChidren(deviceRow);
+
+ var editBtn = new CommonForm.RowLayoutEditButton()
+ {
+ Tag = deviceUI
+ };
+ var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+ {
+ Tag = deviceUI
+ };
+ if (curRoom.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
+ }
+ else if (deviceUI.CommonDevice.Type == DeviceType.TemperatureSensor)
+ {
+ var tempera = deviceUI.CommonDevice as TemperatureSensor;
+ if (tempera.Gateway != null)
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(100 * i);
+ if (tempera.Gateway.IsVirtual)
+ {
+ UserHomeView.ReadStatus(tempera, () =>
+ {
+ if (tempera.SensorDiv == 1)
+ {
+ ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(deviceUI.CommonDevice);
+ }
+ else if (tempera.SensorDiv == 2)
+ {
+ ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(deviceUI.CommonDevice);
+ }
+ });
+ }
+ else
+ {
+ if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - tempera.LastDateTime).TotalSeconds)
+ {
+ if (tempera.SensorDiv == 1)
+ {
+ ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(deviceUI.CommonDevice);
+ }
+ else if (tempera.SensorDiv == 2)
+ {
+ ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(deviceUI.CommonDevice);
+ }
+ }
+ }
+ })
+ { IsBackground = true }.Start();
+ 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.SetStatuText(deviceUI.GetDeviceStatu());
+ deviceRow.IsSelected = false;
+ deviceRow.HideSwitchBtn(true);
+ deviceTypeRowLayout.AddChidren(deviceRow);
+
+ var editBtn = new CommonForm.RowLayoutEditButton()
+ {
+ Tag = deviceUI
+ };
+ var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+ {
+ Tag = deviceUI
+ };
+ if (curRoom.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
+
}
}
else
@@ -1576,7 +1779,7 @@
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
+ //deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
deviceRow.HideSwitchBtn(true);
deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1589,7 +1792,7 @@
{
Tag = deviceUI
};
- if (room.IsSharedRoom == false)
+ if (curRoom.IsSharedRoom == false)
{
deviceTypeRowLayout.AddRightView(editBtn);
editBtn.MouseUpEventHandler += deviceDetailHandler;
@@ -1631,39 +1834,27 @@
};
functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
- Button curBtn = new Button();
+ RoomButton curBtn = new RoomButton(0,0);
foreach (var room in Common.Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
{
var row = new FrameLayout()
{
- Width = Application.GetRealWidth(187 + 50),
+ Width = Application.GetRealWidth(255),
Height = Application.GetRealHeight(167)
};
roomFL.AddChidren(row);
- var roomBtn = new Button()
- {
- Width = Application.GetRealWidth(187),
- Height = Application.GetRealHeight(78),
- Radius = (uint)Application.GetRealHeight(78 / 2),
- Gravity = Gravity.Center,
- Text = room.Name,
- TextColor = ZigbeeColor.Current.GXCTextGrayColor,
- SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- BackgroundColor = ZigbeeColor.Current.GXCButtonUnSelectedColor3,
- SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
- BorderColor = ZigbeeColor.Current.GXCBorderUnSelectedColor,
- BorderWidth = 1
- };
+ RoomButton roomBtn = new RoomButton(0, 0);
+ roomBtn.Gravity = Gravity.Center;
+ roomBtn.Init();
+ roomBtn.SetTitle(room.Name);
row.AddChidren(roomBtn);
- roomBtn.SetViewShadow(true,5);
if (room.IsLove)
{
roomBtn.IsSelected = true;
- this.room = room;
+ this.curRoom = room;
curBtn = roomBtn;
-
if(sceneBtn.IsSelected)
{
RefreshScene(room);
@@ -1672,18 +1863,17 @@
{
RefreshFunction(room);
}
-
}
- roomBtn.MouseUpEventHandler += (sender, e) =>
+ roomBtn.ButtonClickEvent += (sender, e) =>
{
- if ((sender as Button) == curBtn)
+ if (sender == curBtn)
{
return;
}
- (sender as Button).IsSelected = true;
+ sender.IsSelected = true;
curBtn.IsSelected = false;
- curBtn = sender as Button;
- this.room = room;
+ curBtn = sender;
+ this.curRoom = room;
if (sceneBtn.IsSelected)
{
RefreshScene(room);
@@ -1713,8 +1903,8 @@
/// <param name="room"></param>
public void RefreshScene(Common.Room room)
{
+ RefreshData(room);
functionSceneBodyView.RemoveAll();
- var sceneList = room.SceneUIList;
if (sceneList.Count == 0)
{
ShowNoSceneTip();
--
Gitblit v1.8.0