From 2a3f24ee7a01ab00b1a3c98062c5450ec75e7764 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 09:37:11 +0800
Subject: [PATCH] 2020-12-21 1.修复个人中心跳转二维码页面，弹出欢迎回家问题。
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
old mode 100644
new mode 100755
index caa5f26..8c2b3dc
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -98,9 +98,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = socketFunction.collection
+ IsSelected = socketFunction.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
btnSwitchIcon = new Button()
{
@@ -108,7 +113,7 @@
Y = Application.GetRealHeight(100),
Width = Application.GetRealWidth(198),
Height = Application.GetRealWidth(198),
- IsSelected = socketFunction.on_off == "on",
+ IsSelected = socketFunction.trait_on_off.curValue.ToString() == "on",
UnSelectedImagePath = "FunctionIcon/Socket/SocketIconBg.png",
SelectedImagePath = "FunctionIcon/Socket/SocketIconOnBg.png",
};
@@ -122,15 +127,18 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = socketFunction.on_off == "on"
+ IsSelected = socketFunction.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
-
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView(socketFunction, actionRefresh);
-
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Socket)).LoadTopView_FunctionTop(socketFunction, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(socketFunction);
+ })
+ { IsBackground = true }.Start();
}
}
--
Gitblit v1.8.0