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/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 135 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 356fda1..ceb1fb2 100644
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 璁惧鐨勬煇涓�鍥炶矾
/// </summary>
@@ -48,22 +48,26 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍥剧墖
var btnPic = new PicViewControl(426, 426);
btnPic.Y = Application.GetRealHeight(150);
btnPic.UnSelectedImagePath = "RealDevice/ButtonPanelFangyueFreshAir.png";
btnPic.Gravity = Gravity.CenterHorizontal;
- bodyFrameLayout.AddChidren(btnPic);
+ listBackControl.frameTable.AddChidren(btnPic);
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
//鍒濆鍖栬彍鍗曡
this.InitMenuRow();
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
@@ -82,8 +86,28 @@
/// </summary>
private void InitMenuRow()
{
- this.listview.RemoveAll();
-
+ this.listview.RemoveAll();
+ //娣诲姞鏂伴鐩爣
+ this.AddFreshAirRow();
+ //PM2.5鏉ユ簮
+ //this.AddPMRow();
+ //娣诲姞娓╁害鏉ユ簮
+ //this.AddTemperatureSensorRow();
+ //娣诲姞婀垮害鏉ユ簮
+ //this.AddHumiditySourceRow();
+ //娣诲姞鏂伴鐩爣
+ //this.AddPMRow();
+ //浜害璋冭妭
+ this.AddLevelRow();
+ }
+ #endregion
+
+ #region 鈻� 鏂伴鐩爣_________________________
+ /// <summary>
+ /// 鏂伴鐩爣琛�
+ /// </summary>
+ private void AddFreshAirRow()
+ {
//鏂伴鐩爣
var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
listview.AddChidren(rowNewWind);
@@ -93,14 +117,105 @@
//鍙崇澶�
rowNewWind.AddRightArrow();
var msg = Language.StringByID(R.MyInternationalizationString.nothing);
- // 鍥炶皟鏂伴涓暟
+ // 鍥炶皟鏂伴缁戝畾鐩爣
var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
rowNewWind.ButtonClickEvent += (sender, e) =>
- {
- var form = new PanelFangyueFreshAirTargetForm();
- form.AddForm(this.deviceObj, string.Empty, 3);
+ {
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 1);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addDevicePage.Show();
};
+ }
+ #endregion
+ #region 鈻� PM2.5鏉ユ簮_________________________
+ /// <summary>
+ /// PM2.5鏉ユ簮琛�
+ /// </summary>
+ private void AddPMRow()
+ {
+ //PM2.5
+ var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowNewWind);
+ rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.PM25Source), 600);
+ //搴曠嚎
+ rowNewWind.AddBottomLine();
+ //鍙崇澶�
+ rowNewWind.AddRightArrow();
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ // 鍥炶皟PM2.5鏉ユ簮缁戝畾鐩爣
+ var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
+ rowNewWind.ButtonClickEvent += (sender, e) =>
+ {
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 4);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addDevicePage.Show();
+ };
+ }
+ #endregion
+
+ #region 鈻� 娓╁害鏉ユ簮_________________________
+ /// <summary>
+ /// 娓╁害鏉ユ簮琛�
+ /// </summary>
+ private void AddTemperatureSensorRow()
+ {
+ //娓╁害鏉ユ簮
+ var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowNewWind);
+ rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600);
+ //搴曠嚎
+ rowNewWind.AddBottomLine();
+ //鍙崇澶�
+ rowNewWind.AddRightArrow();
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ // 鍥炶皟娓╁害鏉ユ簮缁戝畾鐩爣
+ var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
+ rowNewWind.ButtonClickEvent += (sender, e) =>
+ {
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 2);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addDevicePage.Show();
+ };
+ }
+ #endregion
+
+ #region 鈻� 婀垮害鏉ユ簮_________________________
+ /// <summary>
+ /// 婀垮害鏉ユ簮琛�
+ /// </summary>
+ private void AddHumiditySourceRow()
+ {
+ //婀垮害
+ var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowNewWind);
+ rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600);
+ //搴曠嚎
+ rowNewWind.AddBottomLine();
+ //鍙崇澶�
+ rowNewWind.AddRightArrow();
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ // 鍥炶皟婀垮害鏉ユ簮缁戝畾鐩爣
+ var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
+ rowNewWind.ButtonClickEvent += (sender, e) =>
+ {
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 3);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addDevicePage.Show();
+ };
+ }
+ #endregion
+
+ #region 鈻� 浜害璋冭妭_________________________
+ /// <summary>
+ /// 浜害璋冭妭琛�
+ /// </summary>
+ private void AddLevelRow()
+ {
//浜害璋冭妭
var rowLight = new FrameRowControl(listview.rowSpace / 2);
listview.AddChidren(rowLight);
--
Gitblit v1.8.0