From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 177 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 130 insertions(+), 47 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index ecd5188..e40e221 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -14,6 +14,10 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
+ /// 璁惧瀵硅薄
+ /// </summary>
+ public CommonDevice device = null;
+ /// <summary>
/// 鍗＄墖闇�瑕佽绉婚櫎鐨勪簨浠�
/// </summary>
public Action CardNeedRemoveEvent = null;
@@ -28,7 +32,7 @@
/// <summary>
/// 璁惧鐨勮儗鏅渾鍦堝浘鎺т欢
/// </summary>
- private NormalViewControl btnDeviceRound = null;
+ private FrameLayout fraDeviceRound = null;
/// <summary>
/// 璁惧鍥炬爣鎺т欢
/// </summary>
@@ -42,9 +46,17 @@
/// </summary>
private PicViewControl btnSwitch = null;
/// <summary>
+ /// 鏀堕泦鎺т欢
+ /// </summary>
+ private IconViewControl btnCollect = null;
+ /// <summary>
/// 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋� 0:娌℃湁鑾峰彇寰楀埌 1:宸茬粡鑾峰彇寰楀埌
/// </summary>
private int ResponeResult = 0;
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鏈夊紑鍏冲姛鑳�
+ /// </summary>
+ private bool isHadOpenSwitch = true;
#endregion
@@ -56,9 +68,9 @@
public DeviceCardCommon()
{
//鍥剧墖鐪熷疄瀹藉害+鍥剧墖鑷韩宸﹀彸绌虹櫧
- this.Width = Application.GetMinRealAverage(458 + 14 * 2);
+ this.Width = HdlControlLogic.Current.GetPictrueRealSize(458 + 14 * 2);
//鍥剧墖楂樺害+闃村奖
- this.Height = Application.GetMinRealAverage(305 + 43);
+ this.Height = HdlControlLogic.Current.GetPictrueRealSize(305 + 43);
//鍙栨秷鐐瑰嚮鐗规晥
this.UseClickStatu = false;
}
@@ -69,6 +81,7 @@
/// <param name="i_device">鎸囧畾璁惧</param>
public virtual void InitControl(CommonDevice i_device)
{
+ this.device = i_device;
//鑳屾櫙鍥剧墖
this.btnBackGroud = new PicViewControl(this.Width, this.Height, false);
btnBackGroud.UnSelectedImagePath = "Item/FunctionCardView.png";
@@ -78,8 +91,8 @@
//璁惧鍚嶇О鎺т欢
this.btnDeviceName = new NormalViewControl(320, 63, true);
- btnDeviceName.X = Application.GetMinRealAverage(40);
- btnDeviceName.Y = Application.GetMinRealAverage(17);
+ 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;
@@ -87,9 +100,9 @@
this.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);
//鏀堕泦鎺т欢
- var btnCollect = new IconViewControl(107);
- btnCollect.X = Application.GetMinRealAverage(350);
- btnCollect.Y = Application.GetMinRealAverage(12);
+ this.btnCollect = new IconViewControl(107);
+ btnCollect.X = HdlControlLogic.Current.GetPictrueRealSize(350);
+ btnCollect.Y = HdlControlLogic.Current.GetPictrueRealSize(12);
btnCollect.UnSelectedImagePath = "Item/Collection1.png";
btnCollect.SelectedImagePath = "Item/CollectionSelected1.png";
this.AddChidren(btnCollect, ChidrenBindMode.NotBind);
@@ -116,24 +129,25 @@
};
//璁惧鐨勮儗鏅渾鍦堝浘
- this.btnDeviceRound = new NormalViewControl(Application.GetMinRealAverage(124), Application.GetMinRealAverage(124), false);
- btnDeviceRound.Radius = (uint)Application.GetMinRealAverage(124) / 2;
- btnDeviceRound.X = Application.GetMinRealAverage(44);
- btnDeviceRound.Y = Application.GetMinRealAverage(101);
- btnDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionUnSelectedBackgroundColor;
- btnDeviceRound.SelectedBackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionBackgroundColor;
- this.AddChidren(btnDeviceRound, ChidrenBindMode.BindEventOnly);
+ this.fraDeviceRound = new FrameLayout();
+ fraDeviceRound.Width = HdlControlLogic.Current.GetPictrueRealSize(124);
+ fraDeviceRound.Height = HdlControlLogic.Current.GetPictrueRealSize(124);
+ fraDeviceRound.Radius = (uint)HdlControlLogic.Current.GetPictrueRealSize(124) / 2;
+ fraDeviceRound.X = HdlControlLogic.Current.GetPictrueRealSize(44);
+ fraDeviceRound.Y = HdlControlLogic.Current.GetPictrueRealSize(101);
+ fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionUnSelectedBackgroundColor;
+ this.AddChidren(fraDeviceRound, ChidrenBindMode.BindEventOnly);
//璁惧鍥炬爣鎺т欢
this.btnDeviceIcon = new IconViewControl(86);
- btnDeviceIcon.X = Application.GetMinRealAverage(63);
- btnDeviceIcon.Y = Application.GetMinRealAverage(121);
- this.AddChidren(btnDeviceIcon, ChidrenBindMode.BindEventOnly);
+ btnDeviceIcon.Gravity = Gravity.Center;
+ fraDeviceRound.AddChidren(btnDeviceIcon);
+ this.ChangedChidrenBindMode(fraDeviceRound, ChidrenBindMode.BindEventOnly);
//鐘舵�佹枃鏈帶浠�
- this.btnStatu = new NormalViewControl(Application.GetMinRealAverage(280), Application.GetMinRealAverage(63), false);
- btnStatu.X = Application.GetMinRealAverage(46);
- btnStatu.Y = Application.GetMinRealAverage(236);
+ this.btnStatu = new NormalViewControl(HdlControlLogic.Current.GetPictrueRealSize(280), HdlControlLogic.Current.GetPictrueRealSize(63), false);
+ btnStatu.X = HdlControlLogic.Current.GetPictrueRealSize(46);
+ btnStatu.Y = HdlControlLogic.Current.GetPictrueRealSize(236);
btnStatu.TextColor = UserCenterColor.Current.TextColor1;
btnStatu.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
btnStatu.IsBold = true;
@@ -141,12 +155,10 @@
//寮�鍏虫帶浠�(涓嶅姞鍏ョ埗鎺т欢涓�)
this.btnSwitch = new PicViewControl(109, 104);
- btnSwitch.X = Application.GetMinRealAverage(325);
- btnSwitch.Y = Application.GetMinRealAverage(202);
+ btnSwitch.X = HdlControlLogic.Current.GetPictrueRealSize(325);
+ btnSwitch.Y = HdlControlLogic.Current.GetPictrueRealSize(202);
btnSwitch.UnSelectedImagePath = "Item/Switch1.png";
btnSwitch.SelectedImagePath = "Item/SwitchSelected1.png";
- this.AddChidren(this.btnSwitch, ChidrenBindMode.NotBind);
- btnSwitch.Visible = false;
//鍒锋柊淇℃伅
this.RefreshControlInfo(i_device);
@@ -162,7 +174,7 @@
/// <returns></returns>
public PicViewControl AddSwitchControl()
{
- btnSwitch.Visible = true;
+ this.AddChidren(this.btnSwitch, ChidrenBindMode.NotBind);
return btnSwitch;
}
@@ -176,21 +188,33 @@
/// <param name="i_device">璁惧瀵硅薄,涓嶆槸鎺ㄩ�佺殑閭ｄ釜</param>
public void RefreshControlInfo(CommonDevice i_device)
{
- //璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(i_device);
+ bool collect = HdlRoomLogic.Current.IsCollectInRoom(i_device);
+ if (btnCollect.IsSelected != collect)
+ {
+ btnCollect.IsSelected = collect;
+ }
//璁惧鍥炬爣涔熷埛鏂�
- Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
+ Common.LocalDevice.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device);
//妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵��
bool isOpen = this.CheckIsOpenStatu(i_device);
- this.SetCardStatu(isOpen);
+ if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)
+ {
+ //濡傛灉杩欎釜鍗＄墖鏈夊紑鍏冲姛鑳�,骞朵笖缃戝叧杩樻病鏈夊洖澶嶄箣鍓�,榛樿鏄叧闂姸鎬�
+ //绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
+ isOpen = false;
+ }
+ this.SetCardOpenStatu(isOpen);
}
/// <summary>
/// 璁剧疆鍗＄墖鐘舵��
/// </summary>
/// <param name="isOpen"></param>
- public void SetCardStatu(bool isOpen)
+ public void SetCardOpenStatu(bool isOpen)
{
+ //璁惧鐘舵�佸繀椤诲埛鏂�
+ this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+
if (this.btnBackGroud.IsSelected == isOpen)
{
//鐘舵�佷竴鏍�,鍒欎笉闇�瑕佸鐞�
@@ -202,13 +226,37 @@
this.btnDeviceName.IsSelected = isOpen;
this.btnDeviceName.IsBold = isOpen;
//璁惧鐨勮儗鏅渾鍦堝浘
- this.btnDeviceRound.IsSelected = isOpen;
+ if (isOpen == true)
+ {
+ fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionBackgroundColor;
+ }
+ else
+ {
+ fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionUnSelectedBackgroundColor;
+ }
//璁惧鍥炬爣鎺т欢
this.btnDeviceIcon.IsSelected = isOpen;
//鐘舵�佹枃鏈帶浠�
this.btnStatu.IsSelected = isOpen;
//寮�鍏虫帶浠�
- this.btnSwitch.IsSelected = isOpen;
+ if (btnSwitch != null)
+ {
+ this.btnSwitch.IsSelected = isOpen;
+ }
+ }
+
+ /// <summary>
+ /// 璁剧疆鍗＄墖鐨勫湪绾跨姸鎬�
+ /// </summary>
+ /// <param name="isOnline">鍦ㄧ嚎</param>
+ public void SetCardOnlineStatu(bool isOnline)
+ {
+ if (this.isHadOpenSwitch == true)
+ {
+ //濡傛灉杩欎釜璁惧鏈夊紑鍏冲姛鑳�,鍒欏湪绾跨姸鎬佷笉浼氭敼鍙樼姸鎬�
+ return;
+ }
+ this.SetCardOpenStatu(isOnline);
}
/// <summary>
@@ -227,8 +275,7 @@
/// <summary>
/// 鍙戦�佽幏鍙栫姸鎬佸懡浠�
/// </summary>
- /// <param name="i_device"></param>
- public virtual void SendStatuComand(CommonDevice i_device)
+ public virtual void SendStatuComand()
{
return;
}
@@ -244,6 +291,8 @@
/// <returns></returns>
public virtual bool CheckIsOpenStatu(CommonDevice i_device)
{
+ //濡傛灉杩欎釜鍑芥暟琚噸鍐欑殑璇�,鍒欎唬琛ㄨ繖涓澶囨湁寮�鍏冲姛鑳�
+ this.isHadOpenSwitch = false;
//榛樿鐢ㄥ湪绾跨姸鎬佹潵鍒ゆ柇
return i_device.IsOnline == 1;
}
@@ -260,19 +309,24 @@
/// <param name="room">鎴块棿</param>
public void CardDetailInfoBackEvent(CommonDevice device, Common.Room room)
{
- //濡傛灉鏄富椤靛彇娑堟悳钘忕殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
- if (HdlRoomLogic.Current.CurrentRoom.IsLove
- && HdlRoomLogic.Current.IsCollectInRoom(device) == false)
+ if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
{
- this.CardNeedRemoveEvent?.Invoke();
- return;
+ //濡傛灉鏄富椤靛彇娑堟悳钘忕殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
+ if (HdlRoomLogic.Current.IsCollectInRoom(device) == false)
+ {
+ this.CardNeedRemoveEvent?.Invoke();
+ return;
+ }
}
- //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
- var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
- if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
+ else
{
- this.CardNeedRemoveEvent?.Invoke();
- return;
+ //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
+ var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
+ if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
+ {
+ this.CardNeedRemoveEvent?.Invoke();
+ return;
+ }
}
//濡傛灉瀹冭繕鍦ㄨ繖涓埧闂寸殑璇�,鍒锋柊鍗＄墖淇℃伅
this.RefreshControlInfo(device);
@@ -290,9 +344,12 @@
public void StartCheckResponeResult(bool oldOpenStatu)
{
this.ResponeResult = 0;
+ //寮�鍏虫寜閽笉鑳藉啀鐐瑰嚮
+ if (btnSwitch != null) { this.btnSwitch.CanClick = false; }
+
HdlThreadLogic.Current.RunThread(() =>
{
- int waitime = 30 * 100;
+ int waitime = 30;
while (waitime > 0)
{
System.Threading.Thread.Sleep(100);
@@ -301,6 +358,7 @@
//宸茬粡鑾峰彇寰楀埌鏁版嵁
break;
}
+ waitime--;
}
if (waitime <= 0)
{
@@ -310,9 +368,11 @@
var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.FAIL));
msgContr.Show();
//鍙樻洿鍥炲師鏉ョ殑鐘舵��
- this.SetCardStatu(oldOpenStatu);
+ this.SetCardOpenStatu(oldOpenStatu);
});
}
+ //寮�鍏虫寜閽笉鑳藉啀鐐瑰嚮
+ if (btnSwitch != null) { this.btnSwitch.CanClick = true; }
});
}
@@ -326,6 +386,29 @@
#endregion
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckCanSendStatuComand()
+ {
+ if (this.device.HadReadDeviceStatu == false)
+ {
+ //杩樻病鏈夎鍙栬繃鏁版嵁
+ return true;
+ }
+ if ((DateTime.Now - this.device.LastDateTime).TotalMinutes >= 10)
+ {
+ //10鍒嗛挓鍚庡彲浠ュ啀娆¤幏鍙�
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
+
#region 鈻� 鎺т欢鎽ф瘉___________________________
/// <summary>
--
Gitblit v1.8.0