From b8e94316e41eba72d927d5ca7d931b26139ee8ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 六月 2020 09:12:53 +0800
Subject: [PATCH] 20200612

---
 HDL_ON/DAL/Server/HttpServerRequest.cs |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 6aa9bad..56e8cd5 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -346,6 +346,31 @@
                 }
                 else
                 {
+                    //{
+                    // {
+                    //  "Id": "1107487",
+                    //  "HomeStatus": 2,
+                    //  "UserGuid": "22980",
+                    //  "Name": "鍟�",
+                    //  "Address": null,
+                    //  "Longitude": 0.0,
+                    //  "Latitude": 0.0,
+                    //  "RegionName": null,
+                    //  "Company": null,
+                    //  "ContactPerson": null,
+                    //  "ContactPersonPhone": null,
+                    //  "Remarks": null,
+                    //  "ChangeDate": null,
+                    //  "AccountType": 0,
+                    //  "CreatedOnUtc": "2020-05-27T06:52:03",
+                    //  "IsOthreShare": false,
+                    //  "MainUserDistributedMark": null,
+                    //  "HomeGateways": [
+                    //    {
+                    //      "GatewayUniqueId": "4E47323347591243"
+                    //    }
+                    //  ]
+                    //}}
                     MainPage.LoginUser.regionList = new List<RegionInfoRes>();
                     foreach (var jsonData in dataStr.GetValue("PageData"))
                     {
@@ -356,16 +381,19 @@
                             RegionName = homeJsonStr.GetValue("RegionName").ToString(),
                             Name = homeJsonStr.GetValue("Name").ToString(),
                             Address = homeJsonStr.GetValue("Address").ToString(),
+                            IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
                         };
                         MainPage.LoginUser.regionList.Add(home);
+                        if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
+                        {
+                            DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+                        }
                     }
                     DB_ResidenceData.residenceData.SaveResidenceData();
                     MainPage.LoginUser.SaveUserInfo();
                 }
             }
             return responsePack.StateCode;
-
-
         }
         /// <summary>
         /// 缂栬緫浣忓畢淇℃伅
@@ -573,9 +601,11 @@
                             responseString = Encoding.UTF8.GetString(webClient.DownloadData(url));
                             revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString);
                             jt = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(revertObj.ResponseData.ToString());
-                            MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString()+ "掳";
-                            MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString()+"%";
+                            MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString();
+                            MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString();
                             MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString();
+                            MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString();
+                            MainPage.cityInfo.weather = jt.GetValue("Weather").ToString();
                             break;
                         }
                         catch (Exception ex)

--
Gitblit v1.8.0