From 21736b2944d5e88cd705a39ff87fd73d5a16e609 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 09 五月 2020 11:06:35 +0800
Subject: [PATCH] 安川
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 8734356..84ac290 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -55,7 +55,7 @@
this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
- this.AddTopButtomRowControl("璐﹀彿GUID", 400, Common.Config.Instance.Home.MainUserDistributedMark, 900);
+ this.AddTopButtomRowControl("璐﹀彿GUID", 400, string.IsNullOrEmpty(Common.Config.Instance.Guid) == true ? Common.Config.Instance.Home.MainUserDistributedMark : Common.Config.Instance.Guid, 900);
this.AddNormalRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
@@ -66,6 +66,15 @@
this.AddNormalRowControl("鎷ユ湁杩滅▼鏉冮檺", 400, ZigBee.Device.ZbGateway.AllowRemoteCtrl == true ? "鏄�" : "鍚�", 400);
this.AddNormalRowControl("WIFI鍙橀噺", 400, Shared.Application.IsWifi == true ? "true" : "false", 400);
+
+ if (ZigBee.Common.Application.FindGateWaySocket.busSocket == null)
+ {
+ this.AddNormalRowControl("Socket閾炬帴", 400, "鏈垵濮嬪寲", 400);
+ }
+ else
+ {
+ this.AddNormalRowControl("Socket閾炬帴", 400, ZigBee.Common.Application.FindGateWaySocket.busSocket.Connected == true ? "true" : "false", 400);
+ }
int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
var row1 = new FrameRowControl(listView.rowSpace / 2);
@@ -147,6 +156,16 @@
});
};
#endif
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("璁惧缂撳瓨鍙橀噺", 500);
+ row1.AddRightArrow();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+
+ };
+
+
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.AddLeftCaption("涓婁紶Log", 500);
@@ -263,7 +282,7 @@
public override void CloseFormBefore()
{
Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = null;
- UserCenterResourse.HideOption.CheckCanReceiveGateway = 1;
+ UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
base.CloseFormBefore();
}
--
Gitblit v1.8.0