From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 210 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 142 insertions(+), 68 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index b6ddfc2..cf138ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -45,14 +45,6 @@
//寮勪竴鐐瑰垵濮嬪��
this.editorRoom = i_editorRoom;
this.cloneRoom = HdlRoomLogic.Current.CloneRoomClass(i_editorRoom);
- if (i_editorRoom.HumidityDevice == string.Empty)
- {
- this.cloneRoom.Humidity = -1000;
- }
- if (i_editorRoom.TemperatrueDevice == string.Empty)
- {
- this.cloneRoom.Temperatrue = -1000;
- }
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorRoom));
@@ -75,15 +67,11 @@
//鍔犱竴涓櫧鑹茶儗鏅�
var frameBack1 = new FrameLayout();
- frameBack1.Height = Application.GetRealHeight(450);
+ frameBack1.Height = Application.GetRealHeight(750);
frameBack1.Y = Application.GetRealHeight(196);
frameBack1.BackgroundColor = UserCenterColor.Current.White;
frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
listBackControl.frameTable.AddChidren(frameBack1);
-
- //鍒濆鍖栦俊鎭甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
var btnShadow = new PicViewControl(853, 593);
@@ -117,7 +105,7 @@
btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
listBackControl.frameTable.AddChidren(btnZhezhao);
//鍒嗕韩鐨勬埧闂翠笉鑳界紪杈�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
@@ -126,8 +114,9 @@
};
}
- //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
- frameBack1.Y = btnPic.Y + btnPic.Height / 2;
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -148,6 +137,7 @@
{
txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), this.cloneRoom.Name, this.listview.rowSpace / 2);
txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);
+ txtRoomName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(txtRoomName);
txtRoomName.InitControl();
//搴曠嚎
@@ -174,7 +164,7 @@
//搴曠嚎
btnBelone.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鍙崇澶�
btnBelone.AddRightArrow();
@@ -196,7 +186,8 @@
//搴曠嚎
rowTemperature.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowTemperature.ButtonClickEvent += (sender, e) =>
{
@@ -204,7 +195,8 @@
this.ShowTemperatrueDevice(btnTemper);
};
}
- if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇娓╁害
this.GetTemperatrueValue(btnTemper, cloneRoom.TemperatrueDevice);
@@ -220,7 +212,8 @@
//搴曠嚎
rowHumidity.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowHumidity.ButtonClickEvent += (sender, e) =>
{
@@ -228,7 +221,8 @@
this.ShowHumidityDevice(btnHumi);
};
}
- if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇婀垮害
this.GetHumidityValue(btnHumi, cloneRoom.HumidityDevice);
@@ -239,7 +233,7 @@
tableContr = null;
//鍒嗕韩鐨勬埧闂翠笉鑳戒繚瀛�
- if (this.editorRoom.IsSharedRoom == true)
+ if (this.editorRoom.IsSharedRoom == true|| Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
@@ -289,15 +283,7 @@
editorRoom.FloorId = cloneRoom.FloorId;
editorRoom.Name = cloneRoom.Name;
editorRoom.HumidityDevice = cloneRoom.HumidityDevice;
- if (cloneRoom.Humidity != -1000)
- {
- editorRoom.Humidity = cloneRoom.Humidity;
- }
editorRoom.TemperatrueDevice = cloneRoom.TemperatrueDevice;
- if (cloneRoom.Temperatrue != -1000)
- {
- editorRoom.Temperatrue = cloneRoom.Temperatrue;
- }
editorRoom.BackgroundImage = cloneRoom.BackgroundImage;
editorRoom.BackgroundImageType = cloneRoom.BackgroundImageType;
editorRoom.Save();
@@ -306,16 +292,16 @@
if (changedFloor == false)
{
//鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎸囧畾鎴块棿鐨勪俊鎭�
- MainPage.ListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);
+ MainPage.LeftListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);
}
else
{
//鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎴块棿鍒楄〃淇℃伅
- MainPage.ListRoomViewFrom.Instance.RefreshListRoom();
+ MainPage.LeftListRoomViewFrom.Instance.RefreshListRoom();
}
//绠椾簡,杩欓噷濡傛灉鎸変笅淇濆瓨,鍒欎富椤甸渶瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
this.CloseForm();
};
@@ -375,6 +361,11 @@
{
listDevice.Add(device);
}
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
+ {
+ listDevice.Add(device);
+ }
}
var listSelect = new List<string>() { cloneRoom.TemperatrueDevice };
var form = new SelectDeviceForm();
@@ -405,44 +396,80 @@
{
return;
}
- if (cloneRoom.Temperatrue == -1000)
- {
- //娌℃湁鑾峰彇寰楀埌杩囨俯搴�
- btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
- }
- else
- {
- btnTemper.Text = this.cloneRoom.Temperatrue == 0 ? "0.0鈩�" : this.cloneRoom.Temperatrue.ToString() + "鈩�";
- btnTemper.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
- }
+ //鑾峰彇涓�
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ bool receiveData = false;
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
- if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null)
+ if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null
+ || report.DeviceStatusReport.CluterID != 1026)
{
return;
}
+ receiveData = true;
var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
HdlThreadLogic.Current.RunMain(() =>
{
- if (((ZigBee.Device.TemperatureSensor)localDevice).Temperatrue == 0)
+ decimal temperatrue = (decimal)device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, device, null);
+ if (temperatrue == 0)
{
- //0鈩�
+ //0
btnTemper.Text = "0.0鈩�";
- this.cloneRoom.Temperatrue = 0;
}
else
{
- //璁板綍娓╁害
- this.cloneRoom.Temperatrue = ((ZigBee.Device.TemperatureSensor)localDevice).Temperatrue;
- btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
+ btnTemper.Text = temperatrue + "鈩�";
}
+
}, ShowErrorMode.NO);
}));
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
- ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ device.ReadAttri(ZigBee.Device.Cluster_ID.TemperatureMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
+ System.Threading.Thread.Sleep(1500);
+ var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
+ if (result != null)
+ {
+ device.AttributeStatus.Clear();
+ device.AttributeStatus.AddRange(result.AttributeStatus);
+ device.ReSave();
+ }
+ if (receiveData == true)
+ {
+ //宸茬粡璇诲彇鍒版暟鎹�
+ return;
+ }
+
+ foreach (var data in device.AttributeStatus)
+ {
+ if (data.ClusterId == 1026
+ && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ //澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
+ decimal temperatrue = Common.LocalDevice.Current.AdjustTemperatrueValue(data.AttributeData);
+
+ device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.SetField, null, device, new object[] { temperatrue });
+ device.ReSave();
+
+ //鍒朵綔铏氬亣鐨勫睘鎬т笂鎶�
+ var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };
+ report.DeviceStatusReport.CluterID = 1026;
+ HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A璁惧灞炴�т笂鎶�);
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnTemper.Text = temperatrue == 0 ? "0.0鈩�" : temperatrue.ToString() + "鈩�";
+ });
+ break;
+ }
+ }
+ });
}
#endregion
@@ -460,6 +487,16 @@
{
//鑾峰彇婀垮害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 2)
+ {
+ listDevice.Add(device);
+ }
+ //鏂伴
+ else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
+ {
+ listDevice.Add(device);
+ }
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
{
listDevice.Add(device);
}
@@ -493,44 +530,81 @@
{
return;
}
- if (cloneRoom.Humidity == -1000)
- {
- //娌℃湁鑾峰彇寰楀埌杩囨箍搴�
- btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
- }
- else
- {
- btnHumi.Text = this.cloneRoom.Humidity == 0 ? "0.0%" : this.cloneRoom.Humidity.ToString() + "%";
- btnHumi.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
- }
+ //鑾峰彇涓�
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ bool receiveData = false;
HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
- if (cloneRoom.HumidityDevice != mainKeys || btnHumi == null)
+ if (cloneRoom.HumidityDevice != mainKeys || btnHumi == null
+ || report.DeviceStatusReport.CluterID != 1029)
{
return;
}
+ receiveData = true;
var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
HdlThreadLogic.Current.RunMain(() =>
{
- if (((ZigBee.Device.TemperatureSensor)localDevice).Humidity == 0)
+ decimal humidity = (decimal)localDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, localDevice, null);
+ if (humidity == 0)
{
//0
btnHumi.Text = "0.0%";
- this.cloneRoom.Humidity = 0;
}
else
{
- //璁板綍婀垮害
- this.cloneRoom.Humidity = ((ZigBee.Device.TemperatureSensor)localDevice).Humidity;
- btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";
+ btnHumi.Text = humidity.ToString() + "%";
}
+
}, ShowErrorMode.NO);
});
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
- ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ device.ReadAttri(ZigBee.Device.Cluster_ID.RelativeHumidityMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
+ System.Threading.Thread.Sleep(1500);
+ var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
+ if (result != null)
+ {
+ device.AttributeStatus.Clear();
+ device.AttributeStatus.AddRange(result.AttributeStatus);
+ device.ReSave();
+ }
+ if (receiveData == true)
+ {
+ //宸茬粡璇诲埌鏁版嵁
+ return;
+ }
+
+ //鍒濆鍊�,鍙栫紦瀛樻暟鎹�
+ foreach (var data in device.AttributeStatus)
+ {
+ if (data.ClusterId == 1029
+ && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ //澶勭悊缃戝叧杩斿洖鐨勬箍搴﹀��
+ decimal humidity = Common.LocalDevice.Current.AdjustHumidityValue(data.AttributeData);
+
+ device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.SetField, null, device, new object[] { humidity });
+ device.ReSave();
+
+ //鍒朵綔铏氬亣鐨勫睘鎬т笂鎶�
+ var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };
+ report.DeviceStatusReport.CluterID = 1029;
+ HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A璁惧灞炴�т笂鎶�);
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnHumi.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";
+ });
+ break;
+ }
+ }
+ });
}
#endregion
--
Gitblit v1.8.0