From f60ce72c3c29c7d31a046795c88ec39a69e73d45 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 06 一月 2021 17:33:54 +0800
Subject: [PATCH] 2021-01-06 1.替换新云端前期准备相关接口，和修改相关参数。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 2c93b08..4f6f23d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -259,20 +259,22 @@
//鍚庡彴楠岃瘉璐﹀彿
System.Threading.Tasks.Task.Run (() => {
try {
- var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = MainPage.LoginUser.Password, Company = MainPage.SoftSmsType };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps (API.Login, requestJson);
+ //var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = MainPage.LoginUser.Password, Company = MainPage.SoftSmsType };
+ //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
+ //var revertObj = MainPage.RequestHttps (API.Login, requestJson);
+
+ var revertObj = HttpServerRequest.Current.LoginByPassword (MainPage.LoginUser.AccountString, MainPage.LoginUser.Password);
if (revertObj != null) {
Application.RunOnMainThread (() => {
- if (revertObj.StateCode.ToUpper () == "SUCCESS") {
- var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.ResponseData.ToString ());
- MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
+ if (revertObj.Code == StateCode.SUCCESS) {
+ var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.Data.ToString ());
+ //MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
MainPage.LoginUser.LastTime = DateTime.Now;
MainPage.LoginUser.SaveUserInfo ();
//2020-01-14 鐧诲綍鎴愬姛鍚庯紝鍒锋柊涓�娆″綋鍓嶄綇瀹呯綉鍏�
GetNowHomeGatewayAfterLoginSuccess ();
- } else if (!string.IsNullOrEmpty (revertObj.StateCode)) {
- if (revertObj.StateCode != ErrorCode.NetworkError && revertObj.StateCode != "Data Exception") {
+ } else if (!string.IsNullOrEmpty (revertObj.Code)) {
+ if (revertObj.Code != StateCode.NETWORK_ERROR && revertObj.Code != StateCode.DATA_EXCEPTION) {
MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
MainPage.LoginUser.SaveUserInfo ();
new AccountLogin ().Show ();
@@ -565,7 +567,7 @@
var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
- if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
+ if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
//2020-01-11
UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
--
Gitblit v1.8.0