From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 389 ++++++++++++++++--------------------------------------
1 files changed, 117 insertions(+), 272 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index ba82d19..26607da 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1093,7 +1093,7 @@
}
})
{ IsBackground = true }.Start();
-
+
var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
@@ -1134,81 +1134,14 @@
};
deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
{
- if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ var lightControl = new Phone.Device.Light.OnOffControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ lightControl.Show(deviceUI, Common.Room.CurrentRoom);
+ lightControl.action += (curDev, curRoom) =>
{
- var lightControl = new Phone.Device.Light.OnOffControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.Show(deviceUI, Common.Room.CurrentRoom);
- lightControl.action += (curDev, curRoom) =>
- {
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
- };
- }
- 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.Show(deviceUI, Common.Room.CurrentRoom);
- lightControl.action += (curDev, curRoom) =>
- {
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
- };
- }
- else
- {
- var lightControl = new Phone.Device.Light.LightControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.Show(deviceUI, Common.Room.CurrentRoom);
- lightControl.action += (curDev, curRoom) =>
- {
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
- };
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
+ };
};
EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
@@ -1219,21 +1152,7 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1319,21 +1238,9 @@
lightControl.Show(deviceUI, Common.Room.CurrentRoom);
lightControl.action += (curDev, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
+
};
};
@@ -1345,21 +1252,8 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
+
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1447,21 +1341,7 @@
dimmableLightControl.Show(deviceUI, Common.Room.CurrentRoom);
dimmableLightControl.action += (curDev, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
@@ -1474,21 +1354,7 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1578,21 +1444,8 @@
acControl.Show(deviceUI, Common.Room.CurrentRoom);
acControl.action += (curDev, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
+
};
};
@@ -1604,21 +1457,8 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
+
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1693,21 +1533,7 @@
rollerShadeControl.Show(deviceUI, Common.Room.CurrentRoom);
rollerShadeControl.action += (curDev, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceActionForWin(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
@@ -1719,21 +1545,7 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceActionForWin(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1771,21 +1583,7 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1816,21 +1614,7 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1898,21 +1682,7 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1943,21 +1713,7 @@
detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
detailInfo.EditAction += (curDevice, curRoom) =>
{
- if (curRoom.Id != Common.Room.CurrentRoom.Id)
- {
- Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
- deviceListScrolView.RemoveViewByTag(deviceUI);
- sameTypeList.Remove(deviceUI);
- if (sameTypeList.Count == 0)
- {
- RefreshFunction(Common.Room.CurrentRoom);
- }
- }
- else
- {
- deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
- deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
- }
+ ReFreshDeviceAction(deviceUI, curRoom, sameTypeList, deviceListScrolView, deviceRow);
};
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -2016,6 +1772,93 @@
{ IsBackground = true }.Start();
}
}
+
+ /// <summary>
+ /// ReFreshDeviceAction
+ /// </summary>
+ /// <param name="curRoom"></param>
+ /// <param name="sameTypeList"></param>
+ /// <param name="devListScrolView"></param>
+ /// <param name="deviceRow"></param>
+ private void ReFreshDeviceAction(DeviceUI deviceUI, Common.Room curRoom, List<DeviceUI> sameTypeList, VerticalScrolViewLayout devListScrolView, CategoryFunctionRow deviceRow)
+ {
+ if (Common.Room.CurrentRoom.IsLove)
+ {
+ deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
+ deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+ if (Common.Room.CurrentRoom.IsCollectInRoom(deviceUI.FileName) == false)
+ {
+ devListScrolView.RemoveViewByTag(deviceUI);
+ sameTypeList.Remove(deviceUI);
+ if (sameTypeList.Count == 0)
+ {
+ RefreshFunction(Common.Room.CurrentRoom);
+ }
+ }
+ }
+ else
+ {
+ if (curRoom.Id != Common.Room.CurrentRoom.Id)
+ {
+ Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
+ devListScrolView.RemoveViewByTag(deviceUI);
+ sameTypeList.Remove(deviceUI);
+ if (sameTypeList.Count == 0)
+ {
+ RefreshFunction(Common.Room.CurrentRoom);
+ }
+ }
+ else
+ {
+ deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
+ deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+ }
+ }
+ }
+
+ /// <summary>
+ /// ReFreshDeviceAction
+ /// </summary>
+ /// <param name="curRoom"></param>
+ /// <param name="sameTypeList"></param>
+ /// <param name="devListScrolView"></param>
+ /// <param name="deviceRow"></param>
+ private void ReFreshDeviceActionForWin(DeviceUI deviceUI, Common.Room curRoom, List<DeviceUI> sameTypeList, VerticalScrolViewLayout devListScrolView, CategoryFunctionForWinRow deviceRow)
+ {
+ if (Common.Room.CurrentRoom.IsLove)
+ {
+ deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
+ deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+ if (Common.Room.CurrentRoom.IsCollectInRoom(deviceUI.FileName) == false)
+ {
+ devListScrolView.RemoveViewByTag(deviceUI);
+ sameTypeList.Remove(deviceUI);
+ if (sameTypeList.Count == 0)
+ {
+ RefreshFunction(Common.Room.CurrentRoom);
+ }
+ }
+ }
+ else
+ {
+ if (curRoom.Id != Common.Room.CurrentRoom.Id)
+ {
+ Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
+ devListScrolView.RemoveViewByTag(deviceUI);
+ sameTypeList.Remove(deviceUI);
+ if (sameTypeList.Count == 0)
+ {
+ RefreshFunction(Common.Room.CurrentRoom);
+ }
+ }
+ else
+ {
+ deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
+ deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+ }
+ }
+ }
+
/// <summary>
/// AddRoomView
@@ -2363,7 +2206,8 @@
Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
if (logiciocnBtn.Tag.ToString() == "3")
{
- Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;// Language.StringByID(MyInternationalizationString.automation1);
+ Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
+ Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
var addLogicPage = new Logic.AddLogicPage();
HomePage.Instance.AddChidren(addLogicPage);
HomePage.Instance.PageIndex += 1;
@@ -2373,6 +2217,7 @@
{
Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
+ Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
Logic.TemplatePage templatePage = new Logic.TemplatePage();
Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
HomePage.Instance.AddChidren(templatePage);
@@ -3027,4 +2872,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0