From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
similarity index 97%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlExperienceAccountLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
index 24bcd69..f660dcb 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlExperienceAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -4,7 +4,7 @@
using Shared.Common;
using ZigBee.Device;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// App浣撻獙璐﹀彿鐨勯�昏緫
@@ -36,6 +36,13 @@
/// 鐢ㄦ潵閫掑鐢熸垚Mac鐢ㄧ殑
/// </summary>
private int DeviceNumber = 0;
+ /// <summary>
+ /// 鏄惁鏄父瀹綋楠�
+ /// </summary>
+ public bool IsExperience
+ {
+ get { return Config.Instance.Guid == "chushiGuid"; }
+ }
#endregion
@@ -71,11 +78,11 @@
/// </summary>
private void InitUserInfoData()
{
- HdlUserCenterResourse.UserInfo = new UserInformation();
- HdlUserCenterResourse.ResidenceOption.AuthorityNo = 1;//缁欎粬绠＄悊鍛樼О鍙�
- HdlUserCenterResourse.ResidenceOption.AuthorityText = Language.StringByID(R.MyInternationalizationString.Administrator);
+ UserCenterResourse.UserInfo = new UserInformation();
+ UserCenterResourse.UserInfo.AuthorityNo = 1;//缁欎粬绠＄悊鍛樼О鍙�
+ UserCenterResourse.UserInfo.AuthorityText = Language.StringByID(R.MyInternationalizationString.Administrator);
//铏氭嫙璐﹀彿
- HdlUserCenterResourse.UserInfo.NickName = Language.StringByID(R.MyInternationalizationString.uVirtualAccount);
+ UserCenterResourse.UserInfo.UserName = Language.StringByID(R.MyInternationalizationString.uVirtualAccount);
}
#endregion
@@ -258,7 +265,7 @@
private void InitDeviceData()
{
//鍏堝埛鏂板鍣�
- HdlDeviceCommonLogic.Current.ReFreshByLocal();
+ LocalDevice.Current.ReFreshByLocal();
//椤轰究涔熸暣涓�涓嬬綉鍏�(鏈夊彲鑳藉畠鏄粠瀹炰綋璐﹀彿杞负铏氭嫙鏃�,娌℃湁娓呯┖)
HdlGatewayLogic.Current.ReFreshByLocal();
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
@@ -333,7 +340,7 @@
var listBind = new List<Scene.DeviceListData>();
foreach (var mainKey in i_room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(mainKey);
+ var device = LocalDevice.Current.GetDevice(mainKey);
if (device == null) { continue; }
//鍙缁х數鍣ㄥ拰鐏�
if (device.Type == DeviceType.OnOffOutput
@@ -962,7 +969,7 @@
device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 258 });
}
//娣诲姞铏氭嫙璁惧
- HdlDeviceCommonLogic.Current.AddVirtualDeviceToMemory(device);
+ LocalDevice.Current.AddVirtualDeviceToMemory(device);
var room = HdlRoomLogic.Current.GetRoomById(roomId);
if (room != null)
--
Gitblit v1.8.0