From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 86 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index 921cc7c..ad9af3c 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -50,6 +50,10 @@
/// </summary>
private IconViewControl btnCollect = null;
/// <summary>
+ /// 鐢垫睜鎺т欢
+ /// </summary>
+ private IconViewControl btnBattery = null;
+ /// <summary>
/// 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋� 0:娌℃湁鑾峰彇寰楀埌 1:宸茬粡鑾峰彇寰楀埌
/// </summary>
private int ResponeResult = 0;
@@ -96,13 +100,13 @@
this.AddChidren(btnBackGroud, ChidrenBindMode.BindEvent);
//璁惧鍚嶇О鎺т欢
- this.btnDeviceName = new NormalViewControl(320, 63, true);
+ this.btnDeviceName = new NormalViewControl(360, 63, true);
btnDeviceName.X = HdlControlLogic.Current.GetPictrueRealSize(40);
btnDeviceName.Y = HdlControlLogic.Current.GetPictrueRealSize(17);
btnDeviceName.TextSize = 16;
btnDeviceName.TextColor = UserCenterColor.Current.TextGrayColor1;
btnDeviceName.SelectedTextColor = UserCenterColor.Current.White;
- btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
//鏀堕泦鎺т欢
@@ -151,7 +155,7 @@
this.ChangedChidrenBindMode(fraDeviceRound, ChidrenBindMode.BindEvent);
//鐘舵�佹枃鏈帶浠�
- this.btnStatu = new NormalViewControl(HdlControlLogic.Current.GetPictrueRealSize(300), HdlControlLogic.Current.GetPictrueRealSize(63), false);
+ this.btnStatu = new NormalViewControl(HdlControlLogic.Current.GetPictrueRealSize(400), HdlControlLogic.Current.GetPictrueRealSize(63), false);
btnStatu.X = HdlControlLogic.Current.GetPictrueRealSize(46);
btnStatu.Y = HdlControlLogic.Current.GetPictrueRealSize(236);
btnStatu.TextColor = UserCenterColor.Current.TextColor1;
@@ -165,6 +169,21 @@
btnSwitch.Y = HdlControlLogic.Current.GetPictrueRealSize(202);
btnSwitch.UnSelectedImagePath = "Item/Switch1.png";
btnSwitch.SelectedImagePath = "Item/SwitchSelected1.png";
+
+ //鐢垫睜鎺т欢
+ if (this.device.Type == DeviceType.IASZone)
+ {
+ this.btnBattery = new IconViewControl(69);
+ btnBattery.X = HdlControlLogic.Current.GetPictrueRealSize(348);
+ btnBattery.Y = HdlControlLogic.Current.GetPictrueRealSize(236);
+ btnBattery.UnSelectedImagePath = "Item/Battery.png";
+ btnBattery.SelectedImagePath = "Item/BatterySelected.png";
+ this.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
+ if (this.device.IsBatteryDown == false)
+ {
+ btnBattery.Visible = false;
+ }
+ }
//鍒锋柊淇℃伅
this.RefreshControlInfo(i_device);
@@ -200,9 +219,9 @@
btnCollect.IsSelected = collect;
}
//璁惧鍥炬爣涔熷埛鏂�
- Common.LocalDevice.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl2(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)
@@ -211,6 +230,13 @@
//绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
isOpen = false;
}
+ //濡傛灉鏄紶鎰熷櫒绫�,鍒欓粯璁ゆ槸鍏崇殑鏁堟灉
+ if (this.device.Type == DeviceType.PMSensor || this.device.Type == DeviceType.IASZone
+ || this.device.Type == DeviceType.TemperatureSensor)
+ {
+ isOpen = false;
+ }
+
this.SetCardOpenStatu(isOpen);
}
@@ -221,7 +247,7 @@
public void SetCardOpenStatu(bool isOpen)
{
//璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+ this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
//寮�鍏虫帶浠�
if (btnSwitch != null && this.btnSwitch.IsSelected != isOpen)
{
@@ -281,7 +307,7 @@
//濡傛灉杩欎釜鍑芥暟琚噸鍐欑殑璇�,鍒欎唬琛ㄨ繖涓澶囨湁寮�鍏冲姛鑳�
this.isHadOpenSwitch = false;
//榛樿鐢ㄥ湪绾跨姸鎬佹潵鍒ゆ柇
- return Common.LocalDevice.Current.CheckDeviceIsOnline(i_device);
+ return HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(i_device);
}
@@ -382,6 +408,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 鈻� 涓�鑸柟娉昣__________________________
@@ -419,7 +482,7 @@
public void StartCardLightAppeal()
{
//璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+ this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
if (this.isAppeal == true) { return; }
this.isAppeal = true;
@@ -456,7 +519,7 @@
/// <summary>
/// 鍒囨崲鍗＄墖鐘舵�佺壒鏁�
/// </summary>
- private void SwitchCardStatuAppeal(bool isOpen)
+ public void SwitchCardStatuAppeal(bool isOpen)
{
if (this.btnBackGroud.IsSelected == isOpen)
{
@@ -481,6 +544,11 @@
this.btnDeviceIcon.IsSelected = isOpen;
//鐘舵�佹枃鏈帶浠�
this.btnStatu.IsSelected = isOpen;
+ //鐢垫睜鎺т欢
+ if (this.btnBattery != null && this.btnBattery.Visible == true)
+ {
+ this.btnBattery.IsSelected = isOpen;
+ }
}
#endregion
--
Gitblit v1.8.0