From cc8749fe1d158ee21670bde77fad237be2f0c416 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 08 一月 2021 11:47:06 +0800
Subject: [PATCH] 2021-01-08 1.去掉无关文件
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
index 34288c5..bb7b93a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
@@ -25,8 +25,11 @@
curView = this;
myLoading = new Loading ();
+ myLoading.TextColor = 0xFFA9A9A9;
+ myLoading.LodingBackgroundColor = SkinStyle.Current.MainColor;
+
//#if __IOS__
- myLoading.LodingBackgroundColor = 0x00999999;
+ //myLoading.LodingBackgroundColor = 0x20999999;
//#else
// myLoading.LodingBackgroundColor = SkinStyle.Current.ViewColor;
//#endif
@@ -246,11 +249,11 @@
if (gatewayDeicve.Type == DeviceType.OnePortWirelessFR || gatewayDeicve.Type == DeviceType.OnePortMqttFR) {
Control.ControlBytesSend (Command.GotoConfigMode, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, new byte [] { });
//new Alert ("", "缃戝叧宸茬粡杩涘叆閰嶉妯″紡锛岃鎵嬪姩鏂拌澶囪繘鍏ラ厤棰戞ā寮忋��", "Close").Show ();
- new Alert ("", "Searching for new devices, Please make sure all new devices are in configuration mode.", "OK").Show ();
+ new Alert ("", ErrorCode.SearchingForNewDevices, "OK").Show ();
this.AddChidren (myLoading);
//myLoading.Start ("鐐瑰嚮灞忓箷鍏抽棴閰嶉妯″紡");
- myLoading.Start ("Searching, Please touch the here to exit the searching mode.");
+ myLoading.Start (ErrorCode.SearchingExitTheSearchingMode);
//myLoading.Start ("Waiting for new device, Please touch the here to exit the waiting mode.");
this.AddChidren (btnCloseLoading);
@@ -948,7 +951,7 @@
//var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
var respone = MainPage.RequestHttps (API.BindMac, requestJson, urlHead);
- if (respone.StateCode.ToUpper () != "SUCCESS") {
+ if (respone.StateCode.ToUpper () != StateCode.SUCCESS) {
GetNowHomeGatewayAfterBindMacFailed ();//2020-01-11
Application.RunOnMainThread (() => {
new Alert ("", $"Failed to bind Mac address! {ErrorCode.Reason }{respone.StateCode}", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
@@ -1024,7 +1027,7 @@
// //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
// var respone = MainPage.RequestHttps (API.UpdateMac, requestJson, urlHead);
- // if (respone.StateCode.ToUpper () != "SUCCESS") {
+ // if (respone.StateCode.ToUpper () != StateCode.SUCCESS) {
// GetNowHomeGatewayAfterBindMacFailed ();//2020-01-11
// Application.RunOnMainThread (() => {
// new Alert ("", "Failed to update Mac address, gateway binding failed!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
@@ -1055,7 +1058,7 @@
// //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
// var respone = MainPage.RequestHttps (API.BindGatewayToHome, requestJson, urlHead);
- // if (respone.StateCode.ToUpper () != "SUCCESS" && respone.StateCode != "BindGatewaysExists") {
+ // if (respone.StateCode.ToUpper () != StateCode.SUCCESS && respone.StateCode != "BindGatewaysExists") {
// GetNowHomeGatewayAfterBindMacFailed ();//2020-01-11
// Application.RunOnMainThread (() => {
// new Alert ("", "Failed to bind Mac address, gateway binding failed!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
@@ -1092,7 +1095,7 @@
var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
- if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
+ if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
//2020-01-11
UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
@@ -1205,7 +1208,7 @@
// //var requestObj3 = new GatewayByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.Id };
// var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
// var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
- // if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
+ // if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
// var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
// var responseGatewayDataObj = infoResult.PageData;
// if (responseGatewayDataObj != null && responseGatewayDataObj.Count > 0) {
--
Gitblit v1.8.0