From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release

---
 ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index f3f32b9..9629a44 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -21,15 +21,15 @@
         /// <summary>
         /// TopMenuFrameLayout
         /// </summary>
-        public FrameLayout topMenuFrameLayout = null;
+        public NormalFrameLayout topMenuFrameLayout = null;
         /// <summary>
         /// TopFrameLayout
         /// </summary>
-        public FrameLayout topFrameLayout = null;
+        public NormalFrameLayout topFrameLayout = null;
         /// <summary>
         /// bodyFrameLayout
         /// </summary>
-        public FrameLayout bodyFrameLayout = null;
+        public NormalFrameLayout bodyFrameLayout = null;
         /// <summary>
         /// 宸︽粦浣胯兘
         /// </summary>
@@ -102,14 +102,14 @@
             }
 
             //TopMenuFrameLayout鍋氭垚
-            topMenuFrameLayout = new FrameLayout();
+            topMenuFrameLayout = new NormalFrameLayout();
             topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
             topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
             topMenuFrameLayout.Name = "topMenuFrameLayout";
             this.AddChidren(topMenuFrameLayout);
 
             //TopFrameLayout鍋氭垚
-            topFrameLayout = new FrameLayout();
+            topFrameLayout = new NormalFrameLayout();
             topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
             topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
             topFrameLayout.Y = topMenuFrameLayout.Bottom;
@@ -169,7 +169,7 @@
             {
                 bodyFrameLayout.RemoveAll();
             }
-            bodyFrameLayout = new FrameLayout();
+            bodyFrameLayout = new NormalFrameLayout();
             bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
             bodyFrameLayout.Y = topFrameLayout.Bottom;
             bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
@@ -272,7 +272,7 @@
         /// </summary>
         public override void ShowReLoadView()
         {
-            Application.RunOnMainThread(() =>
+            HdlThreadLogic.Current.RunMain(() =>
             {
                 if (bodyFrameLayout == null || bodyFrameLayout.Parent == null)
                 {
@@ -292,6 +292,9 @@
                 frame.AddChidren(btnReLoad);
                 btnReLoad.ButtonClickEvent += (sender, e) =>
                 {
+                    //鐐瑰嚮閲嶆柊鍔犺浇鏃�,鍏佽鍐嶆鑱旂綉
+                    HdlWifiLogic.Current.CanAccessHttp = true;
+
                     //娓呴櫎鍏ㄩ儴鎺т欢
                     this.ClearBodyFrame();
 
@@ -327,6 +330,44 @@
 
         #endregion
 
+        #region 鈻� 鏄剧ず寮圭獥杈撳叆鐣岄潰___________________
+
+        /// <summary>
+        /// <para>鏄剧ず涓�涓狣ialog鐨勫脊绐楄緭鍏ョ晫闈�,瀹冧笉浼氳嚜鍔ㄥ叧闂�,闇�瑕佹墜鍔ㄥ叧闂�</para>
+        /// <para>.CloseDialog()涓哄叧闂脊绐�</para>
+        /// <para>濡傛灉杈撳叆妗嗙殑鍐呭涓虹┖,骞朵笖璁剧疆鏈夈�恑_TipText銆�,鍒欎笉浼氳皟鐢ㄥ洖璋冨嚱鏁�,骞朵笖鎻愮ず銆恑_TipText銆戠殑鍐呭</para>
+        /// </summary>
+        /// <param name="i_TitleText">寮圭獥鐨勬爣棰樹俊鎭�</param>
+        /// <param name="i_InputText">杈撳叆妗嗗垵濮嬪寲鍊�(蹇界暐璇疯缃负null)</param>
+        /// <param name="i_TipText">杈撳叆妗嗙伆鑹插瓧浣撹鏄�(蹇界暐璇疯缃负null)</param>
+        /// <param name="i_ComfirmClickEvent">纭鎸夐挳浜嬩欢</param>
+        /// <returns></returns>
+        public void ShowDialogInputForm(string i_TitleText, string i_InputText, string i_TipText, Action<DialogInputControl, string> i_ComfirmClickEvent)
+        {
+            //鐢熸垚涓�涓脊绐楃敾闈�
+            var dialogForm = new DialogInputControl();
+            //鏍囬
+            dialogForm.SetTitleText(i_TitleText);
+            //杈撳叆妗嗙伆鑹插瓧浣撹鏄�
+            if (i_TipText != null)
+            {
+                dialogForm.SetTipText(i_TipText);
+            }
+            //杈撳叆妗嗗垵濮嬪��
+            if (i_InputText != null)
+            {
+                dialogForm.Text = i_InputText;
+            }
+
+            //鎸変笅纭鎸夐挳
+            dialogForm.ComfirmClickEvent += ((textValue) =>
+            {
+                i_ComfirmClickEvent?.Invoke(dialogForm, textValue);
+            });
+        }
+
+        #endregion
+
         #region 鈻� 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁坃________
 
         /// <summary>

--
Gitblit v1.8.0