From 48a05801a79fc07a1eb637d2606fcd1c08f86878 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 17:45:42 +0800
Subject: [PATCH] 2020-12-15 1.更新刷新用户信息方法

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs |  131 +++++++++++++++++++++++++++----------------
 .vs/HDL_APP_Project/xs/UserPrefs.xml                  |   24 ++-----
 2 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 48fd50b..1ac5a89 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,33 +1,25 @@
 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
   <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
-  <MonoDevelop.Ide.Workbench>
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs">
+    <Files>
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs" Line="599" Column="81" />
+      <File FileName="HDL_ON/Common/ImageUtlis.cs" Line="392" Column="39" />
+    </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="HDL_APP_Project" expanded="True">
             <Node name="HDL_ON" expanded="True">
-              <Node name="DAL" expanded="True">
-                <Node name="DriverLayer" expanded="True" />
-                <Node name="Server" expanded="True" />
-              </Node>
-              <Node name="Entity" expanded="True" />
+              <Node name="Common" expanded="True" />
               <Node name="UI" expanded="True">
-                <Node name="UI1-Login" expanded="True" />
                 <Node name="UI2" expanded="True">
-                  <Node name="2-Classification" expanded="True" />
-                  <Node name="3-Intelligence" expanded="True">
-                    <Node name="Automation" expanded="True" />
-                  </Node>
                   <Node name="4-PersonalCenter" expanded="True">
-                    <Node name="PersonalDataPage.cs" selected="True" />
-                  </Node>
-                  <Node name="FuntionControlView" expanded="True">
-                    <Node name="Curtain" expanded="True" />
-                    <Node name="Panel" expanded="True" />
+                    <Node name="PersonalDataPageBLL.cs" selected="True" />
                   </Node>
                 </Node>
               </Node>
             </Node>
+            <Node name="HDL-ON_Android" expanded="True" />
             <Node name="HDL-ON_iOS" expanded="True">
               <Node name="Other" expanded="True" />
               <Node name="Resources" expanded="True" />
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 4e3ac72..6e178c4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -21,7 +21,8 @@
             LoadEvent_ChangeBindPhone();
             LoadEvent_SkipModifyPassword();
             LoadEvent_MyQRcode();
-            GetUserInfo();
+            //GetUserInfo();
+            RefreshUserInfo();
         }
 
         /// <summary>
@@ -566,63 +567,95 @@
         }
 
 
-        ///// <summary>
-        ///// 鑾峰彇鐢ㄦ埛淇℃伅
-        ///// </summary>
-        ///// <returns></returns>
-        //public void GetUserInfoNew()
-        //{
+        /// <summary>
+        /// 2020-12-15 澧炲姞鍒锋柊鐢ㄦ埛淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        public void RefreshUserInfo()
+        {
+            var waitPage = new Loading();
+            bodyView.AddChidren(waitPage);
+            waitPage.Start(Language.StringByID(StringId.PleaseWait));
 
-        //    new System.Threading.Thread(() =>
-        //    {
-        //        try
-        //        {
-        //            var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
-        //            var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
-        //            if (resultObj.Code == StateCode.SUCCESS)
-        //            {
-        //                var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
-        //                UserInfo.Current.userEmailInfo = info.memberEmail;
-        //                UserInfo.Current.userMobileInfo = info.memberPhone;
-        //                UserInfo.Current.userName = info.memberName;
+            new Thread(() =>
+            {
+                try
+                {
+                    var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
+                    var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
+                    if (resultObj.Code == StateCode.SUCCESS)
+                    {
+                        var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
 
-        //                if (!string.IsNullOrEmpty(info.memberPhonePrefix))
-        //                {
-        //                    UserInfo.Current.areaCode = info.memberPhonePrefix;
-        //                }
+                        if (!string.IsNullOrEmpty(info.memberPhonePrefix))
+                        {
+                            UserInfo.Current.areaCode = info.memberPhonePrefix;
+                        }
 
-        //                //2020-12-15 淇敼澶村儚鏂规
-        //                if (!string.IsNullOrEmpty(info.memberHeadIcon))
-        //                {
-        //                    var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
+                        var headImagePagePath = "";
+                        //2020-12-15 淇敼澶村儚鏂规
+                        if (!string.IsNullOrEmpty(info.memberHeadIcon))
+                        {
+                            var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
 
-        //                    if (headImageBytes != null && headImageBytes.Length > 0)
-        //                    {
-        //                        UserInfo.Current.headImagePagePath = info.memberHeadIcon;
-        //                    }
-        //                }
+                            if (headImageBytes != null && headImageBytes.Length > 0)
+                            {
+                                headImagePagePath = info.memberHeadIcon;
+                            }
+                        }
 
-        //                Application.RunOnMainThread(() =>
-        //                {
-        //                    btnUserName.Text = str;
-        //                    updataUserName();
-        //                });
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (UserInfo.Current.userEmailInfo != info.memberEmail)
+                            {
+                                //鏇存柊閭
+                                UserInfo.Current.userEmailInfo = info.memberEmail;
+                                btnUserEmailInfo.Text = GetBindAccountText(UserInfo.Current.userEmailInfo);
+                            }
 
-        //                UserInfo.Current.SaveUserInfo();
-        //                MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
+                            if (UserInfo.Current.userMobileInfo != info.memberPhone)
+                            {
+                                //鏇存柊鎵嬫満鍙�
+                                UserInfo.Current.userMobileInfo = info.memberPhone;
+                                btnUserPhoneInfo.Text = GetBindAccountText(UserInfo.Current.userMobileInfo);
+                            }
 
-        //                //userHeadImageView
-        //            }
-        //        }
-        //        catch { }
-        //        finally
-        //        {
+                            if (UserInfo.Current.userName != info.memberName)
+                            {
+                                //鏇存柊鐢ㄦ埛鍚嶅瓧
+                                UserInfo.Current.userName = info.memberName;
+                                btnUserName.Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName;
+                                updataUserName();
+                            }
 
+                            if (!string.IsNullOrEmpty(headImagePagePath) && UserInfo.Current.headImagePagePath != headImagePagePath)
+                            {
+                                //鏇存柊澶村儚
+                                UserInfo.Current.headImagePagePath = headImagePagePath;
+                                userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath;
+                                updataHeadImage();
+                            }
 
-        //        }
+                            UserInfo.Current.SaveUserInfo();
+                            Utlis.WriteLine("鍒锋柊鐢ㄦ埛淇℃伅鎴愬姛銆�");
+                        });
+                    }
+                }
+                catch { }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
+                }
 
-        //    })
-        //    { IsBackground = true }.Start();
-        //}
+            })
+            { IsBackground = true }.Start();
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0