From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 40b3042..dcebeec 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -60,13 +60,17 @@
             btnPic.Height = Application.GetMinRealAverage(444);
             btnPic.Gravity = Gravity.CenterHorizontal;
             btnPic.Radius = 17;
-            btnPic.ImagePath = "Room/r0.png";
+            btnPic.ImagePath = "RoomIcon/0.JPG";
             bodyFrameLayout.AddChidren(btnPic);
             btnPic.MouseUpEventHandler += (sender, e) =>
             {
                 //鎴块棿鍥剧墖閫夋嫨
                 this.RoomPictrueSelect(btnPic);
             };
+            //娣诲姞闃村奖鐗规晥
+            var btnTemp = new ButtonBase();
+            btnTemp.AddBottomShadow(btnPic, true);
+            btnTemp = null;
 
             this.newRoom = new Common.Room();
             newRoom.FloorId = this.floorKeys;
@@ -163,13 +167,15 @@
                 if (newRoom.BackgroundImageType == 1 || newRoom.BackgroundImageType == 2)
                 {
                     //鐢熸垚鍥剧墖
-                    string picName = $"Room_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
+                    string picName = $"RoomIcon_{DateTime.Now.ToString("yyyyMMddHHmmss")}.png";
                     string picFullName = System.IO.Path.Combine(Common.Config.Instance.FullPath, picName);
                     Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
                     newRoom.BackgroundImage = picFullName;
                     //澶囦唤
                     Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(picName);
                 }
+
+                newRoom.FloorId = this.floorKeys;
                 var result = newRoom.AddRoom(newRoom);
                 if (result == false)
                 {
@@ -272,8 +278,8 @@
             //鑾峰彇涓�...
             btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
 
-            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 (newRoom.TemperatrueDevice != mainKeys || btnTemper == null)
@@ -281,7 +287,7 @@
                     return;
                 }
                 //绉婚櫎鎺変簨浠�
-                HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+                HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
 
                 foreach (var data in report.DeviceStatusReport.AttriBute)
                 {
@@ -365,8 +371,8 @@
             //鑾峰彇涓�...
             btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
 
-            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 (newRoom.HumidityDevice != mainKeys || btnHumi == null)
@@ -374,7 +380,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)
@@ -425,7 +431,8 @@
                     }
                     this.newRoom.BackgroundImageType = 0;
                     this.newRoom.BackgroundImage = imgPath;
-                    imageContr.ImagePath = imgPath;
+                    imgPath = IO.FileUtils.GetImageFilePath(imgPath);
+                    imageContr.ImageBytes = IO.FileUtils.ReadFile(imgPath);
                 };
             });
             //鎷嶇収
@@ -468,14 +475,14 @@
         /// <summary>
         /// 鐣岄潰鍏抽棴
         /// </summary>
-        public override void CloseForm()
+        public override void CloseFormBefore()
         {
             this.FinishEditorEvent = null;
 
-            HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
-            HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
 
-            base.CloseForm();
+            base.CloseFormBefore();
         }
 
         #endregion
@@ -511,7 +518,6 @@
                     return false;
                 }
             }
-            newRoom.FloorId = this.floorKeys;
 
             return true;
         }

--
Gitblit v1.8.0