From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index ce7a88e..e142e5b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -44,18 +44,27 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
bool gateWayExist = HdlGatewayLogic.Current.IsGatewayExist(zbGateway);
+ var framePic = new FrameLayout();
+ framePic.Width = Application.GetRealWidth(855);
+ framePic.Height = Application.GetRealHeight(570);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Y = Application.GetRealHeight(58);
+ listBackControl.frameTable.AddChidren(framePic);
//鍥剧墖
- var btnImage = new PicViewControl(855, 570, true);
- btnImage.Y = Application.GetRealHeight(58);
- btnImage.Gravity = Gravity.CenterHorizontal;
- HdlGatewayLogic.Current.SetRealGatewayPictrue(btnImage, zbGateway);
- bodyFrameLayout.AddChidren(btnImage);
+ var btnImage = new PicViewControl(380, 328, true);
+ btnImage.Gravity = Gravity.Center;
+ btnImage.UnSelectedImagePath = "Gateway/RealGateway.png";
+ framePic.AddChidren(btnImage);
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
- var listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);
+ var listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
//璁惧澶囨敞(濡傛灉杩欎釜缃戝叧娌℃湁缁戝畾鐨勮瘽,鍙厑璁告煡鐪�,涓嶈兘鏇存敼)
string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
@@ -102,8 +111,8 @@
btnType.AddBottomLine();
HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, zbGateway);
- //鎵�灞炲尯鍩�
- caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);
+ //鎵�灞炰綇瀹�
+ caption = Language.StringByID(R.MyInternationalizationString.uBelongResidence);
var btnBeloneArea = new FrameCaptionViewControl(caption, Common.Config.Instance.Home.Name, listview.rowSpace / 2);
btnBeloneArea.UseClickStatu = false;
listview.AddChidren(btnBeloneArea);
@@ -112,12 +121,12 @@
btnBeloneArea.AddBottomLine();
//瀹屾垚鍒濆鍖栨甯�
- tableContr.FinishInitControl(bodyFrameLayout, listview);
+ tableContr.FinishInitControl();
if (gateWayExist == true)
{
//鏇村閰嶇疆
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(49), false);
+ var btnHelp = new NormalViewControl(listBackControl.frameTable.Width, Application.GetRealHeight(49), false);
btnHelp.Y = Application.GetRealHeight(1388);
btnHelp.TextSize = 12;
btnHelp.TextAlignment = TextAlignment.Center;
@@ -128,14 +137,14 @@
var form = new GatewayManage.GatewayInfoEditorForm();
this.AddFromAndRemoveNowForm(form, zbGateway);
};
- bodyFrameLayout.AddChidren(btnHelp);
+ listBackControl.frameTable.AddChidren(btnHelp);
//搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
+ int lineWidth = btnHelp.GetRealWidthByText();
var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
+ listBackControl.frameTable.AddChidren(btnLine);
}
//瀹屾垚鎸夐挳
@@ -148,6 +157,7 @@
{
//濡傛灉杩欎釜缃戝叧杩樻病鏈夌粦瀹�,鍒欑洿鎺ュ叧闂晫闈�
this.CloseForm();
+ return;
}
//瀹屾垚鎸夐挳鎸変笅
this.FinishButtonClick(btnGateName.Text);
--
Gitblit v1.8.0