From bc6d6b77675b8915635aa04ba765ea627ac63cfa Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 17 十二月 2019 09:38:17 +0800
Subject: [PATCH] 2019.12.17
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 637 +++++++++++++++++++++++----------------------------------
1 files changed, 257 insertions(+), 380 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
old mode 100755
new mode 100644
index 9a7da8b..e52cefb
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -7,6 +7,7 @@
using Shared.Phone.Device.CommonForm;
using Shared.Phone.Device.AC;
using Shared.Phone.UserCenter.DoorLock;
+using Shared.Phone.Device.DeviceLogic;
namespace Shared.Phone.Device.Category
{
@@ -148,6 +149,10 @@
{
try
{
+ if (common.DeviceStatusReport.AttriBute == null || common.DeviceStatusReport.AttriBute.Count == 0)
+ {
+ return;
+ }
for (int i = 0; deviceListScrolView != null && i < deviceListScrolView.ChildrenCount; i++)
{
var rowLayout = deviceListScrolView.GetChildren(i) as RowLayout;
@@ -168,10 +173,6 @@
{
var light = deviceUI.CommonDevice as ToggleLight;
light.DeviceStatusReport = common.DeviceStatusReport;
- if (light.DeviceStatusReport.AttriBute == null || light.DeviceStatusReport.AttriBute.Count == 0)
- {
- continue;
- }
light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
row.SetStatu(light.OnOffStatus == 1);
@@ -193,10 +194,6 @@
{
var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
airSwitch.DeviceStatusReport = common.DeviceStatusReport;
- if (airSwitch.DeviceStatusReport.AttriBute == null || airSwitch.DeviceStatusReport.AttriBute.Count == 0)
- {
- return;
- }
airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
row.SetStatu(airSwitch.OnOffStatus == 1);
@@ -248,43 +245,47 @@
if (common.DeviceStatusReport.CluterID == 513)
{
var attriButeList = common.DeviceStatusReport.AttriBute;
- if (attriButeList == null || attriButeList.Count == 0)
- {
- return;
- }
var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
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)
+ foreach(var attList in attriButeList)
{
- case 0:
- ac.currentLocalTemperature = curTemp;
- ac.LastDateTime = DateTime.Now;
- break;
-
- case 17:
- ac.currentCoolingSetpoint = curTemp;
- ac.LastDateTime = DateTime.Now;
- break;
-
- case 18:
- ac.currentHeatingSetpoint = curTemp;
- ac.LastDateTime = DateTime.Now;
- break;
-
- case 4096:
- ac.currentAutoSetpoint = curTemp;
- ac.LastDateTime = DateTime.Now;
- break;
-
- case 28:
- //姝ゅ睘鎬ф弿杩版亽娓╄澶囨澶勪簬鍝妯″紡
- ac.currentSystemMode = attriButeList[0].AttriButeData;
- ac.LastDateTime = DateTime.Now;
- break;
+ var curTemp = (attList.AttriButeData / 100 < ACControlBase.Temperature_High || attList.AttriButeData / 100 > ACControlBase.Temperature_Low) ? attList.AttriButeData / 100 : ACControlBase.Temperature_Default;
+ switch (attList.AttributeId)
+ {
+ case 0:
+ ac.currentLocalTemperature = curTemp;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ case 17:
+ ac.currentCoolingSetpoint = curTemp;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ case 18:
+ ac.currentHeatingSetpoint = curTemp;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ case 4096:
+ ac.currentAutoSetpoint = curTemp;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ case 28:
+ ac.currentSystemMode = attList.AttriButeData;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ case 4099:
+ var value = Convert.ToString(attList.AttriButeData, 2).PadLeft(16, '0');
+ var modeStr = value.Substring(value.Length - 5, 5);
+ for (int j = 0; j < modeStr.Length; j++)
+ {
+ ac.listSupportMode[j] = Convert.ToInt32(modeStr[j]) == 49 ? 1 : 0;
+ }
+ break;
+ case 4097:
+ //杩囪檻缃戞竻娲楁爣蹇�:42
+ ac.CleanStatu = attList.AttriButeData == 42;
+ break;
+ }
}
-
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
row.SetStatu(ac.currentSystemMode != 0);
row.SetStatuText(deviceUI.GetDeviceStatu());
@@ -294,21 +295,20 @@
{
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)
+ foreach(var attList in attriButeList)
{
- case 0:
- ac.currentFanMode = attriButeList[0].AttriButeData;
- ac.LastDateTime = DateTime.Now;
- break;
- case 4096:
- ac.currentFanSwingMode = attriButeList[0].AttriButeData;
- ac.LastDateTime = DateTime.Now;
- break;
+ switch (attList.AttributeId)
+ {
+ case 0:
+ ac.currentFanMode = attList.AttriButeData;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ case 4096:
+ ac.currentFanSwingMode = attList.AttriButeData;
+ ac.LastDateTime = DateTime.Now;
+ break;
+ }
}
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
row.SetStatu(ac.currentSystemMode != 0);
@@ -330,12 +330,17 @@
{
var dimmableLight = deviceUI.CommonDevice as DimmableLight;
dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
- //璁板綍銆佹洿鏂扮姸鎬�
- if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
- {
- 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 == 8)
+ {
+ var dimmableLight = deviceUI.CommonDevice as DimmableLight;
+ dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
+ dimmableLight.Level = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
row.SetStatu(dimmableLight.OnOffStatus == 1);
row.SetStatuText(deviceUI.GetDeviceStatu());
@@ -384,12 +389,14 @@
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;
@@ -403,6 +410,7 @@
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;
@@ -467,8 +475,9 @@
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterLeft,
TextID = R.MyInternationalizationString.Category,
- TextSize = 20,
+ TextSize = 24,
TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
+ IsBold=true
};
topView.AddChidren(title);
@@ -608,9 +617,10 @@
var floors = new SelectFloor ();
AddChidren(floors);
floors.Init(580,330,Direction.Right);
- floors.FloorAction += (floorName) =>
+ floors.changeFloor = true;
+ floors.FloorAction += (floorId) =>
{
- floorBtn.Text = floorName;
+ floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
RefreshBodyView();
};
}
@@ -810,6 +820,7 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(functionTypeScrowView);
+ //functionSceneBodyView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
deviceListScrolView = new VerticalScrolViewLayout
{
@@ -820,7 +831,10 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(deviceListScrolView);
+ //deviceListScrolView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
+
tempFunctionTypeBtn = new FunctionButton();
+ tempFunctionTypeBtn.Init("","");
EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
{
@@ -852,7 +866,7 @@
{
var alert = new CustomAlert();
AddChidren(alert);
- alert.Show(Language.StringByID(R.MyInternationalizationString.ConfirmDelete));
+ alert.Show(Language.StringByID(R.MyInternationalizationString.DeleteFunction));
alert.ResultEventHandler += (e2) =>
{
if (e2)
@@ -889,8 +903,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -898,8 +911,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -984,18 +996,20 @@
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;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
}
- else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
+ else if (deviceUI.CommonDevice.Type == DeviceType.AirSwitch)
{
//绌烘皵寮�鍏�
var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
@@ -1008,16 +1022,14 @@
{
UserHomeView.ReadStatus(airSwitch, () =>
{
- airSwitch.ReadOnOffStatus();
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
});
}
else
{
if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- airSwitch.ReadOnOffStatus();
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1071,6 +1083,7 @@
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
+
var lightControl = new Phone.Device.Light.AirSwitchControl();
UserView.HomePage.Instance.AddChidren(lightControl);
UserView.HomePage.Instance.PageIndex += 1;
@@ -1083,18 +1096,21 @@
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;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
+
}
- else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
+ else if (deviceUI.CommonDevice.Type == DeviceType.DimmableLight)
{
//璋冨厜鐏�
var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
@@ -1107,18 +1123,14 @@
{
UserHomeView.ReadStatus(dimmableLight, () =>
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
});
}
else
{
if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1185,19 +1197,20 @@
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;
-
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
}
- else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
+ else if (deviceUI.CommonDevice.Type == DeviceType.Thermostat)
{
//绌鸿皟
var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
@@ -1211,14 +1224,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
UserView.UserHomeView.ReadStatus(ac, () =>
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1226,20 +1232,13 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
}
}
var deviceTypeRowLayout = new RowLayout()
{
- Height = Application.GetRealHeight(127 + 35),
+ Height = Application.GetRealHeight(129 + 35),
LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
@@ -1290,16 +1289,18 @@
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
- var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+ var delBtn = new CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI,
Radius = 0
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
@@ -1311,7 +1312,7 @@
acControl.Show(deviceUI, room);
};
}
- else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
+ else if (deviceUI.CommonDevice.Type == DeviceType.WindowCoveringDevice)
{
//鍗峰笜
var rollerShade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
@@ -1324,8 +1325,7 @@
{
UserHomeView.ReadStatus(rollerShade, () =>
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1333,11 +1333,9 @@
//闃叉鐭椂闂村唴澶氭璇诲彇
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
}
}
-
var deviceTypeRowLayout = new RowLayout()
{
@@ -1378,16 +1376,18 @@
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;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
@@ -1399,7 +1399,7 @@
rollerShadeControl.Show(deviceUI, room);
};
}
- else
+ else if (deviceUI.CommonDevice.Type == DeviceType.DoorLock)
{
var deviceTypeRowLayout = new RowLayout()
{
@@ -1430,15 +1430,51 @@
{
Tag = deviceUI
};
- deviceTypeRowLayout.AddRightView(editBtn);
- editBtn.MouseUpEventHandler += deviceDetailHandler;
-
var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
{
Tag = deviceUI
};
- deviceTypeRowLayout.AddRightView(delBtn);
- delBtn.MouseUpEventHandler += delEvent;
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
+ }
+ 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);
+
+ var editBtn = new CommonForm.RowLayoutEditButton()
+ {
+ Tag = deviceUI
+ };
+ var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+ {
+ Tag = deviceUI
+ };
+ if (room.IsSharedRoom == false)
+ {
+ deviceTypeRowLayout.AddRightView(editBtn);
+ editBtn.MouseUpEventHandler += deviceDetailHandler;
+ deviceTypeRowLayout.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += delEvent;
+ }
}
}
};
@@ -1461,7 +1497,6 @@
typeRowLayout.AddChidren(functionTypeIMG);
functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
-
if (deviceType == room.DeviceUIList[0].CommonDevice.Type)
{
@@ -1519,6 +1554,8 @@
BorderWidth = 1
};
row.AddChidren(roomBtn);
+ roomBtn.SetViewShadow(true,5);
+
if (room.IsLove)
{
roomBtn.IsSelected = true;
@@ -1532,7 +1569,7 @@
{
RefreshFunction(room);
}
-
+
}
roomBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -1553,7 +1590,7 @@
}
};
}
-
+
}
#endregion
@@ -1581,244 +1618,14 @@
}
else
{
- var sceneScrolView = new VerticalScrolViewLayout
- {
- //Y = Application.GetRealHeight(58)
- };
+ var sceneScrolView = new VerticalScrolViewLayout { };
functionSceneBodyView.AddChidren(sceneScrolView);
foreach (var scene in sceneList)
{
- var sceneFL = new FrameLayout()
- {
- Height = Application.GetRealHeight(446),
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
- Tag = scene
- };
- sceneScrolView.AddChidren(sceneFL);
- var sceneRowLayout = new RowLayout
- {
- Y = Application.GetRealHeight(46),
- Height = Application.GetRealHeight(446 - 46),
- LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
- Radius = CommonPage.BigFormRadius
- };
- sceneFL.AddChidren(sceneRowLayout);
-
- var sceneImg = new Button()
- {
- X = Application.GetRealWidth(179),
- Width = Application.GetRealWidth(844),
- Height = Application.GetRealHeight(400),
- UnSelectedImagePath = scene.IconPath,
- Radius = (uint)Application.GetRealHeight(17)
- };
- sceneRowLayout.AddChidren(sceneImg);
-
- var leftFL = new FrameLayout
- {
- X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Y = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(251),
- Height = Application.GetRealHeight(282),
- BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor2,
- Radius = (uint)Application.GetRealHeight(17)
- };
- sceneRowLayout.AddChidren(leftFL);
-
- var collectionBtn = new Button
- {
- X = Application.GetRealWidth(23),
- Y = Application.GetRealHeight(23),
- Width = Application.GetMinRealAverage(65),
- Height = Application.GetMinRealAverage(65),
- UnSelectedImagePath = "Item/Collection.png",
- SelectedImagePath = "Item/CollectionSelected.png",
- IsSelected = Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName),
- Tag = scene
- };
- leftFL.AddChidren(collectionBtn);
-
- var sceneNameBtn = new Button()
- {
- Width = Application.GetRealWidth(176),
- Height = Application.GetRealHeight(150),
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- Text = scene.Name,
- Gravity = Gravity.Center,
- IsMoreLines = true
- };
- leftFL.AddChidren(sceneNameBtn);
-
- var collection = new Button
- {
- Tag=scene
- };
- leftFL.AddChidren(collection);
- collection.MouseUpEventHandler += (sender, e) =>
- {
- if (room.IsLove)
- {
- Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
- sceneScrolView.RemoveViewByTag(collectionBtn.Tag);
- }
- else
- {
- collectionBtn.IsSelected = !collectionBtn.IsSelected;
- if (collectionBtn.IsSelected)
- {
- Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
- }
- else
- {
- Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
- }
- }
- };
-
- //瀹氭椂
- var delayBtn = new RowLayoutDeleteButton
- {
- TextID = R.MyInternationalizationString.Delay,
- Tag = scene.SceneDelayTime
- };
- sceneRowLayout.AddLeftView(delayBtn);
-
- //缂栬緫
- var settingBtn = new Device.CommonForm.RowLayoutEditButton()
- {
- TextID = R.MyInternationalizationString.Editor,
- Tag = scene.SceneDelayTime
- };
- //鍒犻櫎
- var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton
- {
- Tag = scene
- };
-
-
- if(room.IsSharedRoom)
- {
-
- }
- else
- {
- if(room.IsLove)
- {
- sceneRowLayout.AddRightView(deleteBtn);
- }
- else
- {
- sceneRowLayout.AddRightView(settingBtn);
- sceneRowLayout.AddRightView(deleteBtn);
- }
- }
-
-
- //璋冪敤鍦烘櫙
- EventHandler<MouseEventArgs> sceneUpHandler = async (sender, e) =>
- {
- //1鎴愬姛 0澶辫触
- //鍚庨潰琛ヤ笂鐩稿叧鎻愮ず
- //瑕佸厛浠庣綉鍏宠鍙栧欢鏃舵槸鍚︽鍦ㄦ墽琛岋紝濡傛灉鏄繘琛屽�掕鏃讹紝涓嶅厑璁稿湪鐐瑰嚮
- var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, scene.SceneDelayTime);
- //涓荤綉鍏充笉鍦ㄧ嚎
- if (sceneOpenAllData == null)
- {
- //CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheMainGatewayIsNotOnLine);
- CommonPage.Instance.FailureToServer();
- return;
- }
- if (sceneOpenAllData.sceneOpenData == null)
- {
- CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
- return;
- }
- //鎴愬姛
- if (sceneOpenAllData.sceneOpenData.Result == 1)
- {
-
- }
- //澶辫触
- else
- {
- CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
- return;
- }
- };
- sceneImg.MouseUpEventHandler += sceneUpHandler;
- //鍒犻櫎鍦烘櫙
- EventHandler<MouseEventArgs> delEvent = (sender, e) =>
- {
- if(room.IsLove)
- {
- Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
- sceneScrolView.RemoveViewByTag((sender as Button).Tag);
- }
- else
- {
- var tip = new CustomAlert { };
- AddChidren(tip);
- tip.Show(Language.StringByID(R.MyInternationalizationString.ConfirmDelete));
-
- //var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ConfirmDelete), Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
- //alert.Show();
- tip.ResultEventHandler += async (e1) =>
- {
- if (e1)
- {
- //0 绉婚櫎澶辫触 1 绉婚櫎鎴愬姛 2 娌℃湁璇ュ満鏅�
- var removeSceneAllData = await ZigBee.Device.Scene.DeleteSceneAsync(scene.Id);
- if (removeSceneAllData == null || removeSceneAllData.removeSceneData == null)
- {
- //CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheMainGatewayIsNotOnLine);
- CommonPage.Instance.FailureToServer();
- return;
- }
- //1鎴愬姛
- if (removeSceneAllData.removeSceneData.Result == 1)
- {
- room.RemoveScene(scene);
- //RefreshBodyView();
- sceneScrolView.RemoveViewByTag((sender as Button).Tag);
- }
- //0 绉婚櫎澶辫触
- else if (removeSceneAllData.removeSceneData.Result == 0)
- {
- CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
- return;
- }
- //2 娌℃湁璇ュ満鏅�
- else if (removeSceneAllData.removeSceneData.Result == 2)
- {
- room.RemoveScene(scene);
- //RefreshBodyView();
- sceneScrolView.RemoveViewByTag((sender as Button).Tag);
- CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneIsNull);
- return;
- }
- }
- };
- }
-
- };
- deleteBtn.MouseUpEventHandler += delEvent;
- //缂栬緫鍦烘櫙
- settingBtn.MouseUpEventHandler += (sender, e) =>
- {
- SceneUI.EditScene(scene, room);
- };
- //缂栬緫寤舵椂
- delayBtn.MouseUpEventHandler += (sender, e) =>
- {
- var timeSelect = new SelectTime();
- CommonPage.Instance.AddChidren(timeSelect);
- timeSelect.TempTime = scene.SceneDelayTime;
- timeSelect.Init();
- timeSelect.TimeAction = (t) =>
- {
- scene.SceneDelayTime = t;
- };
- };
+ var sceneView = new SceneCategoryView(0, 0);
+ sceneScrolView.AddChidren(sceneView);
+ sceneView.Init(scene, room);
+ GetDelayScene(sceneScrolView);
}
}
}
@@ -1853,6 +1660,71 @@
}
+ /// <summary>
+ /// GetDelayScene
+ /// </summary>
+ /// <param name="scrolViewLayout"></param>
+ private async void GetDelayScene(VerticalScrolViewLayout scrolViewLayout)
+ {
+ var catDelaySceneResponseAllData = await Scene.CatDelaySceneAsync();
+ if (catDelaySceneResponseAllData == null)
+ {
+ return;
+ }
+ var catDelaySceneResponseData = catDelaySceneResponseAllData.catDelaySceneResponseData;
+ if (catDelaySceneResponseData == null || catDelaySceneResponseData.DelayScenesList.Count == 0)
+ {
+ return;
+ }
+ var delayList = catDelaySceneResponseData.DelayScenesList;
+
+ for (int i = 0; scrolViewLayout != null && i < scrolViewLayout.ChildrenCount; i++)
+ {
+ var sceneView = scrolViewLayout.GetChildren(i) as SceneCategoryView;
+ foreach (var delayScenesListResponseInfo in delayList)
+ {
+ if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
+ {
+ sceneView.scene.RemainTime = delayScenesListResponseInfo.RemainTime;
+ var remainTime= delayScenesListResponseInfo.RemainTime;
+ if (remainTime > 0)
+ {
+ new System.Threading.Thread(() =>
+ {
+ while (remainTime-- > 0)
+ {
+ System.Threading.Thread.Sleep(1000);
+ Application.RunOnMainThread(() =>
+ {
+ sceneView.SetTimeText(CommonFormResouce.GetTimeString(remainTime));
+ });
+ }
+ Application.RunOnMainThread(() =>
+ {
+ sceneView.scene.RemainTime = 0;
+ sceneView.SetTimeImage();
+ });
+ })
+ { IsBackground = true }.Start();
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// GetExecScene
+ /// </summary>
+ /// <param name="scrolViewLayout"></param>
+ private void GetExecScene(VerticalScrolViewLayout scrolViewLayout)
+ {
+ new System.Threading.Thread(() =>
+ {
+
+ })
+ { IsBackground = true }.Start();
+ }
#endregion
#region 鈼� 鑷姩鍖朹_________________________
@@ -1864,17 +1736,18 @@
{
functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+
var bjFrameLayout = new FrameLayout
{
Width = Application.GetRealWidth(1080 - 58),
Height = Application.GetRealHeight(170),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
X = Application.GetRealWidth(58),
- Radius = (uint)Application.GetRealHeight(50),
+ //Radius = (uint)Application.GetRealHeight(50),
Y = Application.GetRealHeight(30),
};
functionSceneAutoBodyView.AddChidren(bjFrameLayout);
-
+ bjFrameLayout.SetCornerWithSameRadius(25, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
var sigBtn = new Button
{
Width = Application.GetMinRealAverage(84),
@@ -1895,6 +1768,7 @@
TextID = MyInternationalizationString.logictemplate,
Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
+ TextSize=15,
};
bjFrameLayout.AddChidren(recommendtextBtn);
@@ -1924,10 +1798,11 @@
Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
X = Application.GetRealWidth(58),
- Radius = (uint)Application.GetRealHeight(50),
+ //Radius = (uint)Application.GetRealHeight(50),
Y = scenehorizontalScrol.Bottom,
};
functionSceneAutoBodyView.AddChidren(logicScrolView);
+ logicScrolView.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
@@ -1965,6 +1840,7 @@
Y = Application.GetRealHeight(246 - 23 - 80),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize = 14,
};
frameLayout.AddChidren(logicnameBtn);
@@ -2025,7 +1901,7 @@
var Idlist = await Logic.Send.GetLogicId(0);
if (Idlist.Count != 0)
{
- var listlogic = await Logic.Send.ReadList(Idlist.Count,0);
+ var listlogic = await Logic.Send.ReadList(Idlist.Count, 0);
//foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆�
for (int j = 0; j < listlogic.Count; j++)
{
@@ -2041,7 +1917,7 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
-
+
}
/// <summary>
@@ -2075,6 +1951,7 @@
Y = Application.GetRealHeight(30),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
logicRowlayout.AddChidren(logicnameBtn);
@@ -2649,6 +2526,6 @@
#endregion
-
+
}
}
--
Gitblit v1.8.0