From d978b68da978982b35dd7d7da27217925cf8d788 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 09:34:28 +0800
Subject: [PATCH] 完整版的虚拟设备功能
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 134 ++------------------------------------------
1 files changed, 6 insertions(+), 128 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index 3a46d58..7f44d16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -37,10 +37,6 @@
/// </summary>
private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
/// <summary>
- /// 璁惧闇�瑕佷繚瀛樼殑璁惧鍔熻兘
- /// </summary>
- private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();
- /// <summary>
/// 淇℃伅缂栬緫鎺т欢
/// </summary>
private InformationEditorControl tableContr = null;
@@ -94,8 +90,6 @@
{
//璁板綍璧峰綋鍓嶆鍦ㄦ搷浣滅殑鍥炶矾鍚嶅瓧
dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
foreach (var epoint in dicDeviceSaveName.Keys)
{
var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
@@ -112,45 +106,10 @@
var result = await Common.LocalDevice.Current.ReName(device, newName);
if (result == false)
{
- //鍏抽棴
- this.CloseProgressBar();
return;
}
}
}
- foreach (var epoint in dicDeviceFuncType.Keys)
- {
- var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
- if (device == null)
- {
- continue;
- }
- //璁剧疆鍔熻兘绫诲瀷
- device.DfunctionType = dicDeviceFuncType[epoint];
- if (device.IsCustomizeImage == true)
- {
- continue;
- }
- //閲嶆柊璁剧疆鍥剧墖
- if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
- {
- device.IconPath = "Device/Switch.png";
- }
- else if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
- {
- device.IconPath = "Device/Socket1.png";
- }
- else if (device.DfunctionType == DeviceFunctionType.A鐏厜)
- {
- device.IconPath = "Device/Light.png";
- }
- else
- {
- device.IconPath = "Device/RelayEpoint.png";
- }
- device.ReSave();
- }
- this.CloseProgressBar();
//鍏抽棴鑷韩
this.CloseForm();
};
@@ -281,95 +240,14 @@
/// </summary>
private void AddFunctionTypeRow()
{
- //濡傛灉鏄户鐢靛櫒鍜岃皟鍏夊櫒鐨勮瘽
- if (nowSelectDevice.Type == DeviceType.OnOffOutput || nowSelectDevice.Type == DeviceType.DimmableLight
- || nowSelectDevice.Type == DeviceType.ColorDimmableLight)
+ //鑷畾涔夊姛鑳界被鍨嬫帶浠�
+ var rowFunction = new DeviceFunctionTypeRowControl(nowSelectDevice, listview.rowSpace / 2);
+ if (rowFunction.CanShowRow == true)
{
- //鍔熻兘绫诲瀷
- string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType);
- var DfunctionType = nowSelectDevice.DfunctionType;
- if (this.dicDeviceFuncType.ContainsKey(nowSelectDevice.DeviceEpoint) == true)
- {
- DfunctionType = this.dicDeviceFuncType[nowSelectDevice.DeviceEpoint];
- }
-
- //鍔熻兘绫诲瀷鐨勭炕璇戝悕瀛�
- int nowSelectNo = 1;
- string strType = string.Empty;
- if (DfunctionType == DeviceFunctionType.A鐏厜)
- {
- strType = Language.StringByID(R.MyInternationalizationString.uLight);
- nowSelectNo = 1;
- }
- else if (DfunctionType == DeviceFunctionType.A寮�鍏�)
- {
- strType = Language.StringByID(R.MyInternationalizationString.uSwitch);
- nowSelectNo = 0;
- }
- else if (DfunctionType == DeviceFunctionType.A鎻掑骇)
- {
- strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
- nowSelectNo = 2;
- }
-
- var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
- btnFunction.UseClickStatu = false;
- listview.AddChidren(btnFunction);
- btnFunction.InitControl();
+ listview.AddChidren(rowFunction);
+ rowFunction.InitControl();
//搴曠嚎
- btnFunction.AddBottomLine();
-
- //濡傛灉鏄户鐢靛櫒鎵嶈兘澶熸洿鏀硅繖涓姛鑳界被鍨�
- if (nowSelectDevice.Type == DeviceType.OnOffOutput)
- {
- btnFunction.UseClickStatu = true;
- //鍙崇澶�
- btnFunction.AddRightArrow();
- btnFunction.ButtonClickEvent += (sender, e) =>
- {
- //鏄剧ず鍒楄〃
- var listText = new List<string>();
- listText.Add(Language.StringByID(R.MyInternationalizationString.uSwitch));//寮�鍏�
- listText.Add(Language.StringByID(R.MyInternationalizationString.uLight));//鐏厜
- listText.Add(Language.StringByID(R.MyInternationalizationString.uSocket1));//鎻掑骇
- //鏍囬:閫夋嫨鍔熻兘绫诲瀷
- var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);
-
- var form = new BottomItemSelectForm();
- form.CancelCallEvent = true;//鍏佽鍙栨秷
- form.AddForm(title, listText, nowSelectNo);
- form.FinishSelectEvent += (selectNo) =>
- {
- if (selectNo == -1)
- {
- //閫夋嫨鍙栨秷
- btnFunction.Text = string.Empty;
- }
- else
- {
- btnFunction.Text = listText[selectNo];
- }
- nowSelectNo = selectNo;
- //璁板綍璧峰綋鍓嶉�夋嫨鐨勫姛鑳界被鍨�
- if (selectNo == 0)
- {
- dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A寮�鍏�;
- }
- else if (selectNo == 1)
- {
- dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A鐏厜;
- }
- else if (selectNo == 2)
- {
- dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A鎻掑骇;
- }
- else
- {
- dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A鏈畾涔�;
- }
- };
- };
- }
+ rowFunction.AddBottomLine();
}
}
--
Gitblit v1.8.0