From b68cdc7e103a00d5df73e4b75603be8da1815b4a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 13:59:52 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 129 ++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index bb2ab6f..e5d5c93 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -631,6 +631,23 @@
/// <param name="noticeDb">鏄惁閫氱煡浜戠</param>
public static void ReLoginAgain(string account = "", bool noticeDb = true)
{
+ if (Config.Instance.Home.IsVirtually == true)
+ {
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鏀惰捣宸﹁彍鍗�
+ CommonPage.Instance.CloseLeftMenu();
+ //鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
+ CloseAllOpenForm();
+
+ //鏄剧ず鐧婚檰鐢婚潰
+ var formLogin = new Login.AccountLoginForm();
+ Shared.Common.CommonPage.Instance.AddChidren(formLogin);
+ formLogin.ShowForm(account);
+ });
+ return;
+ }
UserCenterResourse.AccountOption.OldAccountId = string.Empty;
//鍏抽棴鎵�鏈夋帴鏀�
HdlGatewayReceiveLogic.Current.RemoveAllEvent();
@@ -666,9 +683,9 @@
CloseAllOpenForm();
//鏄剧ず鐧婚檰鐢婚潰
- var formLogin = new Login.AccountLogin();
+ var formLogin = new Login.AccountLoginForm();
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
- formLogin.Show(account);
+ formLogin.ShowForm(account);
});
if (noticeDb == true)
@@ -729,41 +746,6 @@
((CommonFormBase)view).CloseForm();
i--;
}
- }
- }
-
- #endregion
-
- #region 鈻� 瀛愭帶浠剁殑Y杞村潗鏍嘷___________________
-
- /// <summary>
- /// 鎸囧畾浣嶇疆绫诲瀷鑾峰彇Rowlayout鐨勫瓙鎺т欢鐨刌杞村潗鏍�(璇风‘淇濆瓙鎺т欢涓嶅ぇ浜庣埗瀹瑰櫒)
- /// </summary>
- /// <param name="fatherCtrHeight">鐖舵帶浠剁殑鐪熷疄楂樺害</param>
- /// <param name="ctrHeight">瀛愭帶浠剁殑鐪熷疄楂樺害</param>
- /// <param name="alignment">浣嶇疆瀵归綈鏂瑰紡</param>
- /// <param name="Space">涓婁笅闂寸殑绌虹櫧闂磋窛,鐪佺暐鏃讹紝鍙栬鎺т欢鍏遍�氬彉閲忕殑鍊笺�傝缃负-1鏃讹紝涓嶈绠楃┖鐧介棿璺�</param>
- /// <returns></returns>
- public static int GetControlChidrenYaxis(int fatherCtrHeight, int ctrHeight, UViewAlignment alignment, int Space = 0)
- {
- if (Space < 0)
- {
- //涓嶈绠楅棿璺濆��
- Space = 0;
- }
-
- if (alignment == UViewAlignment.Center)
- {
- return fatherCtrHeight / 2 - ctrHeight / 2;
- }
- else if (alignment == UViewAlignment.Top)
- {
- return (fatherCtrHeight / 2 - Space / 2) / 2 - ctrHeight / 2;
- }
- else
- {
- int top = fatherCtrHeight / 2 + Space / 2;
- return top + (fatherCtrHeight - top) / 2 - ctrHeight / 2;
}
}
@@ -850,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;
//杩樺師杩滅▼杩炴帴鏉冮檺鍙橀噺
@@ -918,14 +908,14 @@
//鍒濆鍖栨湰鍦扮殑璁惧淇℃伅
Common.LocalDevice.Current.ReFreshByLocal();
+ //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
+ HdlRoomLogic.Current.RefreshAllRoomByLocation();
+
if (hadNet == true)
{
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
HdlGatewayLogic.Current.SynchronizeDbGateway();
}
-
- //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
- HdlRoomLogic.Current.RefreshAllRoomByLocation();
//鍒锋柊APP鍓嶄竴娆￠�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�)
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
@@ -933,7 +923,7 @@
//0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
if (result == 0 && ShowPrompted == true)
{
- //寮�鍚嚜鍔ㄥ浠芥彁绀�
+ //寮�鍚嚜鍔ㄥ浠�
HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
}
//鏄剧ず寮曞鐣岄潰
@@ -943,6 +933,25 @@
UserCenterResourse.AccountOption.AppCanSignout = true;
return true;
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栬櫄鎷熶綇瀹呯殑涓汉涓績鐨勬暟鎹�(鍒囨崲浣忓畢浣跨敤)
+ /// </summary>
+ private static void InitUserCenterMenmoryByVirtualHome()
+ {
+ //娓呯┖鎵�鏈夋垚鍛樼紦瀛�
+ ClearAllMemberMemory();
+ //棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
+ CreatAllUserCenterDirectory();
+ //鍏抽棴鎵�鏈夋帴鏀�
+ HdlGatewayReceiveLogic.Current.RemoveAllEvent();
+ //鍒濆鍖栨湰鍦扮殑缃戝叧淇℃伅
+ HdlGatewayLogic.Current.ReFreshByLocal();
+ //鍒濆鍖栨湰鍦扮殑璁惧淇℃伅
+ Common.LocalDevice.Current.ReFreshByLocal();
+ //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
+ HdlRoomLogic.Current.RefreshAllRoomByLocation();
}
/// <summary>
@@ -1446,7 +1455,7 @@
#region 鈻� 鏂囦欢淇濆瓨鍜岃鍙朹____________________
/// <summary>
- /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// 鏂囦欢淇濆瓨,浠呴檺褰撳墠浣忓畢(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
/// </summary>
/// <param name="fullName">鍏ㄨ矾寰�</param>
/// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
@@ -1459,18 +1468,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