From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs |   44 +++++++++-----------------------------------
 1 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
index 2bde57d..be19a18 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
@@ -149,10 +149,14 @@
             UserView.HomePage.Instance.PageIndex += 1;
 
             //鍒濆鍖栫晫闈㈡鏋�
-            this.InitForm();
-
-            //鎵цShowForm()鏂规硶
-            this.LoadShowFormMethod(parameter);
+            this.InitForm();
+
+            //寮哄埗鏄剧ず鐣岄潰,鍒濆鍖栧畬妗嗘灦鍚�,灏辩洿鎺ユ樉绀虹晫闈�
+            HdlThreadLogic.Current.RunMainInThread(() =>
+            {
+                //鎵цShowForm()鏂规硶
+                this.LoadShowFormMethod(parameter);
+            });
         }
 
         #endregion
@@ -235,38 +239,8 @@
 
         #endregion
 
-        #region 鈻� 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁坃________
-
-        /// <summary>
-        /// 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁�
-        /// </summary>
-        /// <param name="frameTable">瀹瑰櫒</param>
-        /// <param name="i_Text">鏄剧ず鏂囧瓧</param>
-        /// <param name="Imagepath">鍥惧儚鍦板潃</param>
-        /// <param name="imageWith">鍥惧儚瀹藉害(闈炵湡瀹炲��)</param>
-        /// <param name="imageHeight">鍥惧儚楂樺害(闈炵湡瀹炲��)</param>
-        public void ShowNotDataImage(FrameLayout frameTable, string i_Text, string Imagepath = "Item/NoFunction.png", int imageWith = 683, int imageHeight = 392)
-        {
-            //杩樻病鏈夌粦瀹氱綉鍏冲摝
-            var btnPic = new PicViewControl(imageWith, imageHeight);
-            btnPic.UnSelectedImagePath = Imagepath;
-            btnPic.Y = (int)(frameTable.Height * 0.382) - Application.GetRealHeight(imageHeight / 2);
-            btnPic.Gravity = Gravity.CenterHorizontal;
-            frameTable.AddChidren(btnPic);
-
-            var btnView = new NormalViewControl(frameTable.Width, Application.GetRealHeight(50), false);
-            btnView.Y = btnPic.Bottom + Application.GetRealHeight(32);
-            btnView.Text = i_Text;
-            btnView.TextAlignment = TextAlignment.Center;
-            btnView.TextSize = 12;
-            btnView.TextColor = UserCenterColor.Current.TextGrayColor1;
-            frameTable.AddChidren(btnView);
-            return;
-        }
-        #endregion
-
         #region 鈻� 娓呯┖BodyFrame______________________
-
+
         /// <summary>
         /// 娓呯┖BodyFrame
         /// </summary>

--
Gitblit v1.8.0