From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
index 71524d2..3e38a1c 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
@@ -29,7 +29,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
#endregion
@@ -70,23 +70,25 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 418, 1319);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1319);
//鍥剧墖
var btnPic = new DeviceInfoIconControl();
btnPic.Y = Application.GetRealHeight(46);
btnPic.Gravity = Gravity.CenterHorizontal;
- bodyFrameLayout.AddChidren(btnPic);
+ listBackControl.frameTable.AddChidren(btnPic);
btnPic.InitControl(device.DeviceAddr, device.DeviceEpoint);
btnPic.ButtonClickEvent += (sender, e) =>
{
- var localPic = new Device.CommonForm.DeviceIconSelectedIMGByLocal();
- UserView.HomePage.Instance.AddChidren(localPic);
- UserView.HomePage.Instance.PageIndex += 1;
- localPic.Show();
- localPic.action = (unSelectedImagePath, selectedImagePath) =>
+ var form = new SelectLocalDeviceImageForm();
+ form.AddForm();
+ form.FinishSelectEvent = (unSelectedImagePath) =>
{
//鍙樻洿鍥剧墖
device.IconPath = unSelectedImagePath;
@@ -105,7 +107,7 @@
btnBelongType.TextID = infoType.BeloneTextId;
btnBelongType.TextSize = 15;
btnBelongType.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(btnBelongType);
+ listBackControl.frameTable.AddChidren(btnBelongType);
//鍔熻兘鍚嶇О
string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
@@ -147,7 +149,7 @@
}
//鎵�灞炴ā鍧�
- caption = Language.StringByID(R.MyInternationalizationString.BelongModel);
+ caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
deviceName = Common.LocalDevice.Current.GetDeviceMacName(device);
var rowBelongModul = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
listview.AddChidren(rowBelongModul);
@@ -159,7 +161,7 @@
this.AddFunctionTypeRowByAdmin(btnBelongType);
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
@@ -194,15 +196,19 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 418, 1319);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1319);
//鍥剧墖
var btnPic = new DeviceInfoIconControl();
btnPic.Y = Application.GetRealHeight(92);
btnPic.Gravity = Gravity.CenterHorizontal;
- bodyFrameLayout.AddChidren(btnPic);
+ listBackControl.frameTable.AddChidren(btnPic);
btnPic.InitControl(device.DeviceAddr, device.DeviceEpoint);
//璁惧鎵�灞炵被鍨�
@@ -213,7 +219,7 @@
btnBelongType.TextID = infoType.BeloneTextId;
btnBelongType.TextSize = 15;
btnBelongType.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(btnBelongType);
+ listBackControl.frameTable.AddChidren(btnBelongType);
//鍔熻兘鍚嶇О
string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
@@ -240,7 +246,7 @@
}
//鎵�灞炴ā鍧�
- caption = Language.StringByID(R.MyInternationalizationString.BelongModel);
+ caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
nameValue = Common.LocalDevice.Current.GetDeviceMacName(device);
var rowBelongModul = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
rowBelongModul.UseClickStatu = false;
@@ -253,7 +259,7 @@
this.AddFunctionTypeRowByMember();
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
}
@@ -311,6 +317,7 @@
var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);
var form = new BottomItemSelectForm();
+ form.SelectRowCanCancel = false;//閫夋嫨鐨勪笉鑳藉彇娑�
form.AddForm(title, listText, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
@@ -351,6 +358,20 @@
};
}
}
+
+ //濡傛灉鏄柊椋�
+ if (device.Type == DeviceType.FreshAir)
+ {
+ //鍔熻兘绫诲瀷
+ string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType);
+ string strType = Language.StringByID(R.MyInternationalizationString.FreshAir);
+ var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
+ btnFunction.UseClickStatu = false;
+ listview.AddChidren(btnFunction);
+ btnFunction.InitControl();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ }
}
/// <summary>
--
Gitblit v1.8.0