From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index 0fe5eaa..70dd808 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -125,7 +125,7 @@
//璁惧绫诲瀷 (鍥哄畾鏅鸿兘缃戝叧)
caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
- var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("1");
+ var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("1");
var btnType = new FrameCaptionViewControl(caption, infoContent != null ? infoContent.A绫诲瀷鍚嶅瓧 : string.Empty, listview.rowSpace / 2);
btnType.UseClickStatu = false;
listview.AddChidren(btnType);
@@ -160,12 +160,12 @@
btnHelp.ButtonClickEvent += (sender, e) =>
{
var form = new GatewayManage.GatewayInfoEditorForm();
- this.AddFormAndCloseNowForm(form, zbGateway);
+ this.AddFromAndRemoveNowForm(form, zbGateway);
};
listBackControl.frameTable.AddChidren(btnHelp);
//搴曠嚎
int lineWidth = btnHelp.GetRealWidthByText();
- var btnLine = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
@@ -243,7 +243,7 @@
//鍏抽棴鑷韩
this.CloseForm();
//鏄惁鏄富椤垫坊鍔�
- if (HdlFormLogic.Current.IsFormOpen("GatewayListForm") == false)
+ if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
{
var form = new GatewayAddSuccessForm();
form.AddForm();
--
Gitblit v1.8.0