From 22c5c030f2262b6a9d6840bf3b5196b7ab2d4dd5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 三月 2020 14:31:53 +0800
Subject: [PATCH] 2020-03-10 1.替换最新控件库，增加无网络监听，Loading效果优化。 2.电能插座修复点亮统计个数问题。 3 .定时检测网关是否在线，发送CheckGateway间隔为10S，收到主题刷新该时间，重置发送次数，发送次数到达3次以上，则判定网关为离线状态。 4.远程重复增加为3次，重发后等待5s才回调结果。 5.修复去掉普通继电器读电能操作。 6.读状态间隔缩短为200ms。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
index e612be7..f042ff9 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
@@ -88,7 +88,7 @@
ItemButton.MouseUpEventHandler += (sender, e) => {
Action action = () => {
Application.RunOnMainThread (() => {
- MainPage.Loading.Start ("please wait...");
+ MainPage.Loading.Start ("Please wait...");
});
System.Threading.Tasks.Task.Run (() => {
try {
@@ -111,7 +111,7 @@
System.Threading.Tasks.Task.Factory.StartNew (() => {
try {
Application.RunOnMainThread (() => {
- MainPage.Loading.Start ("please wait...");
+ MainPage.Loading.Start ("Please wait...");
});
foreach (var newDevicePath in roomDeviceFilePathList) {
var common = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (CommonPage.MyEncodingUTF8.GetString (IO.FileUtils.ReadFile (newDevicePath)));
@@ -141,7 +141,7 @@
var oldScene = alexaSceneList.Find ((obj) => obj.SceneName == tempScene.Name);
if (oldScene == null) {
int sceneDeviceCount = tempScene.DeviceFilePathList.Count;
- var uploadScene = new SceneAndDeviceList () { MAC = UserConfig.Instance.GatewayMAC, RegionID = UserConfig.Instance.CurrentRegion.RegionID, SceneName = tempScene.Name };
+ var uploadScene = new SceneAndDeviceList () { MAC = UserConfig.Instance.GatewayMAC, RegionID = UserConfig.Instance.CurrentRegion.Id, SceneName = tempScene.Name };
byte [] replyBytes = null;
if (!tempScene.busScene) {
@@ -384,7 +384,7 @@
System.Threading.Tasks.Task.Factory.StartNew (() => {
try {
Application.RunOnMainThread (() => {
- MainPage.Loading.Start ("please wait...");
+ MainPage.Loading.Start ("Please wait...");
});
var tempRoom = new Room ();
foreach (var device in alexaDeviceLista) {//鐗规畩澶勭悊鏈嶅姟鍣ㄤ笌鏈湴璁惧绫诲瀷涓嶄竴鏍风殑璁惧
@@ -432,10 +432,10 @@
public List<UpdateDeviceObj> ReadDeviceList ()
{
var deviceList = new List<UpdateDeviceObj> ();
- var requestObj = new DeviceByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.RegionID };
+ var requestObj = new GetDeviceListObj () { RegionID = UserConfig.Instance.CurrentRegion.Id };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("DeviceByRegionList", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ var revertObj = MainPage.RequestHttps (API.GetDeviceList, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UpdateDeviceObj>> (revertObj.ResponseData.ToString());
}
return deviceList;
@@ -446,8 +446,8 @@
/// </summary>
public bool AddDevice (Common device)
{
- var uploadDevice = new AlexaDevice () {
- RegionID = UserConfig.Instance.CurrentRegion.RegionID, MAC = UserConfig.Instance.GatewayMAC.Replace (".", ""),
+ var uploadDevice = new AlexaDeviceObj () {
+ RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = UserConfig.Instance.GatewayMAC.Replace (".", ""),
DeviceName = device.Name, DeviceID = device.DeviceID, SubnetID = device.SubnetID, LoopID = device.LoopID, DeviceType = device.Type.ToString ()
};
if (device.Type.ToString () == "CurtainModel") {
@@ -457,10 +457,10 @@
} else if (device.Type.ToString () == "ACInfrared") {
uploadDevice.DeviceType = "HVAC";
}
- var requestObj = new UploadDevicesObj () { Device = uploadDevice };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("UploadDevices", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ //var requestObj = new UploadDevicesObj () { Device = uploadDevice };
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (uploadDevice);
+ var revertObj = MainPage.RequestHttps (API.UploadDevices, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
return true;
}
return false;
@@ -469,12 +469,12 @@
/// <summary>
/// 鍒犻櫎璁惧
/// </summary>
- public bool DelDevice(int commonId)
+ public bool DelDevice(string commonId)
{
var requestObj = new DelDeviceObj () { Id = commonId };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("DelDevice", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ var revertObj = MainPage.RequestHttps (API.DeleteDevice, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
return true;
}
return false;
@@ -488,10 +488,10 @@
public List<SceneByRegion> ReadSceneList ()
{
var sceneList = new List<SceneByRegion> ();
- var requestObj = new SceneByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.RegionID };
+ var requestObj = new SceneByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.Id };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("SceneByRegionList", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ var revertObj = MainPage.RequestHttps (API.GetSceneList, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SceneByRegion>> (revertObj.ResponseData.ToString ());
}
return sceneList;
@@ -503,12 +503,12 @@
public bool AddScene (SceneAndDeviceList sceneMark)
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (sceneMark);
- var revertObj = MainPage.RequestHttps ("AddSceneAndDeviceList", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ var revertObj = MainPage.RequestHttps (API.AddSceneAndDeviceList, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
//var requestAddDeviceObj = new BindDeviceToSceneItemObj () { SceneId = sceneId, Command = command, DeviceID = 0, DataString = dataString };
//var requestAddDeviceJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestAddDeviceObj);
//var revertAddDeviceObj = MainPage.RequestHttps ("BindDeviceToSceneItem", requestAddDeviceJson);
- //if (revertAddDeviceObj.StateCode == "SUCCESS") {
+ //if (revertAddDeviceObj.StateCode.ToUpper() == "SUCCESS") {
return true;
//}
}
@@ -523,7 +523,7 @@
// var requestAddDeviceObj = new BindDeviceToSceneItemObj () { SceneId = sceneId, Command = command, DeviceID = 0, DataString = dataString };
// var requestAddDeviceJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestAddDeviceObj);
// var revertAddDeviceObj = MainPage.RequestHttps ("BindDeviceToSceneItem", requestAddDeviceJson);
- // if (revertAddDeviceObj.StateCode == "SUCCESS") {
+ // if (revertAddDeviceObj.StateCode.ToUpper() == "SUCCESS") {
// return true;
// }
// return false;
@@ -532,12 +532,12 @@
/// <summary>
/// 鍒犻櫎鍦烘櫙
/// </summary>
- public bool DelScene (int sceneId)
+ public bool DelScene (string sceneId)
{
- var requestObj = new DeleteScene () { Id = sceneId };
+ var requestObj = new DeleteSceneObj () { Id = sceneId };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("DeleteScene", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ var revertObj = MainPage.RequestHttps (API.DeleteScene, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
return true;
}
return false;
--
Gitblit v1.8.0