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/Guide/GuideSettingGateway.cs | 162 ++++++++++++++++++++++++++---------------------------
1 files changed, 79 insertions(+), 83 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
index 34288c5..2f278d8 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);
@@ -710,7 +713,7 @@
return;
}
}
- BindGatewaysNew ();
+ GotoHomePage ();
}
} catch (Exception ex) {
Utlis.WriteLine (ex.Message);
@@ -911,80 +914,73 @@
}
}
- BindGatewaysNew ();
-
+ GotoHomePage ();
}
- /// <summary>
- /// Gateway setting succeeded锛宒ata up.Please wait...
- /// 缁戝畾Mac(鍗板害鐗�)
- /// </summary>
- void BindGatewaysNew ()
- {
- Application.RunOnMainThread (() => {
- MainPage.Loading.Start ("Gateway setting succeeded锛宒ata up. Please wait...");
- });
- IO.FileUtils.SaveEquipmentMessage (gatewayDeicve);
- var gatewayMAC = gatewayDeicve.MAC.Replace (".", "");
+ ///// <summary>
+ ///// Gateway setting succeeded锛宒ata up.Please wait...
+ ///// 缁戝畾Mac(鍗板害鐗�)
+ ///// </summary>
+ //void BindGatewaysNew ()
+ //{
+ // //Application.RunOnMainThread (() => {
+ // // MainPage.Loading.Start ("Gateway setting succeeded锛宒ata up. Please wait...");
+ // //});
+ // //IO.FileUtils.SaveEquipmentMessage (gatewayDeicve);
+ // //var gatewayMAC = gatewayDeicve.MAC.Replace (".", "");
- //璧版柊鏇存柊缁戝畾鎺ュ彛
- var mBindMacObj = new BindMacObj () {
- LoginAccessToken = MainPage.LoginUser.LoginTokenString,
- HomeId = UserConfig.Instance.CurrentRegion.Id,
- MAC = gatewayMAC
+ // ////璧版柊鏇存柊缁戝畾鎺ュ彛
+ // //var mBindMacObj = new BindMacObj () {
+ // // LoginAccessToken = MainPage.LoginUser.LoginTokenString,
+ // // HomeId = UserConfig.Instance.CurrentRegion.Id,
+ // // MAC = gatewayMAC
- };
-
- string urlHead = MainPage.RequestHttpsHost;
- if (mBindMacObj.IsOtherAccountCtrl) {
- urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
- mBindMacObj.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
- }
+ // //};
+
+ // //string urlHead = MainPage.RequestHttpsHost;
+ // //if (mBindMacObj.IsOtherAccountCtrl) {
+ // // urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ // // mBindMacObj.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ // //}
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (mBindMacObj);
+ // //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (mBindMacObj);
- //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") {
- GetNowHomeGatewayAfterBindMacFailed ();//2020-01-11
- Application.RunOnMainThread (() => {
- new Alert ("", $"Failed to bind Mac address! {ErrorCode.Reason }{respone.StateCode}", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
- new Alert (respone.StateCode, respone.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- }
- });
- return;
- }
- //GetNowHomeGateway ();
- AddMacToUserConfig (gatewayMAC);
+ // ////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 () != 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 ();
+ // // if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
+ // // new Alert (respone.StateCode, respone.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // // }
+ // // });
+ // // return;
+ // //}
+ // //GetNowHomeGateway ();
- }
+ // var gatewayMAC = gatewayDeicve.MAC.Replace (".", "");
+ // AddMacToUserConfig (gatewayMAC);
+
+ //}
/// <summary>
- /// 淇敼鍒囨崲鏈湴浣忓畢 缃戝叧
+ /// 璺宠浆涓婚〉闈�
/// </summary>
- void AddMacToUserConfig (string gatewayMAC)
+ void GotoHomePage ()
{
-
- UserConfig.Instance.GatewayMAC = gatewayMAC;
- UserConfig.Instance.SaveUserConfig ();
MainPage.LoginUser.LastTime = DateTime.Now;
Application.RunOnMainThread (() => {
- bodyView.RemoveAll ();
+ this.RemoveFromParent ();
//MainPage.WiFiStatus = "CrabtreeAdd/WiFi.png";
UserMiddle.Init (true);
MainPage.WiFiStatus = "CrabtreeAdd/WiFi.png";
UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
});
-
- //Utlis.ShowAppLinkStatus (AppLinkStatus.WiFi);
-
}
-
-
///// <summary>
@@ -1024,7 +1020,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 +1051,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 ();
@@ -1072,35 +1068,35 @@
//}
- /// <summary>
- /// 缁戝畾澶辫触涔嬪悗锛屾煡璇㈠埛鏂颁竴娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃
- /// 2020-01-11
- /// </summary>
- void GetNowHomeGatewayAfterBindMacFailed ()
- {
+ ///// <summary>
+ ///// 缁戝畾澶辫触涔嬪悗锛屾煡璇㈠埛鏂颁竴娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃
+ ///// 2020-01-11
+ ///// </summary>
+ //void GetNowHomeGatewayAfterBindMacFailed ()
+ //{
- var requestObj3 = new GetSingleHomeGatewayPaggerObj ();
- requestObj3.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
- requestObj3.ReqDto.HomeId = UserConfig.Instance.CurrentRegion.Id;
- requestObj3.ReqDto.PageSetting.Page = 1;
- requestObj3.ReqDto.PageSetting.PageSize = 10;
- string urlHead = MainPage.RequestHttpsHost;
- if (requestObj3.IsOtherAccountCtrl) {
- urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
- requestObj3.ReqDto.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
- }
+ // var requestObj3 = new GetSingleHomeGatewayPaggerObj ();
+ // requestObj3.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
+ // requestObj3.ReqDto.HomeId = UserConfig.Instance.CurrentRegion.Id;
+ // requestObj3.ReqDto.PageSetting.Page = 1;
+ // requestObj3.ReqDto.PageSetting.PageSize = 10;
+ // string urlHead = MainPage.RequestHttpsHost;
+ // if (requestObj3.IsOtherAccountCtrl) {
+ // urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ // requestObj3.ReqDto.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ // }
- var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
- var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
- if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
- var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
- //2020-01-11
- UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
+ // var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
+ // var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
+ // if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
+ // var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
+ // //2020-01-11
+ // UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
- }
+ // }
- }
+ //}
#region 2020-07-02
/// <summary>
@@ -1205,7 +1201,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