From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs |  268 +++++++++++++++++++++--------------------------------
 1 files changed, 106 insertions(+), 162 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 8fda258..4bbe8a8 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -1,22 +1,16 @@
 锘縰sing System;
 using Shared.Common;
-using Shared.Phone.Device.DeviceLogic;
 using Shared.Phone.UserCenter;
-using Shared.Phone.UserView;
 using ZigBee.Device;
 
 namespace Shared.Phone.Device.CommonForm
 {
-    public class RoomView:FrameLayout, ZigBee.Common.IStatus
+    public class RoomView : FrameLayoutBase
     {
         /// <summary>
         /// Room
         /// </summary>
         private Common.Room room;
-        /// <summary>
-        /// action
-        /// </summary>
-        public Action action;
 
         FrameLayout roomNameBackground;
 
@@ -27,138 +21,14 @@
         Button temperatureText;
 
         Button humidityText;
-
-        CommonDevice temperDevice;
-
-        CommonDevice humidDevice;
-
-        #region 鈼� 鎺ュ彛__________________________
         /// <summary>
-        /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
+        /// 娓╁害璁惧
         /// </summary>
-        /// <returns>The changed.</returns>
-        /// <param name="common">Common.</param>
-        public void Changed(CommonDevice common)
-        {
-
-        }
+        private CommonDevice temperDevice = null;
         /// <summary>
-        /// Changeds the IL ogic status.
+        /// 婀垮害璁惧
         /// </summary>
-        /// <param name="logic">Logic.</param>
-        public void ChangedILogicStatus(ZigBee.Device.Logic logic)
-        {
-            //throw new NotImplementedException();
-        }
-        /// <summary>
-        /// Changeds the IS cene status.
-        /// </summary>
-        /// <param name="scene">Scene.</param>
-        public void ChangedISceneStatus(Scene scene)
-        {
-            //throw new NotImplementedException();
-        }
-        /// <summary>
-        /// 璁惧鐘舵�佹洿鏂版帴鍙�
-        /// <para>type锛氬鏋滀负 DeviceInComingRespon:璁惧鏂颁笂鎶�</para>
-        /// <para>type锛氬鏋滀负 IASInfoReport:RemoveDeviceRespon</para>
-        /// <para>type锛氬鏋滀负 DeviceStatusReport:璁惧涓婃姤</para>
-        /// <para>type锛氬鏋滀负 IASInfoReport:IAS瀹夐槻淇℃伅涓婃姤</para>
-        /// <para>type锛氬鏋滀负 OnlineStatusChange: 璁惧鍦ㄧ嚎鐘舵�佹洿鏂�</para>
-        /// </summary>
-        /// <param name="common">Common.</param>
-        /// <param name="typeTag">Type tag.</param>
-        public void DeviceInfoChange(CommonDevice common, string typeTag)
-        {
-            if (typeTag == "DeviceStatusReport")
-            {
-                Application.RunOnMainThread(() =>
-                {
-                    try
-                    {
-                        if (common.DeviceStatusReport.AttriBute == null || common.DeviceStatusReport.AttriBute.Count == 0)
-                        {
-                            return;
-                        }
-                        //鏄惁涓哄綋鍓嶈澶�
-                        if ((temperDevice?.DeviceEpoint != common.DeviceEpoint || temperDevice?.DeviceAddr != common.DeviceAddr) && (humidDevice?.DeviceEpoint != common.DeviceEpoint || humidDevice?.DeviceAddr != common.DeviceAddr) )
-                        {
-                            return;
-                        }
-
-                        //if (common.Type == DeviceType.TemperatureSensor)
-                        //{
-                        if (common.DeviceStatusReport.CluterID == 1026)
-                        {
-                            foreach (var data in common.DeviceStatusReport.AttriBute)
-                            {
-                                if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
-                                {
-                                    if (data.AttriButeData == 0)
-                                    {
-                                        //0鈩�
-                                        temperatureText.Text = "0.0鈩�";
-                                        room.Temperatrue = 0;
-                                    }
-                                    else if (data.AttriButeData > 32767)
-                                    {
-                                        //璐熸暟(鐗规畩澶勭悊)
-                                        string strValue = (data.AttriButeData - 65536).ToString();
-                                        //灏忔暟鐐归渶瑕佷竴浣�
-                                        strValue = strValue.Substring(0, strValue.Length - 1);
-                                        temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
-                                        room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
-                                    }
-                                    else
-                                    {
-                                        //灏忔暟鐐归渶瑕佷竴浣�
-                                        string strValue = data.AttriButeData.ToString();
-                                        strValue = strValue.Substring(0, strValue.Length - 1);
-                                        temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
-                                        room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
-                                    }
-                                }
-                            }
-                        }
-                        else if (common.DeviceStatusReport.CluterID == 1029)
-                        {
-                            foreach (var data in common.DeviceStatusReport.AttriBute)
-                            {
-                                if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
-                                {
-                                    if (data.AttriButeData == 0)
-                                    {
-                                        //0
-                                        humidityText.Text = "--%";
-                                        room.Humidity = 0;
-                                    }
-                                    else
-                                    {
-                                        //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
-                                        string strValue = data.AttriButeData.ToString();
-                                        strValue = strValue.Substring(0, strValue.Length - 1);
-                                        humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
-                                        room.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
-                                    }
-                                }
-                            }
-                        }
-                        //}
-                    }
-                    catch (Exception ex)
-                    {
-                        System.Console.WriteLine($"Error:{ex.Message}");
-                    }
-                });
-            }
-        }
-        #endregion
-
-        public override void RemoveFromParent()
-        {
-            ZbGateway.StatusList.Remove(this);
-            base.RemoveFromParent();
-        }
+        private CommonDevice humidDevice = null;
 
         /// <summary>
         /// RoomView
@@ -171,7 +41,6 @@
             Y = Application.GetRealHeight(y);
             Width = Application.GetRealWidth(717);
             Height = Application.GetRealHeight(478);
-            ZbGateway.StatusList.Add(this);
         }
 
         /// <summary>
@@ -180,25 +49,38 @@
         /// <param name="r"></param>
         public void Init(Common.Room r)
         {
+            this.RemoveAll();
+
             this.room = r;
 
-            this.temperDevice= Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
+            this.temperDevice = HdlDeviceCommonLogic.Current.GetDevice(room.TemperatrueDevice);
 
-            this.humidDevice= Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+            this.humidDevice = HdlDeviceCommonLogic.Current.GetDevice(room.HumidityDevice);
 
             var roomBackView = new FrameLayout()
             {
                 Width = Application.GetRealWidth(717),
-                Height = Application.GetRealHeight(478)
+                Height = Application.GetRealHeight(478),
+                Radius = (uint)Application.GetRealHeight(17),
+                Tag = "R"
             };
             AddChidren(roomBackView);
 
             var roomImg = new ImageView()
             {
                 ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage),
-                Radius = (uint)Application.GetRealHeight(17)
+                Radius = (uint)Application.GetRealHeight(17),
+                Tag = "R"
             };
             roomBackView.AddChidren(roomImg);
+
+            //鍔犱釜鐗规畩鐨勯伄缃�
+            var frameBackGroudTemp = new FrameLayout();
+            frameBackGroudTemp.Width = roomBackView.Width;
+            frameBackGroudTemp.Height = roomBackView.Height;
+            frameBackGroudTemp.Radius = (uint)Application.GetRealHeight(17);
+            frameBackGroudTemp.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
+            roomBackView.AddChidren(frameBackGroudTemp);
 
             roomNameBackground = new FrameLayout
             {
@@ -218,7 +100,7 @@
                 Text = room.Name,
                 TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                 TextSize = 10,
-                TextAlignment=TextAlignment.CenterLeft,
+                TextAlignment = TextAlignment.CenterLeft,
                 IsBold = true
             };
             roomNameBackground.AddChidren(roomName);
@@ -239,8 +121,8 @@
             var temperatureIcon = new Button
             {
                 X = Application.GetRealWidth(12),
-                Width = Application.GetMinRealAverage(58),
-                Height = Application.GetMinRealAverage(58),
+                Width = this.GetPictrueRealSize(58),
+                Height = this.GetPictrueRealSize(58),
                 Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Room/Temperature.png"
             };
@@ -250,18 +132,24 @@
             {
                 X = Application.GetRealWidth(69),
                 Width = Application.GetRealWidth(120),
-                Text = room.Temperatrue == 0 ? "--鈩�" : $"{room.Temperatrue}鈩�",
+                Text = "--鈩�",
                 TextSize = 14,
-                TextAlignment=TextAlignment.CenterLeft
+                TextAlignment = TextAlignment.CenterLeft
             };
+            if (this.temperDevice != null)
+            {
+                //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
+                decimal temperatrue = (decimal)temperDevice.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, temperDevice, null);
+                temperatureText.Text = temperatrue == 0 ? "0.0鈩�" : temperatrue.ToString() + "鈩�";
+            }
             roomTemperatureBackground.AddChidren(temperatureText);
             temperatureText.Width = temperatureText.GetTextWidth() + Application.GetRealWidth(60);
 
             var humidityIcon = new Button
             {
                 X = temperatureText.Right,
-                Width = Application.GetMinRealAverage(58),
-                Height = Application.GetMinRealAverage(58),
+                Width = this.GetPictrueRealSize(58),
+                Height = this.GetPictrueRealSize(58),
                 Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Room/Humidity.png"
             };
