From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 四月 2020 09:19:05 +0800
Subject: [PATCH] 20200421
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f3a8775..d7c2587 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -92,8 +92,8 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("Account", account);
d.Add("Code", vCode);
- d.Add("Language", MainPage.LoginUser.language);
- d.Add("AreaCode", MainPage.LoginUser.areaCode);
+ d.Add("Language", Language.CurrentLanguage);
+ d.Add("AreaCode", "86");
var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
return RequestHttps($"{severAddress}/ZigbeeUsers/LoginValidCode", jsonString, false);
}
@@ -109,7 +109,8 @@
string jsonString = "{" +
"\"Account\":" + "\"" + mobileNumber + "\"" + "," +
"\"Password\":" + "\"" + password + "\"" + "," +
- "\"Language\":" + "\"" + language + "\"" +
+ "\"Language\":" + "\"" + language + "\"" +
+ "\"AreaCode\":" + "\"" + "86" + "\"" +
"}";
return RequestHttps($"{severAddress}/SignIn", jsonString, false);
}
@@ -173,7 +174,7 @@
string jsonString = "{" +
"\"Account\":" + "\"" + phoneNum + "\"" + "," +
- "\"AreaCode\":" + MainPage.LoginUser.areaCode +
+ "\"AreaCode\":" + "86" +
"}";
return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
}
@@ -238,21 +239,17 @@
if (revertObj.StateCode.ToUpper() == "SUCCESS")
{
- var dataStr = Newtonsoft.Json.Linq.JObject.FromObject(revertObj.ResponseData);
- //MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
+ var dataStr = JObject.FromObject(revertObj.ResponseData);
//"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109", < !--甯愬彿Id-- >
MainPage.LoginUser.userEmailInfo = dataStr.GetValue("Email").ToString();
MainPage.LoginUser.userMobileInfo = dataStr.GetValue("Phone").ToString();
- //"HeadImage": null, < !--澶寸浉锛岀被鍨媌yte[] -->
FileStream fs = null;
try
{
var headImageString = dataStr.GetValue("HeadImage").ToString();
- var ss = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(headImageString);
- var bytes = Encoding.UTF8.GetBytes(headImageString);
- MainPage.LoginUser.headImagePageBytes = bytes;
- //var bytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(headImageString);
- //var byteStr = Encoding.UTF8.GetString(bytes);
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
+ var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
+ MainPage.LoginUser.headImagePageBytes = headImageBytes;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
#if DEBUG
@@ -262,10 +259,10 @@
});
#endif
fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
- fs.Write(bytes, 0, bytes.Length);
+ fs.Write(headImageBytes, 0, headImageBytes.Length);
fs.Flush();
MainPage.LoginUser.headImagePagePath = filePath;
- }catch (Exception ex)
+ } catch (Exception ex)
{
MainPage.Log($"download headImage error : {ex.Message}");
}
@@ -278,11 +275,30 @@
}
// "GesturePwd": null, < !--鎵嬪娍瀵嗙爜-- >
// "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
- MainPage.LoginUser.userName = dataStr.GetValue("Remark").ToString();
+ MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
+
+ Application.RunOnMainThread(() =>
+ {
+ });
MainPage.LoginUser.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
+
+ }
+
+ /// <summary>
+ /// 鏇存柊鐢ㄦ埛鏄电О
+ /// </summary>
+ /// <param name="userName"></param>
+ /// <returns></returns>
+ public ResponsePack EditUserName(string userName)
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("UserName", userName);
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/UpdateUserName", requestJson, true);
+ return revertObj;
}
@@ -310,7 +326,7 @@
/// <summary>
/// 鑾峰彇浣忓畢鍒楄〃
/// </summary>
- public ResponsePack GetHomePager()
+ public string GetHomePager()
{
string jsonString = "{" +
"\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
@@ -318,7 +334,38 @@
"\"HomeType\":" + "\"" + "1" + "\"" + "," +
"\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
"}";
- return RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);
+ var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);
+
+ if (responsePack.StateCode.ToUpper() == "SUCCESS")
+ {
+ var dataStr = JObject.FromObject(responsePack.ResponseData);
+ //娌℃湁浣忓畢
+ if (dataStr.GetValue("PageData").ToString() == "[]")
+ {
+
+ }
+ else
+ {
+ MainPage.LoginUser.regionList = new List<RegionInfoRes>();
+ foreach (var jsonData in dataStr.GetValue("PageData"))
+ {
+ var homeJsonStr = JObject.FromObject(jsonData);
+ var home = new RegionInfoRes()
+ {
+ RegionID = homeJsonStr.GetValue("Id").ToString(),
+ RegionName = homeJsonStr.GetValue("RegionName").ToString(),
+ Name = homeJsonStr.GetValue("Name").ToString(),
+ Address = homeJsonStr.GetValue("Address").ToString(),
+ };
+ MainPage.LoginUser.regionList.Add(home);
+ }
+ DB_ResidenceData.residenceData.SaveResidenceData();
+ MainPage.LoginUser.SaveUserInfo();
+ }
+ }
+ return responsePack.StateCode;
+
+
}
/// <summary>
/// 缂栬緫浣忓畢淇℃伅
@@ -537,6 +584,18 @@
var roomList = new Dictionary<JObject, Room>();
var roomsObject = jt.FindAll((room) => room.GetValue("FileName").ToString().StartsWith("Room_") && room.GetValue("FileName").ToString().Split('_').Length == 2);
+ foreach(var pp in jt)
+ {
+ if(pp.GetValue("FileName").ToString().StartsWith("Equipment"))
+ {
+ MainPage.Log(pp.GetValue("FileName").ToString());
+
+
+ }
+
+
+ }
+ roomsObject = jt.FindAll((room) => room.GetValue("FileName").ToString().StartsWith("Equipment_OnePortBus"));
foreach (var roomJObj in roomsObject)
{
Dictionary<string, object> d = new Dictionary<string, object>();
@@ -547,18 +606,18 @@
var byresss = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonBytes);
var byteStr = Encoding.UTF8.GetString(byresss);
var ss = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(byteStr);
- var RootPath = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/";
- var filePath = Path.Combine(RootPath, ss.GetValue("BackGroundImage").ToString()) + ".png";
- var room1 = new Room()
- {
- sid = Guid.NewGuid().ToString(),
- name = ss.GetValue("Name").ToString(),
- floorIndex = 1,
- backgroundImage = "Classification/Room/Roombg.png",
- //backgroundImage = ss.GetValue("BackGroundImage").ToString() == "Room/r1.png" ? "Classification/Room/Roombg.png" : filePath,
- };
- DB_ResidenceData.residenceData.rooms.Add(room1);
- roomList.Add(ss, room1);
+ //var RootPath = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/";
+ //var filePath = Path.Combine(RootPath, ss.GetValue("BackGroundImage").ToString()) + ".png";
+ //var room1 = new Room()
+ //{
+ // sid = Guid.NewGuid().ToString(),
+ // name = ss.GetValue("Name").ToString(),
+ // floorIndex = 1,
+ // backgroundImage = "Classification/Room/Roombg.png",
+ // //backgroundImage = ss.GetValue("BackGroundImage").ToString() == "Room/r1.png" ? "Classification/Room/Roombg.png" : filePath,
+ //};
+ //DB_ResidenceData.residenceData.rooms.Add(room1);
+ //roomList.Add(ss, room1);
}
var index = 1;
--
Gitblit v1.8.0