From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 16:39:59 +0800
Subject: [PATCH] 2020-05-18-2
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
old mode 100755
new mode 100644
index dc114e1..445dd4e
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -642,7 +642,7 @@
CloseAllOpenForm();
//鏄剧ず鐧婚檰鐢婚潰
- var formLogin = new Login.AccountLogin();
+ var formLogin = new Login.AccountLoginForm();
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
formLogin.ShowForm(account);
});
@@ -683,7 +683,7 @@
CloseAllOpenForm();
//鏄剧ず鐧婚檰鐢婚潰
- var formLogin = new Login.AccountLogin();
+ var formLogin = new Login.AccountLoginForm();
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
formLogin.ShowForm(account);
});
@@ -832,6 +832,14 @@
/// <returns></returns>
public async static Task<bool> InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
{
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ if (Config.Instance.Home.IsVirtually == true)
+ {
+ //鍒濆鍖栬櫄鎷熶綇瀹呯殑涓汉涓績鐨勬暟鎹�(鍒囨崲浣忓畢浣跨敤)
+ InitUserCenterMenmoryByVirtualHome();
+ return true;
+ }
+
//APP缂撳瓨鍔犺浇寮�濮�
UserCenterResourse.AccountOption.AppCanSignout = false;
//杩樺師杩滅▼杩炴帴鏉冮檺鍙橀噺
@@ -928,6 +936,25 @@
}
/// <summary>
+ /// 鍒濆鍖栬櫄鎷熶綇瀹呯殑涓汉涓績鐨勬暟鎹�(鍒囨崲浣忓畢浣跨敤)
+ /// </summary>
+ private static void InitUserCenterMenmoryByVirtualHome()
+ {
+ //娓呯┖鎵�鏈夋垚鍛樼紦瀛�
+ ClearAllMemberMemory();
+ //棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
+ CreatAllUserCenterDirectory();
+ //鍏抽棴鎵�鏈夋帴鏀�
+ HdlGatewayReceiveLogic.Current.RemoveAllEvent();
+ //鍒濆鍖栨湰鍦扮殑缃戝叧淇℃伅
+ HdlGatewayLogic.Current.ReFreshByLocal();
+ //鍒濆鍖栨湰鍦扮殑璁惧淇℃伅
+ Common.LocalDevice.Current.ReFreshByLocal();
+ //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
+ HdlRoomLogic.Current.RefreshAllRoomByLocation();
+ }
+
+ /// <summary>
/// 娓呯┖鎵�鏈夋垚鍛樼紦瀛�
/// </summary>
private static void ClearAllMemberMemory()
@@ -947,7 +974,11 @@
//褰撳墠涓婚〉,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 1:鍦烘櫙 2:鍔熻兘
UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
//褰撳墠鍒嗙被,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘 2:鑷姩鍖�
- UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;
+ UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;
+ //鍒囨崲浣忓畢娓呴櫎涔嬪墠缂撳瓨鏁版嵁;
+ Common.Logic.LogicList.Clear();
+ Common.Logic.LockLogicList.Clear();
+ Common.Logic.SoneLogicList.Clear();
}
#endregion
@@ -1428,7 +1459,7 @@
#region 鈻� 鏂囦欢淇濆瓨鍜岃鍙朹____________________
/// <summary>
- /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// 鏂囦欢淇濆瓨,浠呴檺褰撳墠浣忓畢(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
/// </summary>
/// <param name="fullName">鍏ㄨ矾寰�</param>
/// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
@@ -1441,18 +1472,48 @@
}
/// <summary>
- /// 璇诲彇鏂囦欢(鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull,鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�(鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull,鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
/// </summary>
/// <param name="fullName">鍏ㄨ矾寰�</param>
/// <returns></returns>
public static string LoadFileContent(string fullName)
{
+ //璇诲彇鏂囦欢
+ var varByte = ReadFileContent(fullName);
+ if (varByte == null)
+ {
+ return null;
+ }
+ return Encoding.UTF8.GetString(varByte);
+ }
+
+ /// <summary>
+ /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�,鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <returns></returns>
+ public static byte[] ReadFileContent(string fullName)
+ {
if (System.IO.File.Exists(fullName) == false)
{
return null;
}
- var varByte = Shared.IO.FileUtils.ReadFile(fullName);
- return System.Text.Encoding.UTF8.GetString(varByte);
+ System.IO.FileStream fileStream = null;
+ try
+ {
+ fileStream = new System.IO.FileStream(fullName, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+ byte[] array = new byte[fileStream.Length];
+ fileStream.Read(array, 0, array.Length);
+ return array;
+ }
+ catch
+ {
+ return null;
+ }
+ finally
+ {
+ fileStream?.Close();
+ }
}
#endregion
--
Gitblit v1.8.0