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/MainPage/UnallocatedRoomForm.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index 2d477e4..35854a4 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -325,7 +325,7 @@
DeviceBodyTableControl.AddChidren(HorizontalView);
//涓婁竴娆￠�夋嫨鐨勮彍鍗�
- Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
+ Controls.DeviceFunctionMenuControl oldSelectContr = null;
foreach (string strText in this.dicGroupDevice.Keys)
{
var rowInfo = dicGroupDevice[strText];
@@ -336,9 +336,9 @@
HorizontalView.AddChidren(devieFrame);
//鑿滃崟鍥剧墖鎺т欢
- var deviceObjContr = new Controls.DeviceFunctionUnallocatedControl();
+ var deviceObjContr = new Controls.DeviceFunctionMenuControl();
devieFrame.AddChidren(deviceObjContr);
- deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
+ deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected);
deviceObjContr.ButtonClickEvent += (sender, e) =>
{
//閫夋嫨鐨勬槸鍚屼竴涓笢瑗跨殑璇�,涓嶅鐞�
@@ -550,7 +550,9 @@
var room = HdlRoomLogic.Current.GetRoomById(selectId);
this.SaveSelectDeviceAndScene(room);
//鍒嗙被鐣岄潰闇�瑕佸埛鏂�
- UserPage.Instance.RefreshCategoryForm = true;
+ UserPage.Instance.RefreshCategoryForm = true;
+ //涓婁紶绌洪棿鍖哄煙淇℃伅
+ HdlRoomLogic.Current.SetRoomInfoToGateway();
});
};
}
@@ -644,7 +646,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
dic[typeInfo.BeloneText].IconPath = path1;
dic[typeInfo.BeloneText].IconPathSelected = path2;
dic[typeInfo.BeloneText].Text = typeInfo.BeloneText;
--
Gitblit v1.8.0