From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 95 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
index cceebea..46332c8 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
@@ -10,7 +10,7 @@
// </summary>
//using SystemConfiguration;
namespace Shared.SimpleControl
-{
+{
/// <summary>
/// 涓婚〉闈�
/// </summary>
@@ -38,7 +38,7 @@
//public static Button LogoButton = new Button ();
- public static string RequestVersion = "2.507171";
+ public static string RequestVersion = "2.601071";
public static UserInfo LoginUser;
/// <summary>
/// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
@@ -76,10 +76,21 @@
public static string RequestHttpsHost = "https://smarth-api.havells.com/HangZhouHdlCloudApi";
//public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
- public static string RequestHttpsHostMqtt = "https://smarth-api.havells.com";
+ //public static string RequestHttpsHostMqtt = "https://smarth-api.havells.com";
//public static string RequestHttpsHost = "https://developer.hdlcontrol.com";
+ #region GetDesignHeight
+ /// <summary>
+ /// 鑾峰彇view鐨勮绠楅珮搴︼紝ON杞欢涓轰簡閫傞厤鍏ㄩ潰鐗规畩浣跨敤鐨勬瘮渚嬫柟娉曪紝鐢变簬涓�浜涜儗鏅浘鐗囨槸鐩存帴鍏ㄩ儴濉厖鐨勶紝鏀瑰姩鎴愪笁灞傜殑锛坴iew-button-button)鐨勫伐浣滈噺寰堝ぇ锛屼笉绂侀渶瑕佸鍔犱竴涓獀iew锛岃繕闇�瑕佷慨鏀瑰浘鐗�
+ /// </summary>
+ /// <returns>The view height.</returns>
+ public static int GetDesignHeight (int height)
+ {
+ int ss = Convert.ToInt32 (height / PixelScale);
+ return Application.GetRealHeight (ss);
+ }
+ #endregion
public static double PixelScale {
get {
@@ -128,6 +139,9 @@
Application.DesignWidth = 640;
Application.DesignHeight = 1136;
}
+ //鍗板害瀹㈡埛瀹氬埗APP榛樿浣跨敤鑻辨枃
+ Language.CurrentLanguage = "English";
+
Shared.BusSocket.Start (6000);
CommonPage.InitReceiveEvent ();
@@ -146,6 +160,9 @@
Loading.TextColor = 0xFFA9A9A9;
Loading.LodingBackgroundColor = SkinStyle.Current.MainColor;
}
+
+ CommonUtlis.Current.CheckIfJailBreak ();
+
} catch (Exception ex) {
//new Alert ("Eorr", ex.Message, "Close").Show();
}
@@ -295,26 +312,20 @@
ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, error) => {
return true;
};
-
-
#region HttpWebRequest
-
try {
if (urlHead == "") {
urlHead = RequestHttpsHost;
}
string requestFullUrl = urlHead + methodType;
-
//鍒濆鍖栨柊鐨剋ebRequst
//1锛� 鍒涘缓httpWebRequest瀵硅薄
HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create (new Uri (requestFullUrl));
//2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄
webRequest.Method = requestMethod;
-
//webRequest.Timeout = mTimeout * 1000;
-
webRequest.Headers.Add (HttpRequestHeader.Authorization, LoginUser.LoginTokenString);
webRequest.Headers.Add ("RequestVersion", mUploadHomeAppGatewaySubFilesBigObj.RequestVersion);
webRequest.Headers.Add ("LoginAccessToken", LoginUser.LoginTokenString);
@@ -323,9 +334,7 @@
webRequest.Headers.Add ("FileName", mUploadHomeAppGatewaySubFilesBigObj.FileName);
webRequest.Headers.Add ("IsOtherAccountCtrl", mUploadHomeAppGatewaySubFilesBigObj.IsOtherAccountCtrl.ToString ());
-
//var byteData = new byte [] { }锛�//Encoding.UTF8.GetBytes (dataStringJson);
-
//if (LoginUser != null) {/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */
// //瀵瑰簲寰俊缃戝潃
@@ -483,6 +492,78 @@
}
+ public const int TIME_OUT_20 = 30;
+ /// <summary>
+ /// 涓嬭浇鏂囦欢鏂规硶
+ /// </summary>
+ /// <param name="methodType"></param>
+ /// <param name="dataStringJson"></param>
+ /// <param name="urlHead"></param>
+ /// <param name="mTimeout"></param>
+ /// <param name="requestMethod"></param>
+ /// <returns></returns>
+ public static byte [] RequestHttpsReturnByteNew (string methodType, string dataStringJson, string urlHead = "", int mTimeout = 20, string requestMethod = "POST")
+ {
+ try {
+ #region
+ if (urlHead == "") {
+ urlHead = RequestHttpsHost;
+ }
+ string requestFullUrl = urlHead + methodType;
+
+ //鍒濆鍖栨柊鐨剋ebRequst
+ //1锛� 鍒涘缓httpWebRequest瀵硅薄
+ HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create (new Uri (requestFullUrl));
+
+ //2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄
+ webRequest.Method = requestMethod;
+ //webRequest.Timeout = timeout * 1000;
+ //鍙栨秷浣跨敤浠ｇ悊璁块棶
+ webRequest.Proxy = null;
+ webRequest.UseDefaultCredentials = false;
+
+ if (requestMethod == "GET") {
+ webRequest.ContentType = "application/json";
+ } else {
+ var byteData = Encoding.UTF8.GetBytes (dataStringJson);
+ webRequest.ContentType = "application/json";
+ webRequest.ContentLength = byteData.Length;
+ //3锛� 闄勫姞瑕丳OST缁欐湇鍔″櫒鐨勬暟鎹埌HttpWebRequest瀵硅薄(闄勫姞POST鏁版嵁鐨勮繃绋嬫瘮杈冪壒娈婏紝瀹冨苟娌℃湁鎻愪緵涓�涓睘鎬х粰鐢ㄦ埛瀛樺彇锛岄渶瑕佸啓鍏ttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰銆�)
+ var newStream = webRequest.GetRequestStream ();//鍒涘缓涓�涓猄tream,璧嬪�兼槸鍐欏叆HttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰
+ newStream.Write (byteData, 0, byteData.Length);
+ newStream.Flush ();
+ newStream.Close ();
+ }
+
+ //4锛� 璇诲彇鏈嶅姟鍣ㄧ殑杩斿洖淇℃伅
+ var response = (HttpWebResponse)webRequest.GetResponse ();
+ using (var stream = response.GetResponseStream ()) {
+ if (stream == null) {
+ return null;
+ }
+ var ms = new MemoryStream ();
+ var bytes = new byte [1024];
+ var len = int.MaxValue;
+ while (stream.CanRead && 0 < len) {
+ len = stream.Read (bytes, 0, bytes.Length);
+ ms.Write (bytes, 0, len);
+ }
+ return ms.ToArray ();
+ }
+ #endregion
+ } catch (WebException e) {
+ //if (e.Status == WebExceptionStatus.ConnectFailure//鐢辨湁缃戠粶鍒囨崲鍒版棤缃戠粶鏃惰Е鍙�
+ // || e.Status == WebExceptionStatus.Timeout//瓒呮椂
+ // || e.Status == WebExceptionStatus.NameResolutionFailure)//鏈韩灏辨槸鏃犵綉缁滄椂鍚姩鏃惰Е鍙�
+ //{
+ // //Phone.UserCenter.HdlWifiLogic.Current.CanAccessHttp = false;
+ //}
+ return null;
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
#region LoadingTipMsg 杩滅▼杩炴帴Tip
static Button btnLoadingTipMsg;
@@ -549,7 +630,7 @@
// new Alert ("", Language.StringByID (R.MyInternationalizationString.FailureToServer),
// Language.StringByID (R.MyInternationalizationString.Close)).Show ();
//});
- ShowAlertOnMainThread (Language.StringByID (R.MyInternationalizationString.FailureToServer));
+ ShowAlertOnMainThread (ErrorCode.FailedRequestServer);
}
/// <summary>
@@ -596,6 +677,7 @@
});
}
-
+
+
}
}
--
Gitblit v1.8.0