From adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 六月 2020 15:26:46 +0800
Subject: [PATCH] 2020.06.24.01
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index e966a0b..d3cc6fc 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -93,7 +93,7 @@
btnBackGroud.UnSelectedImagePath = "Item/FunctionCardView.png";
btnBackGroud.SelectedImagePath = "Item/FunctionCardViewSelected.png";
btnBackGroud.Gravity = Gravity.CenterHorizontal;
- this.AddChidren(btnBackGroud, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnBackGroud, ChidrenBindMode.BindEvent);
//璁惧鍚嶇О鎺т欢
this.btnDeviceName = new NormalViewControl(320, 63, true);
@@ -103,7 +103,7 @@
btnDeviceName.TextColor = UserCenterColor.Current.TextGrayColor1;
btnDeviceName.SelectedTextColor = UserCenterColor.Current.White;
btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
- this.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
//鏀堕泦鎺т欢
this.btnCollect = new IconViewControl(107);
@@ -142,13 +142,13 @@
fraDeviceRound.X = HdlControlLogic.Current.GetPictrueRealSize(44);
fraDeviceRound.Y = HdlControlLogic.Current.GetPictrueRealSize(101);
fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionUnSelectedBackgroundColor;
- this.AddChidren(fraDeviceRound, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(fraDeviceRound, ChidrenBindMode.BindEvent);
//璁惧鍥炬爣鎺т欢
this.btnDeviceIcon = new IconViewControl(86);
btnDeviceIcon.Gravity = Gravity.Center;
fraDeviceRound.AddChidren(btnDeviceIcon);
- this.ChangedChidrenBindMode(fraDeviceRound, ChidrenBindMode.BindEventOnly);
+ this.ChangedChidrenBindMode(fraDeviceRound, ChidrenBindMode.BindEvent);
//鐘舵�佹枃鏈帶浠�
this.btnStatu = new NormalViewControl(HdlControlLogic.Current.GetPictrueRealSize(300), HdlControlLogic.Current.GetPictrueRealSize(63), false);
@@ -157,7 +157,7 @@
btnStatu.TextColor = UserCenterColor.Current.TextColor1;
btnStatu.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
btnStatu.IsBold = true;
- this.AddChidren(btnStatu, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnStatu, ChidrenBindMode.BindEvent);
//寮�鍏虫帶浠�(涓嶅姞鍏ョ埗鎺т欢涓�)
this.btnSwitch = new PicViewControl(109, 104);
@@ -361,7 +361,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
- int waitime = 30;
+ int waitime = 40;
while (waitime > 0)
{
System.Threading.Thread.Sleep(100);
@@ -371,8 +371,15 @@
break;
}
waitime--;
+ //2绉掔殑鏃跺��,杩樻槸鎺ュ彈涓嶅埌鐨勮瘽,寮哄埗鍐嶆鍒锋柊璁惧鐘舵��
+ if (waitime == 20)
+ {
+ //浠庢柊鍙戦�佽幏鍙栬澶囩殑鐘舵��(寮哄埗)
+ this.device.HadReadDeviceStatu = false;
+ this.SendStatuComand();
+ }
}
- if (waitime <= 0)
+ if (waitime <= 0 && this.Parent != null)
{
//娌℃湁鑾峰彇寰楀埌缁撴灉
HdlThreadLogic.Current.RunMain(() =>
--
Gitblit v1.8.0