From 88ce6b0697ccf6ce467545bb1125aefdf5b7130b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 11:29:04 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index bd43ae4..d48b821 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -18,14 +18,8 @@
/// <param name="common">Common.</param>
public void Changed(CommonDevice common)
{
- //if (common.Type != ZigBee.Device.DeviceType.OnOffSwitch)
- //{
- // return;
- //}
-
Shared.Application.RunOnMainThread(() =>
{
- //var dev = common as Panel;
});
}
@@ -271,6 +265,7 @@
/// <param name="key">Key.</param>
async void RefreshList()
{
+ #region BindEmptyPic UI
this.midFrameLayout.RemoveAll();
var entryStatusPic = new Button
@@ -307,6 +302,7 @@
};
this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
midVerticalScrolViewLayout.RemoveAll();
+ #endregion
if (currentKey.bindList.Count == 0)
{
@@ -377,8 +373,7 @@
rowLayout.AddRightView(btnDel);
#endregion
- #region 缁戝畾鏁版嵁澶勭悊
-
+ #region 缁戝畾鏁版嵁澶勭悊
bool isExistScene = false;
foreach (var sc in currentKey.bindList)
@@ -391,7 +386,7 @@
if (isExistScene)
{
- devicePic.UnSelectedImagePath = "Item/Scene.png";
+ devicePic.UnSelectedImagePath = "SceneIcon/4.png";
devicePic.Width = Application.GetMinRealAverage(110);
if (bindDevice.ESName == "")
--
Gitblit v1.8.0