From f60ce72c3c29c7d31a046795c88ec39a69e73d45 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 06 一月 2021 17:33:54 +0800
Subject: [PATCH] 2021-01-06 1.替换新云端前期准备相关接口，和修改相关参数。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
index 6dd2f3a..5f2fb25 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
@@ -400,7 +400,7 @@
//var requestObj2 = new HomeListObj ();
var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2);
var revertObj2 = MainPage.RequestHttps (API.GetHomePager, requestJson2);
- if (revertObj2.StateCode.ToUpper() == "SUCCESS") {
+ if (revertObj2.StateCode.ToUpper() == StateCode.SUCCESS) {
var mResidenceRes = Newtonsoft.Json.JsonConvert.DeserializeObject<ResidenceRes> (revertObj2.ResponseData.ToString ());
if (mResidenceRes.PageData != null && mResidenceRes.PageData.Count > 0) {
@@ -663,24 +663,21 @@
CommonPage.RefreshAir = () => {
var airQualityR = CommonPage.AirQuality;
- if (airQualityR != null &&
- airQualityR.data != null &&
- airQualityR.data.city != null &&
- airQualityR.data.condition != null) {
- AirQCity = btnCity.Text = airQualityR.data.city.name;
- AirQTemp = btnTemp.Text = airQualityR.data.condition.temp + "掳";
- if (airQualityR.data.aqi != null) {
- AirQAirPM25 = btnPM25.Text = "PM2.5 " + airQualityR.data.aqi.pm25;
+ if (airQualityR != null) {
+ AirQCity = btnCity.Text = airQualityR.city;
+ AirQTemp = btnTemp.Text = airQualityR.airQTemp + "掳";
+ if (airQualityR.airQAirPM25 != null) {
+ AirQAirPM25 = btnPM25.Text = "PM2.5 " + airQualityR.airQAirPM25;
} else {
- if (string.IsNullOrEmpty (airQualityR.data.condition.condition))
- btnPM25.Text = airQualityR.data.condition.condition;
+ if (string.IsNullOrEmpty (airQualityR.airQAirWeather))
+ btnPM25.Text = airQualityR.airQAirWeather;
}
- AirQHumidity = btnHumidity.Text = airQualityR.data.condition.humidity;
+ AirQHumidity = btnHumidity.Text = airQualityR.airQHumidity;
AirQHumidityIcon = btnHumidityIcon.UnSelectedImagePath = "AirQuality/HumidityIcon.png";
AirQAirPM25Icon = btnPM25Icon.UnSelectedImagePath = "AirQuality/PM25Icon.png";
- AirLineNullBackgroundColor = btnAirLineNull.BackgroundColor = SkinStyle.Current.White20Transparent;
+ btnAirLineNull.BackgroundColor = SkinStyle.Current.White20Transparent;
#region
- switch (airQualityR.data.condition.condition) {
+ switch (airQualityR.airQAirWeather) {
case "鏅�":
case "Sunny":
case "鏅村ぉ":
@@ -850,6 +847,7 @@
#endregion
}
};
+
CommonPage.RefreshAir ();
} else {
--
Gitblit v1.8.0