From fef8136ca77f03dc4fb8988da94dcaf9dcabc9e0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 22 四月 2020 19:09:54 +0800
Subject: [PATCH] 2020-04-22 1.增加远程连接过程提示，请求参数合并到一个接口。
---
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 42 ++----------------------------------------
1 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
index 5fd2df7..cd3fc15 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
@@ -37,7 +37,7 @@
//public static Button LogoButton = new Button ();
- public static string RequestVersion = "20200417";
+ public static string RequestVersion = "20200422";
public static UserInfo LoginUser;
/// <summary>
/// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
@@ -198,28 +198,6 @@
/// <param name="needHeaders">鏄惁闇�瑕佸寘澶�.</param>
public static ResponsePack RequestHttps (string methodType, string dataStringJson, string urlHead = "")
{
- //2020-01-08 灞忚斀
- //if (!SystemRemote.checeInternet ()) {
- // Application.RunOnMainThread (() => {
- // MainPage.WiFiStatus = "CrabtreeAdd/WiFiUnlink.png";
- // MainPage.Loading.Hide ();
- // });
- //}
- //new System.Threading.Thread (() => {
- // requesTime = DateTime.Now;
- // isShowLoading = true;
- // while (isShowLoading) {
- // System.Threading.Thread.Sleep (1000);
- // if (requesTime == DateTime.MinValue) {
- // break;
- // }
- // if (requesTime.AddSeconds (30) < DateTime.Now) {
- // Application.RunOnMainThread (Loading.Hide);
- // isShowLoading = false;
- // }
- // }
- //}) { IsBackground = true }.Start ();
-
ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, error) => {
return true;
};
@@ -243,26 +221,11 @@
} catch (System.Net.WebException webEx) {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
- //new Alert ( "","Network abnormal, unable to connect to the Internet", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return new ResponsePack () { StateCode = ErrorCode.NetworkError };
}
string responseString = Encoding.UTF8.GetString (bytes);
- //var DD = Newtonsoft.Json.Linq.JObject .Parse("GFGFDG");DD["ResponseData"]["PageData"]
-
- //var request = (HttpWebRequest)WebRequest.Create (url);
- //var data = Encoding.UTF8.GetBytes (dataStringJson);
- //request.Method = "POST";
- //request.ContentLength = data.Length;
- //if (needHeaders) {/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */
- // request.Headers.Set (HttpRequestHeader.Authorization, LoginUser.LoginTokenString);
- //}
- //using (var stream = request.GetRequestStream ()) {
- // stream.Write (data, 0, data.Length);
- //}
- //var response = (HttpWebResponse)request.GetResponse ();
- //var responseString = new StreamReader (response.GetResponseStream ()).ReadToEnd ();
-
+
try {
return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack> (responseString);
} catch (Exception ex) {
@@ -284,7 +247,6 @@
{
ResponsePack revertObj = null;
try {
-
ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, error) => {
return true;
--
Gitblit v1.8.0