From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
index 55cce79..fcebab3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
@@ -92,36 +92,40 @@
var btnMac = rowMac.AddMostRightView("", 600);
rowMac.AddBottomLine();
- //鍗忚鍣ㄤ俊閬�
- var rowChannel = new FrameRowControl(listView.rowSpace / 2);
- rowChannel.UseClickStatu = false;
- listView.AddChidren(rowChannel);
- rowChannel.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorChannel), 300);
- var btnChannel = rowChannel.AddMostRightView("", 600);
- rowChannel.AddBottomLine();
-
- //鍗忚鍣≒anID
- var rowPanid = new FrameRowControl(listView.rowSpace / 2);
- rowPanid.UseClickStatu = false;
- listView.AddChidren(rowPanid);
- rowPanid.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorPanid), 300);
- var btnPanId = rowPanid.AddMostRightView("", 600);
- rowPanid.AddBottomLine();
-
- //鍒堕�犲晢
- var rowProtuct = new FrameRowControl(listView.rowSpace / 2);
- rowProtuct.UseClickStatu = false;
- listView.AddChidren(rowProtuct);
- rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
- rowProtuct.AddMostRightView("HDL", 600);
-
- listView.AdjustRealHeight(Application.GetRealHeight(23));
-
- HdlThreadLogic.Current.RunThread(() =>
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉挎垨鑰呰櫄鎷熶綇瀹�,鍒欎笉澶勭悊
+ if (Common.Config.Instance.Home.IsShowTemplate == false
+ && Common.Config.Instance.Home.IsVirtually == false)
{
- //鑾峰彇缃戝叧鏁版嵁
- this.GetGatewayData(i_gateway, btnMac, btnChannel, btnPanId);
- });
+ //鍗忚鍣ㄤ俊閬�
+ var rowChannel = new FrameRowControl(listView.rowSpace / 2);
+ rowChannel.UseClickStatu = false;
+ listView.AddChidren(rowChannel);
+ rowChannel.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorChannel), 300);
+ var btnChannel = rowChannel.AddMostRightView("", 600);
+ rowChannel.AddBottomLine();
+
+ //鍗忚鍣≒anID
+ var rowPanid = new FrameRowControl(listView.rowSpace / 2);
+ rowPanid.UseClickStatu = false;
+ listView.AddChidren(rowPanid);
+ rowPanid.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorPanid), 300);
+ var btnPanId = rowPanid.AddMostRightView("", 600);
+ rowPanid.AddBottomLine();
+
+ //鍒堕�犲晢
+ var rowProtuct = new FrameRowControl(listView.rowSpace / 2);
+ rowProtuct.UseClickStatu = false;
+ listView.AddChidren(rowProtuct);
+ rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
+ rowProtuct.AddMostRightView("骞垮窞娌充笢绉戞妧鏈夐檺鍏徃", 600);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇缃戝叧鏁版嵁
+ this.GetGatewayData(i_gateway, btnMac, btnChannel, btnPanId);
+ });
+ }
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
}
#endregion
@@ -145,7 +149,7 @@
if (strMac == null)
{
//鍏抽棴杩涘害鏉�
- this.CloseProgressBar(ShowReLoadMode.YES);
+ this.CloseProgressBar();
return;
}
//鍗忚皟鍣ㄤ俊閬�
@@ -153,7 +157,7 @@
if (intChannel == -1)
{
//鍏抽棴杩涘害鏉�
- this.CloseProgressBar(ShowReLoadMode.YES);
+ this.CloseProgressBar();
return;
}
//鍗忚皟鍣≒anId
@@ -161,7 +165,7 @@
if (intPanId == -1)
{
//鍏抽棴杩涘害鏉�
- this.CloseProgressBar(ShowReLoadMode.YES);
+ this.CloseProgressBar();
return;
}
//鍏抽棴杩涘害鏉�
--
Gitblit v1.8.0