From b78a4d0ca90416d37fcbaf5e54b00f7eaab53919 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 14 十月 2019 17:03:58 +0800
Subject: [PATCH] 2019-10-14-2
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 157 ++++++++++++++++------------------------------------
1 files changed, 49 insertions(+), 108 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
index 55f2b36..d942395 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -48,47 +48,47 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_deviceMac">璁惧Mac鍦板潃</param>
- public void ShowForm(string i_deviceMac)
- {
+ /// <param name="i_deviceMac">璁惧Mac鍦板潃</param>
+ public void ShowForm(string i_deviceMac)
+ {
this.deviceMac = i_deviceMac;
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
//鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
- this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
-
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
//鍒濆鍖栧彸涓婅鑿滃崟
- this.InitTopRightMenu();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
+ this.InitTopRightMenu();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
{
//娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- //鍒濆鍖栨甯�
- this.InitFrameTable();
+ this.ClearBodyFrame();
+
+ //鍒濆鍖栨甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);
+
//鍒濆鍖栬澶囧洖璺浘鏍�
this.InitDeviceEpointIcon();
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr = null;
+
//淇濆瓨
var btnFinish = new BottomClickButton();
- //鍊熺敤Y杞村潗鏍�(璁╄繖涓尯鍩熶笉鑳界偣鍑昏彍鍗�)
- var frameBack = new FrameLayout();
- frameBack.Y = btnFinish.Yaxis;
- frameBack.Height = bodyFrameLayout.Height - btnFinish.Yaxis;
- bodyFrameLayout.AddChidren(frameBack);
-
- btnFinish.TextID = R.MyInternationalizationString.uSave;
- bodyFrameLayout.AddChidren(btnFinish);
+ btnFinish.TextID = R.MyInternationalizationString.uSave;
+ bodyFrameLayout.AddChidren(btnFinish);
btnFinish.ButtonClickEvent += async (sender, e) =>
{
//璁板綍璧峰綋鍓嶆鍦ㄦ搷浣滅殑鍥炶矾鍚嶅瓧
@@ -120,7 +120,7 @@
this.CloseProgressBar();
//鍏抽棴鑷韩
this.CloseForm();
- };
+ };
}
/// <summary>
@@ -165,56 +165,30 @@
};
//鎵�灞炲尯鍩�
- List<string> listRoomName = Common.Room.CurrentRoom.GetRoomListNameByDevice(nowSelectDevice);
- caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);
- nameValue = Common.Room.CurrentRoom.GetRoomName(listRoomName);
- var btnBeloneArea = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
- listview.AddChidren(btnBeloneArea);
- btnBeloneArea.InitControl();
+ var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
+ listview.AddChidren(rowBeloneArea);
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), nowSelectDevice);
//搴曠嚎
- btnBeloneArea.AddBottomLine();
- //鍙崇澶�
- btnBeloneArea.AddRightIconControl();
- btnBeloneArea.ButtonClickEvent += (sender, e) =>
+ rowBeloneArea.AddBottomLine();
+ rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
- var form = new SelectRoomForm();
- form.AddForm(listRoomName);
- form.ActionSelectRoom = (list) =>
- {
- //鍙樻洿鎴块棿
- Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, list);
-
- btnBeloneArea.Text = Common.Room.CurrentRoom.GetRoomName(list);
- listRoomName.Clear();
- listRoomName.AddRange(list);
- };
- };
+ //鍙樻洿鎴块棿
+ Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);
+ };
//娣诲姞缁戝畾鐩爣琛�
this.AddBindRow();
//娣诲姞鑳屽厜鐏
this.AddBackLightRow();
-
- //鍊熺敤Y杞村潗鏍�
- var btnTemp = new BottomClickButton();
- var realHeight = listview.GetChildren(0).Height * listview.ChildrenCount;
- if (bodyFrameLayout.Height - btnTemp.Yaxis + realHeight > listview.Height)
- {
- //淇冧娇琚尅浣忕殑鑿滃崟鑳藉鍚戜笂婊戝姩
- var frameTemp = new FrameLayout();
- frameTemp.Height = bodyFrameLayout.Height - btnTemp.Yaxis + Application.GetRealHeight(115);
- listview.AddChidren(frameTemp);
- }
- btnTemp = null;
}
#endregion
- #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
+ #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
/// <summary>
/// 鍒濆鍖栧彸涓婅鑿滃崟
- /// </summary>
+ /// </summary>
private void InitTopRightMenu()
{
var btnIcon = new MostRightIconControl(69, 69);
@@ -226,11 +200,11 @@
//鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
this.ShowTopRightMenu();
});
- }
-
+ }
+
/// <summary>
/// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
- /// </summary>
+ /// </summary>
private void ShowTopRightMenu()
{
int menuCount = 1;
@@ -278,9 +252,14 @@
//搴曠嚎
btnBind.AddBottomLine();
//鍙崇澶�
- btnBind.AddRightIconControl();
+ btnBind.AddRightArrow();
btnBind.ButtonClickEvent += (sender, e) =>
{
+ var panel = nowSelectDevice as ZigBee.Device.Panel;
+ var bindTargetsPage = new Shared.Phone.UserCenter.DeviceBind.BindTargetsPage(panel);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(bindTargetsPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ bindTargetsPage.Show();
};
}
}
@@ -305,7 +284,7 @@
//搴曠嚎
btnLight.AddBottomLine();
//鍙崇澶�
- btnLight.AddRightIconControl();
+ btnLight.AddRightArrow();
btnLight.ButtonClickEvent += (sender, e) =>
{
var form = new PanelBackLightSettionForm();
@@ -528,44 +507,6 @@
frameBack.AddChidren(frame4);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame4, listDevice[3], false);
- }
-
- #endregion
-
- #region 鈻� 鍒濆鍖栨甯僟________________________
-
- /// <summary>
- /// 鍒濆鍖栨甯�
- /// </summary>
- private void InitFrameTable()
- {
- //寮у害鐨勫渾鐨勪竴鍗婄殑楂樺害(鍥哄畾)
- int halfRoundHeigth = Application.GetRealHeight(116) / 2;
- //寮у害鐨勫渾
- var btnRound = new NormalViewControl(bodyFrameLayout.Width, halfRoundHeigth * 2, false);
- btnRound.Y = Application.GetRealHeight(708);
- btnRound.BackgroundColor = UserCenterColor.Current.White;
- btnRound.Radius = (uint)halfRoundHeigth;
- bodyFrameLayout.AddChidren(btnRound);
- //鏄庣粏鍒楄〃鐨勬甯冿紝鐧借壊鑳屾櫙(瑕嗙洊寮у害鐨勫渾鐨勫崐杈�)
- var detailBackFrame = new FrameLayout();
- detailBackFrame.Y = btnRound.Bottom - btnRound.Height / 2;
- detailBackFrame.Height = Application.GetRealHeight(1028);//楂樺害灏辨槸瑕佸畠瓒呰繃
- detailBackFrame.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(detailBackFrame);
-
- //璁惧缂栬緫
- var btnTile = new NormalViewControl(800, 60, true);
- btnTile.X = ControlCommonResourse.XXLeft;
- btnTile.TextSize = 15;
- btnTile.TextColor = UserCenterColor.Current.TextColor2;
- btnTile.TextID = R.MyInternationalizationString.uDeviceEditor;
- detailBackFrame.AddChidren(btnTile);
-
- this.listview = new VerticalListControl(12);
- listview.Y = btnTile.Bottom + Application.GetRealHeight(17);
- listview.Height = Application.GetRealHeight(1028) - halfRoundHeigth - btnTile.Bottom - Application.GetRealHeight(17);
- detailBackFrame.AddChidren(listview);
}
#endregion
--
Gitblit v1.8.0