From 2bbb1b72dbce5cf9bd4ac4a5b7488e3f18eaf929 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 19 十二月 2020 18:37:38 +0800
Subject: [PATCH] 2020-12-19 1.IOS和Android网络切换,远程和本地控制切换优化。  2.IOS和Android后台回到前台,搜索网关,远程和本地控制切换优化.

---
 HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
old mode 100644
new mode 100755
index e936f17..d91c3d4
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -145,8 +145,10 @@
         HttpServerRequest pm;
         /// <summary>
         /// 鍥炶皟浜嬩欢
+        /// 璐﹀彿锛屽瘑鐮侊紝鏄惁鎵嬫満
+        /// account锛宲assword锛宨sPhone
         /// </summary>
-        Action<string> callbackAction;
+        Action<string, string, bool> AutoLoginAction;
         /// <summary>
         /// 淇敼绫诲瀷
         /// 0:鎵嬫満
@@ -163,13 +165,22 @@
         /// </summary>
         string registerPhone;
         string registerEmail;
+        /// <summary>
+        /// 鏄惁鐐瑰嚮浜嗚繑鍥烇紝鐢ㄤ簬灞忚斀EditText澶卞幓鐒︾偣妫�娴嬩簨浠�
+        /// </summary>
+        bool isHitBack;
         #endregion
-        public ForgetPasswordPage(Action<string> action)
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="autoLoginAction">鑷姩鐧诲綍鍥炶皟浜嬩欢</param>
+        public ForgetPasswordPage(Action<string, string, bool> autoLoginAction)
         {
-            callbackAction = action;
+            AutoLoginAction = autoLoginAction;
             bodyView = new FrameLayout()
             {
-                BackgroundColor = CSS_Color.BackgroundColor,
+                BackgroundColor = CSS_Color.MainBackgroundColor,
             };
             AddChidren(bodyView);
 
@@ -178,7 +189,11 @@
 
         public void ShowDialog()
         {
-            new TopViewDiv(this,bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView();
+            Action backAction = () =>
+            {
+                isHitBack = true;
+            };
+            new TopViewDiv(this, bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView(backAction);
             //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
 
             #region 淇敼鏂瑰紡閫夋嫨

--
Gitblit v1.8.0