From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index 20457c4..127a3d1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -55,13 +55,13 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//鑾峰彇缃戝叧鏂扮増鏈俊鎭�
- this.listVersionInfo = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
+ this.listVersionInfo = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
if (listVersionInfo == null)
{
//鍏抽棴杩涘害鏉�
@@ -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);
@@ -277,7 +281,7 @@
/// </summary>
private void ShowTopRightMenu()
{
- var frame = new TopRightMenuControl(1);
+ var frame = new TopRightMenuControl(1, 2);
//鍘嗗彶鐗堟湰
var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);
frame.AddRowMenu(deviceMenu, "", "", () =>
@@ -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