From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
index 400f3c9..b84d940 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
@@ -122,7 +122,11 @@
if (common != null) {
var oldDevice = alexaDeviceLista.Find ((obj) => obj.SubnetID == common.SubnetID && obj.DeviceID == common.DeviceID && obj.LoopID == common.LoopID && obj.DeviceType == common.Type.ToString ());
if (oldDevice == null) {
- AddDevice (common);
+ var isSuccess = AddDevice (common);
+ if (!isSuccess) {
+ //璺冲嚭寰幆
+ break;
+ }
}
}
}
@@ -356,7 +360,11 @@
}
}
- AddScene (uploadScene);
+ var isSuccess = AddScene (uploadScene);
+ if (!isSuccess) {
+ //璺冲嚭寰幆
+ break;
+ }
}
}
@@ -435,8 +443,12 @@
var requestObj = new GetDeviceListObj () { RegionID = UserConfig.Instance.CurrentRegion.Id };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
var revertObj = MainPage.RequestHttps (API.GetDeviceList, requestJson);
- if (revertObj.StateCode.ToUpper() == "SUCCESS") {
- deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UpdateDeviceObj>> (revertObj.ResponseData.ToString());
+ if (revertObj.StateCode.ToUpper () == "SUCCESS") {
+ deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UpdateDeviceObj>> (revertObj.ResponseData.ToString ());
+ } else {
+ //2020-06-29 寮圭獥鎻愮ず閿欒
+
+
}
return deviceList;
}
@@ -462,8 +474,49 @@
var revertObj = MainPage.RequestHttps (API.UploadDevices, requestJson);
if (revertObj.StateCode.ToUpper() == "SUCCESS") {
return true;
+ }else if (revertObj.StateCode == "Exist") {
+ Application.RunOnMainThread (() => {
+ MainPage.AddTip (ErrorCode.AddFailed + " " + ErrorCode.NameExist + " ( " + device.Name + " )");
+ });
+ return true;
+ } else {
+ //2020-06-29 寮瑰嚭鎻愮ず閿欒
+ ShowUploadDevicesInfo (revertObj.StateCode);
}
return false;
+ }
+
+ /// <summary>
+ /// 涓婁紶璁惧 閿欒鎻愮ず
+ /// </summary>
+ /// <param name="stateCodeStr"></param>
+ void ShowUploadDevicesInfo (string stateCodeStr)
+ {
+ string mes = "";
+ if (stateCodeStr == "NoRecord") {
+ //浣忓畢鏈粦瀹氱綉鍏筹紒
+ mes = ErrorCode.HomeNoRecord;
+ } else if (stateCodeStr == "NoExist") {
+ //浣忓畢涓嶅瓨鍦紒
+ mes = ErrorCode.HomeNoExist;
+ } else if (stateCodeStr == "Exist") {
+ //璁惧鍚嶇О宸插瓨鍦�
+ mes = ErrorCode.NameExist;
+ } else if (stateCodeStr == ErrorCode.NetworkError) {
+ mes = ErrorCode.NetworkError;
+ } else {
+ mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
+
+ }
+ if (!string.IsNullOrEmpty (mes)) {
+ Application.RunOnMainThread (() => {
+ MainPage.AddTip (ErrorCode.AddFailed + " " + mes);
+
+ //new Alert ("", ErrorCode.AddFailed + " " + mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ });
+ }
+
+
}
/// <summary>
@@ -476,6 +529,9 @@
var revertObj = MainPage.RequestHttps (API.DeleteDevice, requestJson);
if (revertObj.StateCode.ToUpper() == "SUCCESS") {
return true;
+ } else {
+ //2020-06-29 寮圭獥鎻愮ず閿欒
+
}
return false;
}
@@ -493,6 +549,8 @@
var revertObj = MainPage.RequestHttps (API.GetSceneList, requestJson);
if (revertObj.StateCode.ToUpper() == "SUCCESS") {
sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SceneByRegion>> (revertObj.ResponseData.ToString ());
+ } else {
+ //2020-06-29 寮圭獥鎻愮ず閿欒
}
return sceneList;
}
@@ -511,7 +569,16 @@
//if (revertAddDeviceObj.StateCode.ToUpper() == "SUCCESS") {
return true;
//}
+ } else if (revertObj.StateCode == "Exist") {
+ Application.RunOnMainThread (() => {
+ MainPage.AddTip (ErrorCode.AddFailed + " " + ErrorCode.NameExist + " ( " + sceneMark.SceneName + " )");
+ });
+ return true;
+ } else {
+ //2020-06-29 寮瑰嚭鎻愮ず閿欒
+ ShowUploadDevicesInfo (revertObj.StateCode);
}
+
return false;
}
@@ -539,6 +606,9 @@
var revertObj = MainPage.RequestHttps (API.DeleteScene, requestJson);
if (revertObj.StateCode.ToUpper() == "SUCCESS") {
return true;
+ } else {
+ //2020-06-29 寮圭獥鎻愮ず閿欒
+
}
return false;
}
--
Gitblit v1.8.0