From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index 68597f2..e142e5b 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -44,6 +44,10 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
bool gateWayExist = HdlGatewayLogic.Current.IsGatewayExist(zbGateway);
var framePic = new FrameLayout();
@@ -51,7 +55,7 @@
framePic.Height = Application.GetRealHeight(570);
framePic.Gravity = Gravity.CenterHorizontal;
framePic.Y = Application.GetRealHeight(58);
- bodyFrameLayout.AddChidren(framePic);
+ listBackControl.frameTable.AddChidren(framePic);
//鍥剧墖
var btnImage = new PicViewControl(380, 328, true);
btnImage.Gravity = Gravity.Center;
@@ -60,7 +64,7 @@
//鍒濆鍖栨甯�
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);
@@ -117,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;
@@ -133,14 +137,14 @@
var form = new GatewayManage.GatewayInfoEditorForm();
this.AddFromAndRemoveNowForm(form, zbGateway);
};
- bodyFrameLayout.AddChidren(btnHelp);
+ listBackControl.frameTable.AddChidren(btnHelp);
//搴曠嚎
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);
}
//瀹屾垚鎸夐挳
--
Gitblit v1.8.0