From 281f7d0b8a363a3ed4d6f83bb5fa22bb6d0340f3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 08 一月 2021 16:20:13 +0800
Subject: [PATCH] 2021-01-08 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
index 3462211..ea6871a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
@@ -284,6 +284,8 @@
};
EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+ //璺宠浆涔嬪墠鍏堢粦瀹欰PP
+
MainPage.Loading.Start ("Please wait...");
bool needHide = true;
new System.Threading.Thread (() => {
@@ -300,8 +302,14 @@
bool goNext = false;
System.Threading.Tasks.Task.Run (() => {
try {
-
+ //
goNext = CheckIfGoNext (common);
+ if (goNext) {
+ //鍏堥噸缃�
+ goNext = false;
+ //缃戝叧鐗堟湰绗﹀悎瑕佹眰锛屽垽鏂槸鍚︾粦瀹氱綉鍏虫垚鍔�,缁戝畾鎴愬姛浜嗘墠鑳借繘琛屼笅涓�姝�
+ goNext = CheckIfBindGatewaySuccess (common);
+ }
} catch (Exception ex) {
Utlis.WriteLine (ex.Message);
@@ -342,7 +350,46 @@
}
}
+ /// <summary>
+ /// 妫�娴嬫槸鍚︾粦瀹氱綉鍏虫垚鍔�
+ /// </summary>
+ /// <returns></returns>
+ static bool CheckIfBindGatewaySuccess (GatewayBase gatewayBase)
+ {
+ try {
+ if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
+ //涔嬪墠缁戝畾杩囩綉鍏筹紝骞朵笖鍜屽綋鍓嶆悳绱㈠埌鍒扮綉鍏充竴鑷�
+ if (UserConfig.Instance.HomeGateway.mac.ToUpper () == gatewayBase.MAC.Replace (".", "").ToUpper ()) {
+ return true;
+ }
+ }
+ var gatewayMAC = gatewayBase.MAC.Replace (".", "");
+ //閲嶆柊缁戝畾
+ var bindGatewayObj = new BindGatewayObj () {
+ homeId = UserConfig.Instance.CurrentRegion.Id,
+ subnetId = gatewayBase.sceneID,
+ deviceId = gatewayBase.DeviceID,
+ gatewayType = GatewayType.BUSUDPGATEWAY.ToString (),
+ mac = gatewayMAC
+ };
+ var revertObj = HttpServerRequest.Current.BindGateway (bindGatewayObj);
+ if (revertObj.Code == StateCode.SUCCESS) {
+ var homeGatewayInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<HomeGatewayInfo> (revertObj.Data.ToString ());
+ if (homeGatewayInfo != null && !string.IsNullOrEmpty (homeGatewayInfo.gatewayId)) {
+ //缁戝畾缃戝叧鎴愬姛锛屽苟涓旀垚鍔熻幏鍙栧埌鏂扮粦瀹氱殑gatewayId
+ UserConfig.Instance.HomeGateway = homeGatewayInfo;
+ UserConfig.Instance.SaveUserConfig ();
+ return true;
+ }
+ } else {
+ IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
+ }
+ } catch {
+
+ }
+ return false;
+ }
static bool inThisView = false;
--
Gitblit v1.8.0