From bba578c2f0acf2eca747edcb69426771e0cadd32 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 18:20:50 +0800
Subject: [PATCH] 2020-03-23-3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 51 ++++++++++++++++-----------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index b6a7c54..eaf2ba3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -11,19 +11,8 @@
/// <summary>
/// 鎸夐敭绠＄悊
/// </summary>
- public class BindTargetsPage : BindCommonLayout, ZigBee.Common.IStatus
+ public class BindTargetsPage : BindCommonLayout
{
- /// <summary>
- /// 鎸夐敭妯″紡鎺ユ敹
- /// </summary>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
- Shared.Application.RunOnMainThread(() =>
- {
- });
- }
-
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
@@ -66,7 +55,7 @@
/// </summary>
private System.Collections.Generic.List<CommonDevice> localDeviceList = new System.Collections.Generic.List<CommonDevice>();
/// <summary>
- /// 鏈湴鍦烘櫙鍒楄〃
+ /// 鏈湴鍦烘櫙鍒楄〃
/// </summary>
private System.Collections.Generic.List<SceneUI> scList = new System.Collections.Generic.List<SceneUI> { };
/// <summary>
@@ -107,11 +96,15 @@
//鑾峰彇鏈湴鍦烘櫙鍒楄〃
scList = HdlSceneLogic.Current.GetAllRoomSceneList();
//鑾峰彇缃戝叧鍦烘櫙琛�
- var gwSceneObj = await currentKey.GetSceneInfoAsync();
- if (gwSceneObj != null && gwSceneObj.getSceneInfo != null)
+ if (gwScenesList.Count == 0)
{
- gwScenesList = gwSceneObj.getSceneInfo.ScenesList;
+ var gwSceneObj = await currentKey.GetSceneInfoAsync();
+ if (gwSceneObj != null && gwSceneObj.getSceneInfo != null)
+ {
+ gwScenesList = gwSceneObj.getSceneInfo.ScenesList;
+ }
}
+
//鍔ㄦ�佽幏鍙栨寜閿敮鎸佺殑澶х被
typeModeList = await GetTypeMode();
#region 璇诲彇闈㈡澘褰撳墠妯″紡
@@ -187,6 +180,7 @@
Application.RunOnMainThread(() =>
{
CommonPage.Loading.Hide();
+ midVerticalRefreshLayout.EndHeaderRefreshing();
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
return;
});
@@ -212,11 +206,12 @@
}
currentKey.ReSave();
}
- #endregion
+ #endregion
Application.RunOnMainThread(() =>
{
RefreshList();
CommonPage.Loading.Hide();
+ midVerticalRefreshLayout.EndHeaderRefreshing();
});
}
else
@@ -224,6 +219,7 @@
Application.RunOnMainThread(() =>
{
CommonPage.Loading.Hide();
+ midVerticalRefreshLayout.EndHeaderRefreshing();
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
@@ -370,7 +366,6 @@
midVerticalRefreshLayout.BeginHeaderRefreshing();
IsRead = true;
InitListInfo();
- midVerticalRefreshLayout.EndHeaderRefreshing();
};
BlankPicUI();
@@ -408,13 +403,13 @@
}
/// <summary>
/// 鎸夐敭缁戝畾琛ㄦ樉绀�
- /// </summary>
+ /// </summary>
async void RefreshList()
{
midVerticalRefreshLayout.RemoveAll();
this.midFrameLayout.RemoveAll();
middleFrameLayout();
- #region 鏁版嵁澶勭悊
+ #region 鏁版嵁澶勭悊
if (currentKey.bindList.Count == 0)
{
entryStatusPic.Height = Application.GetRealHeight(556);
@@ -453,6 +448,7 @@
midVerticalRefreshLayout.AddChidrenRow(rowLayout);
rowLayout.frameTable.UseClickStatu = false;
var devicePic = rowLayout.frameTable.AddLeftIcon();
+ devicePic.Y = Application.GetRealHeight(49);
devicePic.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
#region 缁戝畾鏁版嵁澶勭悊
@@ -524,7 +520,6 @@
}
devicePic.UnSelectedImagePath = tempDev.IconPath;
- devicePic.Width = Application.GetRealWidth(110);
devicePic.Text = "";
if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
@@ -539,7 +534,6 @@
else
{
btnBindNameText = bindDevice.BindMacAddr + "_" + bindDevice.BindEpoint;
- devicePic.Width = Application.GetMinRealAverage(200);
devicePic.TextAlignment = TextAlignment.CenterLeft;
devicePic.TextColor = UserCenterColor.Current.Gray;
devicePic.Text = Language.StringByID(R.MyInternationalizationString.uOffLine);
@@ -1284,18 +1278,5 @@
scList.Clear();
base.RemoveFromParent();
}
-
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
-
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
-
- public void ChangedISceneStatus(Scene scene)
- {
- }
}
}
-
--
Gitblit v1.8.0