From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本

---
 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index d26382c..429fcee 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -52,11 +52,17 @@
 
             this.AddRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
 
+            this.AddRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 700);
+
+            this.AddRowControl("璐﹀彿GUID", 400, Common.Config.Instance.Home.MainUserDistributedMark, 700);
+
             this.AddRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
 
             this.AddRowControl("璐﹀彿绫诲瀷", 400, Common.Config.Instance.Home.AccountType.ToString(), 400);
 
-            this.AddRowControl("鏄惁杩滅▼杩炴帴", 400, ZigBee.Device.ZbGateway.IsRemote == true ? "鏄�" : "鍚�", 400);
+            this.AddRowControl("杩滅▼杩炴帴", 400, ZigBee.Device.ZbGateway.IsRemote == true ? "鏄�" : "鍚�", 400);
+
+            this.AddRowControl("鎷ユ湁杩滅▼鏉冮檺", 400, ZigBee.Device.ZbGateway.AllowRemoteCtrl == true ? "鏄�" : "鍚�", 400);
 
             int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
             var row1 = new FrameRowControl(listView.rowSpace / 2);

--
Gitblit v1.8.0