From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs | 327 ++++++++++++++++++++++++------------------------------
1 files changed, 144 insertions(+), 183 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
index 9382623..901ff97 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
@@ -7,20 +7,20 @@
namespace Shared.Phone.UserCenter.DevicePanel
{
- /// <summary>
- /// 闈㈡澘鐨勬寜閿厤缃晫闈€�愯绫绘殏鏃惰垗寮冦��
+ /// <summary>
+ /// 闈㈡澘鐨勬寜閿厤缃晫闈€�愯绫绘殏鏃惰垗寮冦��
/// </summary>
public class PanelSimpleEnvironmentButtonSettionForm : EditorCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� 鍙橀噺澹版槑___________________________
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private FrameListControl listview = null;
- /// <summary>
- /// 璁惧鐨勬煇涓�鍥炶矾
- /// </summary>
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private FrameListControl listview = null;
+ /// <summary>
+ /// 璁惧鐨勬煇涓�鍥炶矾
+ /// </summary>
private CommonDevice deviceObj = null;
/// <summary>
/// 鏂伴鐩爣鍚嶅瓧
@@ -61,77 +61,77 @@
#endregion
- #region 鈻� 鍒濆鍖朹____________________________
+ #region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
- public void ShowForm(CommonDevice i_device)
- {
- this.deviceObj = i_device;
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
+ public void ShowForm(CommonDevice i_device)
+ {
+ this.deviceObj = i_device;
//鑾峰彇鏁版嵁
InitInfo(deviceObj);
-
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
-
- //鍒濆鍖栧彸涓婅鑿滃崟
- this.InitTopRightMenu();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+
+ //鍒濆鍖栧彸涓婅鑿滃崟
+ this.InitTopRightMenu();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
var listBackControl = new VerticalFrameControl();
listBackControl.Height = bodyFrameLayout.Height;
bodyFrameLayout.AddChidren(listBackControl);
- //鍥剧墖
- var btnPic = new PicViewControl(426, 426);
- btnPic.Y = Application.GetRealHeight(150);
- btnPic.UnSelectedImagePath = "RealDevice/ButtonPanelSimpleEnvironment.png";
- btnPic.Gravity = Gravity.CenterHorizontal;
- listBackControl.frameTable.AddChidren(btnPic);
-
- //鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
-
- //鍒濆鍖栬彍鍗曡
- this.InitMenuRow();
-
- //鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl();
- tableContr = null;
-
- //淇濆瓨
- var btnFinish = new BottomClickButton();
- btnFinish.TextID = R.MyInternationalizationString.uSave;
- bodyFrameLayout.AddChidren(btnFinish);
- btnFinish.ButtonClickEvent += (sender, e) =>
- {
- //鍏抽棴鑷韩
- this.CloseForm();
- };
- }
-
- /// <summary>
- /// 鍒濆鍖栬彍鍗曡
- /// </summary>
- private void InitMenuRow()
- {
+ //鍥剧墖
+ var btnPic = new PicViewControl(426, 426);
+ btnPic.Y = Application.GetRealHeight(150);
+ btnPic.UnSelectedImagePath = "RealDevice/ButtonPanelSimpleEnvironment.png";
+ btnPic.Gravity = Gravity.CenterHorizontal;
+ listBackControl.frameTable.AddChidren(btnPic);
+
+ //鍒濆鍖栨甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
+
+ //鍒濆鍖栬彍鍗曡
+ this.InitMenuRow();
+
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl();
+ tableContr = null;
+
+ //淇濆瓨
+ var btnFinish = new BottomClickButton();
+ btnFinish.TextID = R.MyInternationalizationString.uSave;
+ bodyFrameLayout.AddChidren(btnFinish);
+ btnFinish.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ };
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栬彍鍗曡
+ /// </summary>
+ private void InitMenuRow()
+ {
this.listview.RemoveAll();
//Ac鏉ユ簮
- this.AddAcRow();
+ this.AddAcRow();
//娣诲姞鏂伴鐩爣
this.AddFreshAirRow();
//娣诲姞娓╁害鏉ユ簮
@@ -207,7 +207,7 @@
bindList = panelBindListRes.getAllBindResponseData.BindList;
foreach (var bDev in bindList)
{
- var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
continue;
@@ -215,21 +215,13 @@
if (device.Type == DeviceType.FreshAir)
{
//鑾峰彇璁惧绫诲瀷鐨�
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
//鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindFreshAirName = bDev.ESName;
- }
-
+ bindFreshAirName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
bindFreshAirDev = device;
}
else if (device.Type == DeviceType.TemperatureSensor)
@@ -237,66 +229,35 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
+ bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
else if (device.Type == DeviceType.Thermostat)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.PMSensor)
{
if (bDev.BindCluster == 1026)
{
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
bindTemperatureDev = device;
}
if (bDev.BindCluster == 1029)
{
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
bindHumidityDev = device;
}
}
@@ -358,30 +319,30 @@
};
}
#endregion
-
+
#region 鈻� 鏂伴鐩爣_________________________
/// <summary>
/// 鏂伴鐩爣琛�
/// </summary>
private void AddFreshAirRow()
{
- //鏂伴鐩爣
- var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
- listview.AddChidren(rowNewWind);
- rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewWindTarget), 600);
- //搴曠嚎
- rowNewWind.AddBottomLine();
- //鍙崇澶�
- rowNewWind.AddRightArrow();
+ //鏂伴鐩爣
+ var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowNewWind);
+ rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewWindTarget), 600);
+ //搴曠嚎
+ rowNewWind.AddBottomLine();
+ //鍙崇澶�
+ rowNewWind.AddRightArrow();
var msg = Language.StringByID(R.MyInternationalizationString.nothing);
if (!string.IsNullOrEmpty(bindFreshAirName))
{
msg = bindFreshAirName;
}
- var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
+ var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
- rowNewWind.ButtonClickEvent += (sender, e) =>
+ rowNewWind.ButtonClickEvent += (sender, e) =>
{
this.deviceObj.DeviceEpoint = 2;
var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindAcDev, DeviceBind.BindInfo.BindType.FreshAir);
@@ -411,8 +372,8 @@
/// <summary>
/// 娓╁害鏉ユ簮琛�
/// </summary>
- private void AddTemperatureSensorRow()
- {
+ private void AddTemperatureSensorRow()
+ {
//娓╁害鏉ユ簮
var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
listview.AddChidren(rowTemPerature);
@@ -504,58 +465,58 @@
private void AddLevelRow()
{
//浜害璋冭妭
- var rowLight = new FrameRowControl(listview.rowSpace / 2);
- listview.AddChidren(rowLight);
- rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uLightRegulation), 600);
- //搴曠嚎
- rowLight.AddBottomLine();
- //鍙崇澶�
- rowLight.AddRightArrow();
- rowLight.ButtonClickEvent += (sender, e) =>
+ var rowLight = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowLight);
+ rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uLightRegulation), 600);
+ //搴曠嚎
+ rowLight.AddBottomLine();
+ //鍙崇澶�
+ rowLight.AddRightArrow();
+ rowLight.ButtonClickEvent += (sender, e) =>
{
- var form = new PanelBrightnessAdjustForm();
- form.AddForm(this.deviceObj);
+ var form = new PanelBrightnessAdjustForm();
+ form.AddForm(this.deviceObj);
};
}
- #endregion
+ #endregion
#region 鈻� 鍙充笂瑙掕彍鍗昣________________________
- /// <summary>
- /// 鍒濆鍖栧彸涓婅鑿滃崟
- /// </summary>
- private void InitTopRightMenu()
- {
- //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
- if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(deviceObj) == false)
- {
- return;
- }
- var btnIcon = new MostRightIconControl(69, 69);
- btnIcon.UnSelectedImagePath = "Item/More.png";
- topFrameLayout.AddChidren(btnIcon);
- btnIcon.InitControl();
- btnIcon.ButtonClickEvent += ((sender, e) =>
- {
- //鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
- this.ShowTopRightMenu();
- });
- }
-
- /// <summary>
- /// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
- /// </summary>
- private void ShowTopRightMenu()
- {
- var frame = new TopRightMenuControl(1, 1);
- //瀹氫綅
- string deviceMenu = Language.StringByID(R.MyInternationalizationString.uFixedPosition);
- frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
- {
- //鍙戦�佸畾浣嶅姛鑳�
- Common.LocalDevice.Current.SetFixedPositionCommand(deviceObj);
- });
- }
-
- #endregion
- }
+ /// <summary>
+ /// 鍒濆鍖栧彸涓婅鑿滃崟
+ /// </summary>
+ private void InitTopRightMenu()
+ {
+ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+ if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(deviceObj) == false)
+ {
+ return;
+ }
+ var btnIcon = new MostRightIconControl(69, 69);
+ btnIcon.UnSelectedImagePath = "Item/More.png";
+ topFrameLayout.AddChidren(btnIcon);
+ btnIcon.InitControl();
+ btnIcon.ButtonClickEvent += ((sender, e) =>
+ {
+ //鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
+ this.ShowTopRightMenu();
+ });
+ }
+
+ /// <summary>
+ /// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
+ /// </summary>
+ private void ShowTopRightMenu()
+ {
+ var frame = new TopRightMenuControl(1, 1);
+ //瀹氫綅
+ string deviceMenu = Language.StringByID(R.MyInternationalizationString.uFixedPosition);
+ frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
+ {
+ //鍙戦�佸畾浣嶅姛鑳�
+ HdlDeviceCommonLogic.Current.SetFixedPositionCommand(deviceObj);
+ });
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0