From d12e7730bb88d57763a6caaeacb0248a65bf3309 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 03 十二月 2019 13:10:32 +0800
Subject: [PATCH] 2019.12.3
---
ZigbeeApp/Shared/DLL/Android/Shared.Droid.TouchID.dll | 0
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 14 +++++++-------
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 16 ++++++++--------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 761e5f3..038be5e 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,8 +1,8 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
- <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
+ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Room/EditRoom.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/RoomView.cs">
<Files>
<File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="515" Column="62" />
<File FileName="Shared/Phone/Device/Category/Category.cs" />
@@ -11,9 +11,9 @@
<File FileName="Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs" />
<File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" />
<File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" />
- <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" Line="919" Column="68" />
+ <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" />
<File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="185" Column="49" />
- <File FileName="Shared/Phone/Device/Room/EditRoom.cs" Line="210" Column="53" />
+ <File FileName="Shared/Phone/Device/Room/EditRoom.cs" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -24,10 +24,10 @@
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
- <Node name="CommonForm" expanded="True" />
- <Node name="Room" expanded="True">
- <Node name="EditRoom.cs" selected="True" />
+ <Node name="CommonForm" expanded="True">
+ <Node name="RoomView.cs" selected="True" />
</Node>
+ <Node name="Room" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index f33d77d..fcd940a 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.TouchID.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.TouchID.dll
old mode 100644
new mode 100755
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 667f29f..7ed1c76 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -18,8 +18,8 @@
public override void RemoveFromParent()
{
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
base.RemoveFromParent();
}
@@ -133,8 +133,8 @@
if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
{
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (Action<ZigBee.Device.CommonDevice>)((report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (room.TemperatrueDevice != mainKeys)
@@ -142,7 +142,7 @@
return;
}
//绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
@@ -181,8 +181,8 @@
if (string.IsNullOrEmpty(room.HumidityDevice) == false)
{
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (room.HumidityDevice != mainKeys)
@@ -190,7 +190,7 @@
return;
}
//绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
--
Gitblit v1.8.0