From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs |  166 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 130 insertions(+), 36 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 1097fdd..f513304 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -29,6 +29,13 @@
         /// </param>
         public static async Task<bool> GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
         {
+            //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+            if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+            {
+                //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+                await ReInitUserAccoutInfo();
+                return false;
+            }
             //鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
             var connectMode = GetHttpConnectMode(checkAuthority);
             //鑾峰彇浠庢帴鍙i偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -63,6 +70,14 @@
         /// </param>
         public static async Task<string> GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
         {
+            //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+            if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+            {
+                //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+                await ReInitUserAccoutInfo();
+                return "Error";
+            }
+
             //鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
             var connectMode = GetHttpConnectMode(checkAuthority);
             //鑾峰彇浠庢帴鍙i偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -96,6 +111,13 @@
         /// </param>
         public static async Task<string> GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
         {
+            //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+            if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+            {
+                //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+                await ReInitUserAccoutInfo();
+                return null;
+            }
             //鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
             var connectMode = GetHttpConnectMode(checkAuthority);
             //鑾峰彇浠庢帴鍙i偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -139,6 +161,13 @@
         /// </param>
         public static async Task<byte[]> GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
         {
+            //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+            if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+            {
+                //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+                await ReInitUserAccoutInfo();
+                return null;
+            }
             //鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
             var connectMode = GetHttpConnectMode(checkAuthority);
             //鑾峰彇浠庢帴鍙i偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -406,11 +435,13 @@
                             {
                                 try
                                 {
-                                    var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID];
-                                    if (Myform is EditorCommonForm)
+                                    EditorCommonForm Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID] as EditorCommonForm;
+                                    if (Myform != null)
                                     {
+                                        //閲嶇疆宸︽粦浣胯兘
+                                        Myform.ScrollEnabled = Myform.ScrollEnabled;
                                         //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
-                                        int value = ((EditorCommonForm)Myform).FormActionAgainEvent();
+                                        int value = Myform.FormActionAgainEvent();
                                         if (value == 1)
                                         {
                                             //Log鍑哄姏
@@ -441,11 +472,13 @@
                                 {
                                     try
                                     {
-                                        var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID];
-                                        if (Myform is EditorCommonForm)
+                                        EditorCommonForm Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID] as EditorCommonForm;
+                                        if (Myform != null)
                                         {
+                                            //閲嶇疆宸︽粦浣胯兘
+                                            Myform.ScrollEnabled = Myform.ScrollEnabled;
                                             //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
-                                            int value = ((EditorCommonForm)Myform).FormActionAgainEvent();
+                                            int value = Myform.FormActionAgainEvent();
                                             if (value == 1)
                                             {
                                                 //Log鍑哄姏
@@ -825,6 +858,16 @@
 
                 //娑堟伅璁板綍閲嶆柊璇诲彇鍙婃娴�
                 ControlCommonResourse.ReadMessageAgain = true;
+                ControlCommonResourse.HadNewMessage = false;
+                HdlThreadLogic.Current.RunMain(() =>
+                {
+                    for (int i = 0; i < ControlCommonResourse.listMessageManaContr.Count; i++)
+                    {
+                        //鏄剧ず瑙掓爣鐗规晥
+                        ControlCommonResourse.listMessageManaContr[i].IsSelected = false;
+                    }
+                });
+
                 //鍔犺浇璐﹀彿閰嶇疆淇℃伅
                 var optionInfo = UserCenterResourse.Option.Load();
                 UserCenterResourse.Option = optionInfo;
@@ -908,22 +951,32 @@
         /// <returns></returns>
         private async static Task<bool> InitUserAccoutInfo()
         {
+            //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
+            UserCenterResourse.UserInfo.InitUserInfoSuccess = false;
             //鑾峰彇鏈湴璁板綍鐨勭敤鎴蜂俊鎭�
             UserCenterResourse.UserInfo = GetUserInformationFromLocation();
             UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, "Admin.png");
+            //鍏堟牴鎹湰鍦扮紦瀛樿缃垵濮嬪��
+            Config.Instance.isAdministrator = UserCenterResourse.UserInfo.AuthorityNo != 1;
 
             //鑾峰彇鐧诲綍璐﹀彿鐨勪俊鎭�
             var pra = new AccountInfoPra();
-            var listNotShow = new List<string>() { "NotSetAgain" };
-            string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetAccountInfo", false, pra, listNotShow);
-            if (string.IsNullOrEmpty(result) == true)
+            //搴忓垪鍖栧璞�
+            var requestJson = JsonConvert.SerializeObject(pra);
+            //璁块棶鎺ュ彛
+            byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/GetAccountInfo", Encoding.UTF8.GetBytes(requestJson));
+            if (byteData == null)
             {
-                //鏂綉鐨勮瘽锛岃骞插槢灏卞共鍢涘惂,鎬讳箣涓嶈兘鎺т富浜虹殑涓滆タ
-                Config.Instance.isAdministrator = false;
+                return false;
+            }
+            //妫�娴嬮敊璇�
+            var revertObj = JsonConvert.DeserializeObject<ResponsePack>(Encoding.UTF8.GetString(byteData));
+            if (revertObj.StateCode.ToUpper() != "SUCCESS")
+            {
                 return false;
             }
 
-            var userInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInformation>(result);
+            var userInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInformation>(revertObj.ResponseData.ToString());
             userInfo.Account = Common.Config.Instance.Account;
             if (string.IsNullOrEmpty(userInfo.UserName) == true)
             {
@@ -956,22 +1009,23 @@
                 string dirPath = CombinePath();
                 if (System.IO.Directory.Exists(dirPath) == true)
                 {
-                    //鍏堣褰曡捣浣忓畢鐨勪竴浜涗俊鎭�
-                    var house = House.GetHouseByHouseId(Config.Instance.HomeId);
-                    //鍒犻櫎鏁翠釜鏂囦欢澶�
-                    System.IO.Directory.Delete(dirPath, true);
+                    try
+                    {
+                        //鍚屾鏁版嵁鐨勫垽鏂枃浠�(浠ラ槻涓囦竴鍒犻櫎鏁翠釜鏂囦欢澶瑰け璐ョ殑鏃跺��,杩欎釜鏂囦欢琚垹鐨勮瘽,搴旇娌′粈涔堝ぇ闂)
+                        string SynchronizeFile = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoDownLoadBackupCheckFile);
+                        //濡傛灉鏈湴宸茬粡鎷ユ湁浜嗚繖涓枃浠讹紝鍒欒鏄庝笉鏄柊鎵嬫満锛屼笉鍐嶈嚜鍔ㄨ繕鍘�
+                        if (System.IO.File.Exists(SynchronizeFile) == true)
+                        {
+                            System.IO.File.Delete(SynchronizeFile);
+                        }
+                        //鍒犻櫎鏁翠釜鏂囦欢澶�
+                        System.IO.Directory.Delete(dirPath, true);
+                    }
+                    catch { }
                     //鍒涘缓浣忓畢鏂囦欢澶�
                     Global.CreateHomeDirectory(Config.Instance.HomeId);
                     //棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
                     CreatAllUserCenterDirectory();
-
-                    var newHouse = new House();
-                    newHouse.Id = house.Id;
-                    newHouse.Name = house.Name;
-                    newHouse.IsOthreShare = house.IsOthreShare;
-                    newHouse.AccountType = house.AccountType;
-                    newHouse.MainUserDistributedMark = house.MainUserDistributedMark;
-                    newHouse.Save(false);
                 }
             }
             if (string.IsNullOrEmpty(userInfo.UserName) == true)
@@ -996,9 +1050,11 @@
             UserCenterResourse.UserInfo.StringPwd = null;
 
             //鍒濆鍖栫鐞嗗憳鎺у埗涓讳汉鐨勮繛鎺ュ湴鍧�(鍥犱负杩欎釜杩炴帴Token鏄笉浼氭敼鍙樼殑,鎵�浠ュ彧闇�瑕佸垵濮嬪寲涓�娆�)
-            await InitAdminConnectMainInfo();
+            bool flage = await InitAdminConnectMainInfo();
+            //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
+            UserCenterResourse.UserInfo.InitUserInfoSuccess = flage;
 
-            return true;
+            return flage;
         }
 
         /// <summary>
@@ -1015,6 +1071,26 @@
             }
             var info = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInformation>(value);
             return info;
+        }
+
+        /// <summary>
+        /// 閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅(鏃ㄥ湪瀵瑰簲閭d竴鐬棿,缃戠粶涓嶅ソ,瀵艰嚧璇垽鐨勬儏鍐�)
+        /// </summary>
+        /// <returns></returns>
+        private async static Task<bool> ReInitUserAccoutInfo()
+        {
+            //閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
+            var result = await InitUserAccoutInfo();
+            if (result == false)
+            {
+                return result;
+            }
+            //鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
+            HdlGatewayLogic.Current.SynchronizeDbGateway();
+            //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
+            UserCenterResourse.UserInfo.InitUserInfoSuccess = true;
+
+            return true;
         }
 
         /// <summary>
