From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 18 六月 2020 16:01:14 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index 2742a12..4121ceb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -69,7 +69,7 @@
return;
}
//铏氭嫙椹卞姩鍙�
- this.listVode = await HdlGatewayLogic.Current.GetListVDDriveCode(this.zbGateway);
+ this.listVode = HdlGatewayLogic.Current.GetListVDDriveCode(this.zbGateway);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -119,7 +119,7 @@
rowLinux.ButtonClickEvent += (sender, e) =>
{
var form = new GatewayLinuxInfoForm();
- form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
+ form.AddForm(this.zbGateway.GwId);
};
//鍗忚皟鍣�
@@ -130,7 +130,7 @@
rowCoordinator.ButtonClickEvent += (sender, e) =>
{
var form = new GatewayCoordinatorInfoForm();
- form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
+ form.AddForm(this.zbGateway.GwId);
};
if (this.listVode != null)
@@ -261,6 +261,10 @@
/// </summary>
private void InitTopRightMenu()
{
+ if (UserCenterResourse.HideOption.DeviceHistory != 1)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -401,7 +405,7 @@
ProgressFormBar.Current.CloseEvent += () =>
{
//鍗囩骇瀵硅薄
- string gwId = HdlGatewayLogic.Current.GetGatewayId(realway);
+ string gwId = realway.GwId;
if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true
&& FirmwareUpdateResourse.dicUpdateList[gwId].IsFinishUpdate == true)
{
--
Gitblit v1.8.0