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/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 94 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index 38c1f5b..9322e2d 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -46,6 +46,10 @@
/// </summary>
private MostRightIconControl btnSwitch = null;
/// <summary>
+ /// 鐢垫睜鎺т欢
+ /// </summary>
+ private IconViewControl btnBattery = null;
+ /// <summary>
/// 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋� 0:娌℃湁鑾峰彇寰楀埌 1:宸茬粡鑾峰彇寰楀埌
/// </summary>
private int ResponeResult = 0;
@@ -97,22 +101,22 @@
//璁惧鍥炬爣鎺т欢
this.btnDeviceIcon = new IconViewControl(78);
btnDeviceIcon.Gravity = Gravity.Center;
- Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
frameIconBackGroud.AddChidren(btnDeviceIcon);
//閲嶆柊缁戝畾浜嬩欢
this.frameTable.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEvent);
//璁惧鍚嶅瓧
this.btnDeviceName = new NormalViewControl(600, 60, true);
- if (this.device.Type == DeviceType.WindowCoveringDevice)
+ if (this.device.Type == DeviceType.WindowCoveringDevice || this.device.Type == DeviceType.Airer)
{
- //绐楀笜鍥犱负鍙宠竟鏈変笁涓寜閽�,鎵�浠ラ渶瑕佹墍鏈夊悕瀛楃殑瀹藉害
+ //绐楀笜鍥犱负鍙宠竟鏈変笁涓寜閽�,鎵�浠ラ渶瑕佺缉灏忓悕瀛楃殑瀹藉害
this.btnDeviceName.Width = Application.GetRealWidth(360);
}
btnDeviceName.X = Application.GetRealWidth(181);
//褰撴寚瀹氬疄闄呭潗鏍囨椂,杩欓噷闇�瑕佺殑鍋忕Щ閲忎负2鍊�
btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;
- btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
@@ -136,9 +140,9 @@
}
//搴曠嚎
- var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);
+ var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);
btnBottomLine.X = Application.GetRealWidth(181);
- btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;
+ btnBottomLine.Y = this.Height - HdlControlResourse.BottomLineHeight;
btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
this.frameTable.AddChidren(btnBottomLine, ChidrenBindMode.NotBind);
@@ -146,6 +150,24 @@
this.btnSwitch = new MostRightIconControl(69, 69);
btnSwitch.UnSelectedImagePath = "Item/Switch.png";
btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";
+
+ //鐢垫睜鎺т欢
+ if (this.device.Type == DeviceType.IASZone)
+ {
+ this.btnBattery = new IconViewControl(69);
+ btnBattery.X = this.Width - Application.GetRealWidth(69 + 29);
+ btnBattery.UnSelectedImagePath = "Item/Battery.png";
+ btnBattery.Gravity = Gravity.CenterVertical;
+ this.frameTable.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
+ if (chidrenYaxis != 0)
+ {
+ btnBattery.Y += chidrenYaxis;
+ }
+ if (this.device.IsBatteryDown == false)
+ {
+ btnBattery.Visible = false;
+ }
+ }
//鍒嗕韩鐨勬埧闂�,鍒欎笉鑳界紪杈戝拰鍒犻櫎
if (this.nowSelectRoom.IsSharedRoom == false)
@@ -202,6 +224,8 @@
//鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
this.RowNeedRemoveEvent?.Invoke();
this.RemoveFromParent();
+ //涓婁紶绌洪棿鍖哄煙淇℃伅
+ HdlRoomLogic.Current.SetRoomInfoToGateway();
};
};
}
@@ -221,7 +245,7 @@
{
this.frameTable.AddChidren(this.btnSwitch, ChidrenBindMode.NotBind);
btnSwitch.InitControl();
- btnSwitch.X -= ControlCommonResourse.XXLeft;
+ btnSwitch.X -= HdlControlResourse.XXLeft;
btnSwitch.Y += this.chidrenYaxis;
return btnSwitch;
@@ -238,9 +262,9 @@
public virtual void RefreshControlInfo(CommonDevice i_device)
{
//璁惧鍥炬爣涔熷埛鏂�
- Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
//璁惧鍚嶅瓧
- this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ this.btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
//妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵��
bool isOpen = this.CheckIsOpenStatu(i_device);
if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)
@@ -249,6 +273,13 @@
//绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
isOpen = false;
}
+ //濡傛灉鏄紶鎰熷櫒绫�,鍒欓粯璁ゆ槸鍏崇殑鏁堟灉
+ if (this.device.Type == DeviceType.PMSensor || this.device.Type == DeviceType.IASZone
+ || this.device.Type == DeviceType.TemperatureSensor)
+ {
+ isOpen = false;
+ }
+
this.SetRowOpenStatu(isOpen);
}
@@ -261,7 +292,7 @@
//璁惧鐘舵�佸繀椤诲埛鏂�
if (this.btnStatu != null)
{
- this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+ this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
}
//寮�鍏虫帶浠�
if (this.btnSwitch != null && this.btnSwitch.IsSelected != isOpen)
@@ -324,7 +355,7 @@
//濡傛灉杩欎釜鍑芥暟琚噸鍐欑殑璇�,鍒欎唬琛ㄨ繖涓澶囨湁寮�鍏冲姛鑳�
this.isHadOpenSwitch = false;
//榛樿鐢ㄥ湪绾跨姸鎬佹潵鍒ゆ柇
- return Common.LocalDevice.Current.CheckDeviceIsOnline(i_device);
+ return HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(i_device);
}
@@ -421,6 +452,43 @@
this.ResponeResult = 1;
}
+ /// <summary>
+ /// 鎺ユ敹缃戝叧鍥炲鐨勭姸鎬�(true:宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍥炲 false:杩樻病鏈夋帴鏀跺埌缃戝叧鍥炲)
+ /// </summary>
+ /// <returns></returns>
+ public bool ReceiveResponeResultStatu()
+ {
+ return this.ResponeResult == 1;
+ }
+
+ #endregion
+
+ #region 鈻� 鏄剧ず浣庣數閲廮________________________
+
+ /// <summary>
+ /// 鍒锋柊鐢垫睜鐢甸噺鐘舵��
+ /// </summary>
+ public void RefreshBatteryStatu()
+ {
+ if (this.btnBattery == null) { return; }
+ if (this.device.IsBatteryDown == true)
+ {
+ //鐢甸噺浣�,鏄剧ず鍥炬爣
+ if (this.btnBattery.Visible == false)
+ {
+ this.btnBattery.Visible = true;
+ }
+ }
+ else
+ {
+ //鐢甸噺瓒冲,闅愯棌鍥炬爣
+ if (this.btnBattery.Visible == true)
+ {
+ this.btnBattery.Visible = false;
+ }
+ }
+ }
+
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
@@ -458,7 +526,7 @@
public void StartRowLightAppeal()
{
//璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+ this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
if (this.isAppeal == true) { return; }
this.isAppeal = true;
@@ -495,7 +563,7 @@
/// <summary>
/// 鍒囨崲鍗＄墖鐘舵�佺壒鏁�
/// </summary>
- private void SwitchRowStatuAppeal(bool isOpen)
+ public void SwitchRowStatuAppeal(bool isOpen)
{
if (this.btnDeviceName.IsSelected == isOpen)
{
--
Gitblit v1.8.0