@@ -1048,13 +1124,8 @@
         /// 鍒濆鍖栫鐞嗗憳鏉冮檺杩滅▼杩炴帴涓讳汉鐨勪俊鎭�
         /// </summary>
         /// <returns></returns>
-        public static async Task<bool> InitAdminConnectMainInfo()
+        private static async Task<bool> InitAdminConnectMainInfo()
         {
-            //鍏堟竻绌�
-            Config.Instance.isAdministrator = false;
-            Config.Instance.AdminRequestBaseUrl = string.Empty;
-            Config.Instance.AdminRequestToken = string.Empty;
-
             if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)
             {
                 //鏃朵唬鍙樹簡,杩欓噷绠$悊鍛樺拰鎴愬憳閮借兘璋冪敤
@@ -1068,16 +1139,24 @@
                 SharedHid = Config.Instance.Home.Id
             };
 
-            var listNotShow = new List<string>() { "NotSetAgain" };
-            var result = await GetResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra, listNotShow);
-            if (string.IsNullOrEmpty(result) == true)
+            //搴忓垪鍖栧璞�
+            var requestJson = JsonConvert.SerializeObject(pra);
+            //璁块棶鎺ュ彛
+            byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("App/GetSharedHomeApiControl", Encoding.UTF8.GetBytes(requestJson));
+            if (byteData == null)
+            {
+                return false;
+            }
+            //妫�娴嬮敊璇�
+            var revertObj = JsonConvert.DeserializeObject<ResponsePack>(Encoding.UTF8.GetString(byteData));
+            if (revertObj.StateCode.ToUpper() != "SUCCESS")
             {
                 return false;
             }
 
             Config.Instance.isAdministrator = true;
             //鍒嗕韩閾炬帴
-            var info = JsonConvert.DeserializeObject<MemberAdministratorResult>(result);
+            var info = JsonConvert.DeserializeObject<MemberAdministratorResult>(revertObj.ResponseData.ToString());
             Config.Instance.AdminRequestBaseUrl = info.RequestBaseUrl;
             Config.Instance.AdminRequestToken = info.RequestToken;
 
@@ -1325,6 +1404,21 @@
         }
         #endregion
 
+        #region 鈻� 鏃堕棿杞崲___________________________
+
+        /// <summary>
+        /// 灏唘tc鏃堕棿绫诲瀷鐨勫瓧绗︿覆,杞崲涓烘湰鍦版椂闂�
+        /// </summary>
+        /// <param name="timeText"></param>
+        /// <returns></returns>
+        public static DateTime ConvertUtcTimeToLocalTime(string timeText)
+        {
+            var utcTime = Convert.ToDateTime(timeText);
+            return TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
+        }
+
+        #endregion
+
         #region 鈻� 鏂囦欢淇濆瓨鍜岃鍙朹____________________
 
         /// <summary>

--
Gitblit v1.8.0