From 1265d531759b5565e9f641b17045896b52dfdba8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 18:37:47 +0800
Subject: [PATCH] 2020-12-03 1.主页增加未读消息查询和提示处理。2.房间和场景背景上传和下载和读取方法修改处理。3.头像上传和下载方案修改处理。4.增加子账号头像下载。5.Loading 调用方法修复。6.封装ImageUtlis 图片上传和下载管理工具类 7.读取本地住宅增加判空处理。

---
 HDL_ON/DAL/Server/HttpServerRequest.cs |  127 ++++++++++++++++-------------------------
 1 files changed, 50 insertions(+), 77 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 41feb45..f156f7b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -292,32 +292,14 @@
                 //鏄惁闇�瑕佽幏鍙栧ご鍍�
                 if (bGetHeadImage)
                 {
-                    var headImageBytes = DownHeadImage();
+                    var imageKey = ImageUtlis.Current.GetHeadImageKey(info.memberId);
+                   
+                    var headImageBytes = ImageUtlis.Current.DownHeadImage(info.memberId);
+
                     if (headImageBytes != null && headImageBytes.Length > 0)
                     {
-                        UserInfo.Current.headImagePageBytes = headImageBytes;
-                        FileStream fs = null;
-                        try
-                        {
-                            UserInfo.Current.headImagePageBytes = headImageBytes;
-                            var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
-                            fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
-                            fs.Write(headImageBytes, 0, headImageBytes.Length);
-                            fs.Flush();
-                            UserInfo.Current.headImagePagePath = filePath;
-                        }
-                        catch (Exception ex)
-                        {
-                            MainPage.Log($"download headImage error : {ex.Message}");
-                        }
-                        finally
-                        {
-                            if (fs != null)
-                            {
-                                fs.Close();
-                            }
-                        }
-
+                        //UserInfo.Current.headImagePageBytes = headImageBytes;
+                        UserInfo.Current.headImagePagePath = imageKey;
                     }
                 }
 
@@ -377,13 +359,7 @@
 
         }
 
-        /// <summary>
-        /// 涓嬭浇鐢ㄦ埛澶村儚
-        /// </summary>
-        public byte[] DownHeadImage()
-        {
-            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Head_Down, null);
-        }
+       
 
         /// <summary>
         /// 鏇存柊鐢ㄦ埛鏄电О
@@ -399,17 +375,17 @@
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
         }
 
-        /// <summary>
-        /// 鏇存柊鐢ㄦ埛澶村儚
-        /// </summary>
-        /// <param name="vs"></param>
-        /// <returns></returns>
-        public string UpdataUserHeadImage(string fileName)
-        {
-            byte[] bytes = Shared.IO.FileUtils.ReadFile(fileName);
-            var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
-            return revertObj.Code;
-        }
+        ///// <summary>
+        ///// 鏇存柊鐢ㄦ埛澶村儚
+        ///// </summary>
+        ///// <param name="vs"></param>
+        ///// <returns></returns>
+        //public string UpdataUserHeadImage(string fileName)
+        //{
+        //    byte[] bytes = Shared.IO.FileUtils.ReadFile(fileName);
+        //    var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
+        //    return revertObj.Code;
+        //}
 
         /// <summary>
         /// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿
@@ -499,7 +475,21 @@
                     if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
                     {
                         DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+                        //鎭㈠澶囦唤
+                        HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
                     }
+                    else
+                    {
+                        var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.residenceData.CurReginID);
+                        if(curRegion == null)
+                        {
+                            DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+                            //鎭㈠澶囦唤
+                            HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
+                        }
+                    }
+
+
                     DB_ResidenceData.residenceData.SaveResidenceData();
                     UserInfo.Current.SaveUserInfo();
 
@@ -889,38 +879,19 @@
 
         }
 
-        /// <summary>
-        /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
-        /// </summary>
-        /// <returns></returns>
-        public ResponsePack GetResidenceMemberAccountInfo(string account)
-        {
-            Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("Account", account);
-            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
-        }
+        ///// <summary>
+        ///// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
+        ///// </summary>
+        ///// <returns></returns>
+        //public ResponsePack GetResidenceMemberAccountInfo(string account)
+        //{
+        //    Dictionary<string, object> d = new Dictionary<string, object>();
+        //    d.Add("Account", account);
+        //    string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+        //    return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
+        //}
 
-        /// <summary>
-        ///  涓嬭浇瀛愯处鍙风敤鎴峰ご鍍�
-        /// </summary>
-        /// <param name="subaccoun"></param>
-        /// <returns></returns>
-        public byte[] DownChildHeadImage(ResidenceMemberInfo subaccount)
-        {
-            var requestObj = new ChildBaseObj()
-            {
-                childAccountId = subaccount.childAccountId,
-                homeId = subaccount.homeId
-            };
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
-            var replaceToken = "";
-            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
-            {
-                replaceToken = DB_ResidenceData.residenceData.MasterToken;
-            }
-            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Child_DownloadHeadImage, requestJson,null);
-        }
+       
         
 
         #endregion
@@ -1018,19 +989,21 @@
         /// <summary>
         /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
         /// </summary>
-        /// <param name="queryType"></param>
+        /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
         /// <returns></returns>
         public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
         {
-            var pushType = "";
+            string pushType = null;
+
             if (queryType == 1)
             {
                 pushType = PushType.Default.ToString();
-            } else if (queryType == 1)
+            }
+            else if (queryType == 2)
             {
                 pushType = PushType.Alarm.ToString();
             }
-            else if (queryType == 2)
+            else if (queryType == 3)
             {
                 pushType = PushType.Prompt.ToString();
             }

--
Gitblit v1.8.0