From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index b07d110..083fb29 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -130,8 +130,7 @@
btnBeloneArea.AddBottomLine();
//mini缃戝叧鏈変釜鍔熻兘璁剧疆
- var linuxImageType = this.zbGateway.LinuxImageType;
- if (linuxImageType == 11)
+ if (HdlGatewayLogic.Current.IsMiniGateway(this.zbGateway) == true)
{
var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(this.zbGateway.GwId);
CommonDevice miniDevice = null;
@@ -314,7 +313,7 @@
&& Common.Config.Instance.Home.IsShowTemplate == false
&& Common.Config.Instance.Home.IsVirtually == false)
{
- //menuCount++;
+ menuCount++;
}
var frame = new TopRightMenuControl(menuCount, 1);
//瀹氫綅
@@ -370,14 +369,16 @@
});
});
}
- //if (canAddReplaceMenu == true)
- //{
- // //鏇挎崲
- // MenuName = Language.StringByID(R.MyInternationalizationString.uReplace);
- // frame.AddRowMenu(MenuName, null, "Item/ReplaceIconSelected.png", () =>
- // {
- // });
- //}
+ if (canAddReplaceMenu == true)
+ {
+ //鏇挎崲
+ MenuName = Language.StringByID(R.MyInternationalizationString.uReplace);
+ frame.AddRowMenu(MenuName, null, "Item/ReplaceIconSelected.png", () =>
+ {
+ var form = new GatewayReplaceForm();
+ form.AddForm(this.zbGateway);
+ });
+ }
}
#endregion
--
Gitblit v1.8.0