From 351bdda734832d821a9764b0cde8be5d83c4ec50 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 01 十二月 2022 09:56:25 +0800
Subject: [PATCH] 2022年12月01日09:56:23
---
ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
index 540e15e..96be5ac 100755
--- a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
@@ -294,10 +294,10 @@
//涓婁竴娆￠�夋嫨鐨勮彍鍗曞拰鏁版嵁
DeviceRowInfo nowSelectDeviceInfo = null;
- MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
- foreach (int Textid in dicGroupDevice.Keys)
+ MainPage.Controls.DeviceFunctionMenuControl oldSelectContr = null;
+ foreach (string strText in dicGroupDevice.Keys)
{
- var rowInfo = dicGroupDevice[Textid];
+ var rowInfo = dicGroupDevice[strText];
//璁惧绫诲瀷鐨勫鍣�
var devieFrame = new FrameLayout();
@@ -305,9 +305,9 @@
deviceFunctionMenuContr.AddChidren(devieFrame);
//鑿滃崟鍥剧墖鎺т欢
- var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();
+ var deviceObjContr = new MainPage.Controls.DeviceFunctionMenuControl();
devieFrame.AddChidren(deviceObjContr);
- deviceObjContr.InitControl(Language.StringByID(Textid), rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
+ deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected);
deviceObjContr.ButtonClickEvent += (sender, e) =>
{
//閫夋嫨鐨勬槸鍚屼竴涓笢瑗跨殑璇�,涓嶅鐞�
@@ -556,7 +556,7 @@
/// 鑾峰彇鍒嗙粍鍚庣殑璁惧
/// </summary>
/// <returns></returns>
- private Dictionary<int, DeviceRowInfo> GetAllGroupDevice(Common.Room room)
+ private Dictionary<string, DeviceRowInfo> GetAllGroupDevice(Common.Room room)
{
//鍏ㄩ儴鐨勮澶�
var listDeviceTemp = HdlRoomLogic.Current.GetRoomListDevice(room);
@@ -572,23 +572,23 @@
//鏍规嵁璁惧鎵�灞炵被鍨嬫帓搴�
listDevice = LocalDevice.Current.SortDeviceByBelongType(listDevice);
- var dic = new Dictionary<int, DeviceRowInfo>();
+ var dic = new Dictionary<string, DeviceRowInfo>();
foreach (var device in listDevice)
{
var typeInfo = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
//鎸夋墍灞濱D鍒嗙粍
- if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
+ if (dic.ContainsKey(typeInfo.BeloneText) == false)
{
- dic[typeInfo.BeloneTextId] = new DeviceRowInfo();
+ dic[typeInfo.BeloneText] = new DeviceRowInfo();
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
- dic[typeInfo.BeloneTextId].IconPath = path1;
- dic[typeInfo.BeloneTextId].IconPathSelected = path2;
- dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;
+ LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
+ dic[typeInfo.BeloneText].IconPath = path1;
+ dic[typeInfo.BeloneText].IconPathSelected = path2;
+ dic[typeInfo.BeloneText].TextId = typeInfo.BeloneText;
}
- dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
+ dic[typeInfo.BeloneText].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
}
return dic;
}
@@ -623,6 +623,7 @@
device.Type == DeviceType.DimmableLight ||//褰╃伅
device.Type == DeviceType.OnOffOutput ||//缁х數鍣�
device.Type == DeviceType.Thermostat ||//绌鸿皟
+ device.Type == DeviceType.ColorTemperatureLight ||//鑹叉俯鐏�
device.Type == DeviceType.WindowCoveringDevice)//绐楀笜
{
string mainkey = LocalDevice.Current.GetDeviceMainKeys(device);
@@ -641,9 +642,9 @@
private class DeviceRowInfo
{
/// <summary>
- /// 鏂囨湰ID,鐩墠鐢ㄦ潵鍋氫富閿�
+ /// 鏂囨湰,鐩墠鐢ㄦ潵鍋氫富閿�
/// </summary>
- public int TextId = 0;
+ public string TextId = string.Empty;
/// <summary>
/// 鍥炬爣
/// </summary>
--
Gitblit v1.8.0