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/Phone/Room/UserRoom.cs | 108 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 29 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
index c8cfb7a..bc97f19 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
@@ -395,20 +395,28 @@
MainPage.Loading.Start ();
System.Threading.Tasks.Task.Run (() => {
if (UserConfig.Instance.HomeLists.Count == 0) {
- var requestObj2 = new GetHomePagerObj ();
- requestObj2.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
- //var requestObj2 = new HomeListObj ();
- var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2);
- var revertObj2 = MainPage.RequestHttps (API.GetHomePager, requestJson2);
- if (revertObj2.StateCode.ToUpper() == "SUCCESS") {
- var mResidenceRes = Newtonsoft.Json.JsonConvert.DeserializeObject<ResidenceRes> (revertObj2.ResponseData.ToString ());
+ //var requestObj2 = new GetHomePagerObj ();
+ //requestObj2.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
+ ////var requestObj2 = new HomeListObj ();
+ //var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2);
+ //var revertObj2 = MainPage.RequestHttps (API.GetHomePager, requestJson2);
+ //if (revertObj2.StateCode.ToUpper() == StateCode.SUCCESS) {
+ // var mResidenceRes = Newtonsoft.Json.JsonConvert.DeserializeObject<ResidenceRes> (revertObj2.ResponseData.ToString ());
- if (mResidenceRes.PageData != null && mResidenceRes.PageData.Count > 0) {
- UserConfig.Instance.HomeLists = mResidenceRes.PageData;
- UserConfig.Instance.SaveUserConfig ();
- }
+ // if (mResidenceRes.PageData != null && mResidenceRes.PageData.Count > 0) {
+ // UserConfig.Instance.HomeLists = mResidenceRes.PageData;
+ // UserConfig.Instance.SaveUserConfig ();
+ // }
+ //} else {
+ // ShowGetHomePagerErrorInfo (revertObj2.StateCode);
+ //}
+
+ //鑾峰彇浣忓畢鍒楄〃
+ var revertObjCode = HttpServerRequest.Current.GetHomePager ();
+ if (revertObjCode == StateCode.SUCCESS) {
+
} else {
- ShowGetHomePagerErrorInfo (revertObj2.StateCode);
+ IMessageCommon.Current.ShowErrorInfoAlter (revertObjCode);
}
}
Application.RunOnMainThread (() => {
@@ -663,24 +671,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 +855,7 @@
#endregion
}
};
+
CommonPage.RefreshAir ();
} else {
@@ -918,13 +924,16 @@
SelectedTextColor = SkinStyle.Current.TextColor1,
};
acRowView.AddChidren (tempDeviceName);
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (tempDeviceName, devcieCommon);
+
tempDeviceName.MouseUpEventHandler += openACControlPageEvent;
Button btnMode = new Button () {
X = Application.GetRealWidth (20),
Y = Application.GetRealHeight (40),
- Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (100),
+ Width = Application.GetMinRealAverage (100),
+ Height = Application.GetMinRealAverage (100),
Tag = "Mode"
};
acRowView.AddChidren (btnMode);
@@ -934,8 +943,8 @@
Button btnWind = new Button () {
X = btnMode.Right + Application.GetRealWidth (0),
Y = Application.GetRealHeight (40),
- Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (100),
+ Width = Application.GetMinRealAverage (100),
+ Height = Application.GetMinRealAverage (100),
Tag = "Wind"
};
acRowView.AddChidren (btnWind);
@@ -1031,6 +1040,10 @@
IsMoreLines = true
};
fhRowView.AddChidren (tempDeviceName);
+
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (tempDeviceName, devcieCommon);
+
tempDeviceName.MouseUpEventHandler += (sender2, e2) => {
UserFHPage fhView = new UserFHPage (fh, room);
if (roomFilePath == Room.FavoriteRoom) {
@@ -1148,6 +1161,13 @@
IsMoreLines = true
};
DeviceRowView.AddChidren (btnName);
+
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (btnName, devcieCommon);
+
+ //btnName.MouseLongEventHandler += (sender, e)=>{
+ // RemarkDeviceName (devcieCommon, SimpleControl.CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (devcieCommon)), btnName);
+ //};
Button tempSwitch = new Button () {
Width = Application.GetMinRealAverage (90),
@@ -2364,5 +2384,35 @@
});
});
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="btnName"></param>
+ /// <param name="devcieCommon"></param>
+ void ButtonNameAddMouseLongEventHandler (Button btnName,Common devcieCommon)
+ {
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ btnName.MouseLongEventHandler += (sender, e) => {
+ RemarkDeviceName (devcieCommon, SimpleControl.CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (devcieCommon)), btnName);
+ };
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="commonDevice"></param>
+ /// <param name="commonBytes"></param>
+ /// <param name="btnEquipment"></param>
+ void RemarkDeviceName (Common commonDevice, byte[] commonBytes, Button btnEquipment)
+ {
+ Action successAction = () => {
+ GenericDialog.Current.RefreshRemark (commonDevice);
+ //if (!roomDeviceFilePathList.Contains (filePath)) {
+ // roomDeviceFilePathList.Add (filePath);
+ //}
+ };
+ GenericDialog.Current.ShowModifyRemarksDialog (commonDevice, commonBytes, btnEquipment, successAction);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0