From 304dca51c28183a9dfc192c6b93ea1c00bdd5d97 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:00:40 +0800
Subject: [PATCH] 添加了写入功能类型

---
 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 0828d24..bf17018 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -23,11 +23,11 @@
         /// <summary>
         /// 鍦烘櫙鍔熻兘涓儴鑳屾櫙bodyView(楂樺害涓鸿澶囪彍鍗曠殑閭ｄ釜鐧借壊鑳屾櫙鐨勪笂閮ㄥ埌灞忓箷搴曢儴)
         /// </summary>
-        public FrameLayout functionSceneBodyView;
+        public NormalFrameLayout functionSceneBodyView;
         /// <summary>
         /// 涓儴鑳屾櫙bodyView(楂樺害涓哄満鏅姛鑳藉垏鎹㈡帶浠剁殑搴曢儴鍒板睆骞曞簳閮�)
         /// </summary>
-        public FrameLayout functionSceneAutoBodyView;
+        public NormalFrameLayout functionSceneAutoBodyView;
         /// <summary>
         /// 鍙充笂瑙掓坊鍔犳寜閽�
         /// </summary>
@@ -54,6 +54,7 @@
         /// </summary>
         public CategoryMainForm()
         {
+            this.FormID = "CategoryMainForm";
             BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
             instance = this;
         }
@@ -81,7 +82,7 @@
         private void InitTopControl()
         {
             //澶撮儴FrameLayout
-            this.topFrameLayout = new FrameLayout();
+            this.topFrameLayout = new NormalFrameLayout();
             topFrameLayout.Y = Application.GetRealHeight(104);
             topFrameLayout.Height = Application.GetRealHeight(127);
             topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -129,7 +130,7 @@
         private void InitMidControls()
         {
             //搴旇鏄痓ody鍚�
-            this.bodyFrameLayout = new FrameLayout();
+            this.bodyFrameLayout = new NormalFrameLayout();
             bodyFrameLayout.Y = topFrameLayout.Bottom;
             bodyFrameLayout.Height = this.Height - topFrameLayout.Bottom;
             bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -161,7 +162,7 @@
                     floors.changeFloor = true;
                     floors.FloorAction += (floorId) =>
                     {
-                        btnFloorName.Text = Config.Instance.Home.GetFloorNameById(floorId);
+                        btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
                         HdlRoomLogic.Current.NowCategoryRoom = HdlRoomLogic.Current.GetLoveRoom();
                         //鍒锋柊bodyView
                         this.RefreshBodyView();
@@ -180,7 +181,7 @@
             }
 
             //鐩墠涓嶇煡閬撻儹闆煄鐨勮繖涓叿浣撴斁鍦ㄥ摢涓殑浣嶇疆
-            this.functionSceneAutoBodyView = new FrameLayout();
+            this.functionSceneAutoBodyView = new NormalFrameLayout();
             functionSceneAutoBodyView.Y = frameSwitchBack.Bottom;
             functionSceneAutoBodyView.Height = bodyFrameLayout.Height - frameSwitchBack.Bottom;
             bodyFrameLayout.AddChidren(functionSceneAutoBodyView);
@@ -316,7 +317,7 @@
             };
 
             //鍔熻兘鍜屽満鏅痓odyView
-            this.functionSceneBodyView = new FrameLayout();
+            this.functionSceneBodyView = new NormalFrameLayout();
             functionSceneBodyView.Y = roomSwitchContr.Bottom;
             functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
             functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
@@ -531,6 +532,11 @@
                     else if (device.Type == DeviceType.DoorLock)
                     {
                         cardContr = new Controls.DeviceDoorLockRowControl();
+                    }
+                    //鑹叉俯鐏�
+                    else if (device.Type == DeviceType.ColorTemperatureLight)
+                    {
+                        cardContr = new Controls.DeviceColorTemperatureRowControl();
                     }
                     //鏃犳硶璇嗗埆
                     else
@@ -797,7 +803,7 @@
         private void AddNormalDeviceReportEvent()
         {
             //璁惧灞炴�т笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
-            HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+            HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
             {
                 HdlThreadLogic.Current.RunMain(() =>
                 {
@@ -816,7 +822,7 @@
             });
 
             //璁惧鍦ㄧ嚎涓婃姤(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
-            HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
+            HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
             {
                 HdlThreadLogic.Current.RunMain(() =>
                 {
@@ -843,7 +849,7 @@
         private void AddSensorDeviceReportEvent()
         {
             //浼犳劅鍣ㄤ笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
-            HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
+            HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
             {
                 HdlThreadLogic.Current.RunMain(() =>
                 {
@@ -918,6 +924,9 @@
         {
             //鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
             instance = null;
+            HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormDeviceStatus");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormDeviceOnline");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormSensor");
 
             base.CloseFormBefore();
         }

--
Gitblit v1.8.0