From 9d61367c1fd278f58f721d4c0e69999f89e4485d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 12 十二月 2019 14:14:30 +0800
Subject: [PATCH] 添加最新绑定机制
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 152 +++++++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 75 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 777c8a8..89cc2bb
--- 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
{
@@ -828,6 +829,7 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(functionTypeScrowView);
+ //functionSceneBodyView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
deviceListScrolView = new VerticalScrolViewLayout
{
@@ -838,7 +840,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) =>
{
@@ -907,8 +912,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -916,8 +920,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1002,16 +1005,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;
+ }
}
else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
{
@@ -1026,16 +1031,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);
}
}
@@ -1102,16 +1105,19 @@
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)
{
@@ -1126,18 +1132,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);
}
}
@@ -1204,17 +1206,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;
+ }
}
else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
{
@@ -1230,16 +1233,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();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1247,16 +1241,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
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();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
}
}
@@ -1313,16 +1298,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) =>
{
@@ -1347,8 +1334,7 @@
{
UserHomeView.ReadStatus(rollerShade, () =>
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1356,8 +1342,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
}
}
@@ -1400,16 +1385,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) =>
{
@@ -1452,15 +1439,17 @@
{
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
{
@@ -1484,15 +1473,17 @@
{
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;
+ }
}
}
};
@@ -1644,7 +1635,6 @@
var sceneView = new SceneCategoryView(0, 0);
sceneScrolView.AddChidren(sceneView);
sceneView.Init(scene, room);
- sceneView.SetViewShadow(true);
GetDelayScene(sceneScrolView);
}
}
@@ -1737,6 +1727,18 @@
{ IsBackground = true }.Start();
}
+ /// <summary>
+ /// GetExecScene
+ /// </summary>
+ /// <param name="scrolViewLayout"></param>
+ private void GetExecScene(VerticalScrolViewLayout scrolViewLayout)
+ {
+ new System.Threading.Thread(() =>
+ {
+
+ })
+ { IsBackground = true }.Start();
+ }
#endregion
#region 鈼� 鑷姩鍖朹_________________________
--
Gitblit v1.8.0