From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01

---
 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index a4e7f3b..f013a0f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -43,22 +43,26 @@
             //娓呯┖bodyFrame
             this.ClearBodyFrame();
 
-            string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberResult.DistributedMark + ".png");
-            //鍐欏叆澶村儚鍐呭
-            Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
-
             //澶村儚
             var btnUserIcon = new ImageView();
-            btnUserIcon.Height = Application.GetMinRealAverage(207);
-            btnUserIcon.Width = Application.GetMinRealAverage(207);
-            btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
-            btnUserIcon.ImagePath = iconPath;
+            btnUserIcon.Height = this.GetPictrueRealSize(207);
+            btnUserIcon.Width = this.GetPictrueRealSize(207);
+            btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;
+            if (memberResult.HeadImage != null)
+            {
+                btnUserIcon.ImageBytes = memberResult.HeadImage;
+            }
+            else
+            {
+                btnUserIcon.ImagePath = "Center/Admin.png";
+            }
             btnUserIcon.Y = Application.GetRealHeight(219);
             btnUserIcon.Gravity = Gravity.CenterHorizontal;
             bodyFrameLayout.AddChidren(btnUserIcon);
 
             //鎴愬憳ID
             var btnUserId = new NormalViewControl(800, 50, true);
+            btnUserId.IsBold = true;
             btnUserId.Y = Application.GetRealHeight(472);
             btnUserId.Gravity = Gravity.CenterHorizontal;
             btnUserId.Text = memberResult.Account;
@@ -68,6 +72,7 @@
 
             //鏄电О
             var btnName = new NormalViewControl(800, 55, true);
+            btnName.IsBold = true;
             btnName.Y = Application.GetRealHeight(541);
             btnName.Gravity = Gravity.CenterHorizontal;
             btnName.TextAlignment = TextAlignment.Center;
@@ -83,6 +88,7 @@
                 strMsg = string.Format(strMsg, "\r\n");
             }
             var btnmsg = new NormalViewControl(800, 100, true);
+            btnmsg.IsBold = true;
             btnmsg.Y = Application.GetRealHeight(913);
             btnmsg.TextSize = 12;
             btnmsg.Text = strMsg;
@@ -136,7 +142,7 @@
             if (resultValue == null)
             {
                 //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
-                string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
+                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
                 this.ShowMassage(ShowMsgType.Tip, msg);
                 return;
             }
@@ -153,7 +159,7 @@
             if (memberInfoRes == null)
             {
                 //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
-                string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
+                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
                 this.ShowMassage(ShowMsgType.Tip, msg);
                 return;
             }
@@ -161,14 +167,23 @@
             UserCenterResourse.ListMemberInfo.Add(memberInfoRes);
             UserCenterLogic.SaveLocalMemberListInfo();
 
+            string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
+            if (memberResult.HeadImage != null)
+            {
+                //鍐欏叆澶村儚鍐呭
+                Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
+            }
+
             //鎴愬憳娣诲姞鎴愬姛
             var form = new AddMemberSuccessForm();
-            form.AddForm(memberInfoRes);
+            form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
             form.FormCloseEvent += (() =>
             {
                 this.CloseForm();
                 //鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
                 this.CloseFormByFormName("AddMemberByIdForm");
+                //娣诲姞鎴愬憳
+                this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
             });
         }
 

--
Gitblit v1.8.0