From 56c4924b268da500483bd2de9522db5b34965120 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 四月 2020 13:35:10 +0800
Subject: [PATCH] 20200409
---
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
index 24c4766..309fccf 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
@@ -35,11 +35,11 @@
}
return loading;
}
- }
+ }
//public static Button LogoButton = new Button ();
- public static string CodeIDString = "20191223";
+ public static string CodeIDString = "20200403";
public static UserInfo LoginUser;
@@ -173,28 +173,30 @@
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 ();
+ //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 ();
#region
- urlHead = $"{"https://homeautomation.havells.com"}/WebApi/";
- urlHead = "https://developer.hdlcontrol.com/api/";
- string url = urlHead + methodType;
-
var webClient = new WebClient ();
+ if (urlHead == "") {
+ urlHead = $"{"https://homeautomation.havells.com"}/WebApi/";
+ } else {
+ webClient.Headers.Add ("CONTENT-TYPE", "application/json");
+ }
+ string url = urlHead + methodType;
if (needHeaders && LoginUser != null) {/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */
webClient.Headers.Add ("Authorization", LoginUser.LoginTokenString);
}
--
Gitblit v1.8.0