@@ -271,10 +159,17 @@
             {
                 X = humidityIcon.Right,
                 Width = Application.GetRealWidth(120),
-                Text = room.Humidity == 0 ? "--%" : $"{room.Humidity}%",
+                Text = "--%",
                 TextSize = 14,
                 TextAlignment = TextAlignment.CenterLeft
             };
+
+            if (this.humidDevice != null)
+            {
+                //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
+                decimal humidity = (decimal)humidDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
+                humidityText.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";
+            }
             roomTemperatureBackground.AddChidren(humidityText);
             humidityText.Width = humidityText.GetTextWidth() + Application.GetRealWidth(60);
             roomTemperatureBackground.Width = (humidityText.Width + temperatureText.Width + Application.GetRealWidth(150)) > Application.GetRealWidth(600) ? Application.GetRealWidth(600) : (humidityText.Width + temperatureText.Width + Application.GetRealWidth(150));
@@ -282,22 +177,22 @@
             if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
             {
                 //鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
-                var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
-                ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
+                var dev = HdlDeviceCommonLogic.Current.GetDevice(room.TemperatrueDevice);
+                HdlDeviceAttributeLogic.Current.SendTemperatureStatuComand(dev);
             }
 
             if (string.IsNullOrEmpty(room.HumidityDevice) == false)
             {
-                var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
-                ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(dev);
+                var dev = HdlDeviceCommonLogic.Current.GetDevice(room.HumidityDevice);
+                HdlDeviceAttributeLogic.Current.SendHumidityStatuComand(dev);
             }
 
             roomListBtn = new Button()
             {
                 X = roomBackView.Width - Application.GetRealWidth(100 + 20),
                 Y = Application.GetRealHeight(20),
-                Width = Application.GetMinRealAverage(100),
-                Height = Application.GetMinRealAverage(100),
+                Width = this.GetPictrueRealSize(100),
+                Height = this.GetPictrueRealSize(100),
                 UnSelectedImagePath = "Room/List.png",
             };
             roomBackView.AddChidren(roomListBtn);
