From 98ceb6bd2021f9ff136cda27eef28676dd7b5d92 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 21 五月 2020 13:24:02 +0800
Subject: [PATCH] 最后的版本
---
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index 859f605..2b8608a 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -32,9 +32,10 @@
/// <param name="account">鐧婚檰璐﹀彿</param>
public void ShowForm(string account = "")
{
- if (Config.Instance.IsLogin == true)
+ if (account == string.Empty)
{
- return;
+ //浣跨敤涓婁竴娆＄櫥闄嗙殑璐﹀彿
+ account = Common.Config.Instance.Account;
}
CommonPage.Instance.IsDrawerLockMode = true;
this.Tag = "Login";
@@ -207,7 +208,7 @@
{
this.RemoveFromParent();
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.Fresh();
+ UserPage.Instance.ReFreshControl();
});
});
};
@@ -851,7 +852,7 @@
{
this.RemoveFromParent();
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.Fresh();
+ UserPage.Instance.ReFreshControl();
});
}
else
@@ -907,7 +908,7 @@
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
var revertData = responseDataObj;
//鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
- UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
+ Config.Instance.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.Guid = revertData.Guid;
@@ -1094,7 +1095,7 @@
var revertData = responseDataObj;
Config.ReFresh();
//鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
- UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
+ Config.Instance.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.Password = i_psw;
Config.Instance.MD5PWD = revertData.MD5PWD;
@@ -1115,7 +1116,7 @@
CommonPage.Loading.Hide();
this.RemoveFromParent();
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.Fresh();
+ UserPage.Instance.ReFreshControl();
});
return;
}
--
Gitblit v1.8.0