@@ -305,17 +200,57 @@
             roomListBtn.MouseUpEventHandler += (send, e) =>
             {
                 CommonPage.Instance.IsDrawerLockMode = true;
-                var editRoom = new Device.Room.EditRoom();
-                HomePage.Instance.AddChidren(editRoom);
-                HomePage.Instance.PageIndex += 1;
-                editRoom.temperDevice = this.temperDevice;
-                editRoom.humidDevice = this.humidDevice;
-                editRoom.Show(room);
-                editRoom.action += () =>
+
+                var form = new UserCenter.Residence.EditorRoomInforForm();
+                form.AddForm(room);
+                form.FinishEditorEvent += (roomName2) =>
                 {
-                    action?.Invoke();
+                    //閲嶆柊鍒锋柊鎺т欢
+                    this.Init(this.room);
                 };
             };
+            //璁惧灞炴�т笂鎶�
+            HdlGatewayReceiveLogic.Current.AddAttributeEvent("RoomView" + this.room.Id, ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+            {
+                if (this.temperDevice != null)
+                {
+                    //娓╁害璁惧
+                    if (report.DeviceAddr == temperDevice.DeviceAddr && report.DeviceEpoint == temperDevice.DeviceEpoint)
+                    {
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            decimal temperatrue = (decimal)temperDevice.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, temperDevice, null);
+                            if (temperatrue == 0)
+                            {
+                                temperatureText.Text = "0.0鈩�";
+                            }
+                            else
+                            {
+                                temperatureText.Text = temperatrue + "鈩�";
+                            }
+                        }, ShowErrorMode.NO);
+                    }
+                }
+                if (this.humidDevice != null)
+                {
+                    //婀垮害璁惧
+                    if (report.DeviceAddr == humidDevice.DeviceAddr && report.DeviceEpoint == humidDevice.DeviceEpoint)
+                    {
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            decimal humidity = (decimal)humidDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
+                            if (humidity == 0)
+                            {
+                                humidityText.Text = "--%";
+                            }
+                            else
+                            {
+                                humidityText.Text = humidity + "%";
+                            }
+                        }, ShowErrorMode.NO);
+                    }
+                }
+            });
         }
 
         /// <summary>
@@ -325,5 +260,14 @@
         {
             roomNameBackground.Visible = roomTemperatureBackground.Visible = roomListBtn.Visible = !statu;
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void RemoveFromParent()
+        {
+            HdlGatewayReceiveLogic.Current.RemoveEvent("RoomView" + this.room.Id);
+            base.RemoveFromParent();
+        }
     }
 }

--
Gitblit v1.8.0