From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs | 183 ++++++++++++++++++---------------------------
1 files changed, 72 insertions(+), 111 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
index c1221c9..46ead4f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -1,10 +1,11 @@
-锘縰sing System;
+锘縰sing Shared.Common;
+using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using ZigBee.Device;
-namespace Shared.Phone.UserCenter.DeviceRelay
+namespace Shared.Phone.UserCenter.Device
{
/// <summary>
/// 璁惧骞叉帴鐐归厤缃�
@@ -30,9 +31,9 @@
/// </summary>
private FrameCaptionInputControl btnDeviceName = null;
/// <summary>
- /// 璁惧Mac鍦板潃
+ /// 璁惧鐨勬煇涓�鍥炶矾
/// </summary>
- private string deviceMac = string.Empty;
+ private CommonDevice deviceObj = null;
/// <summary>
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
/// </summary>
@@ -41,6 +42,10 @@
/// 璁惧鍏蜂綋绫诲瀷鐨勪俊鎭�
/// </summary>
private DeviceEnumInfo deviceEnumInfo = null;
+ /// <summary>
+ /// 淇℃伅缂栬緫鎺т欢
+ /// </summary>
+ private InformationEditorControl tableContr = null;
#endregion
@@ -49,11 +54,11 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_deviceMac">璁惧Mac鍦板潃</param>
- public void ShowForm(string i_deviceMac)
+ /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
+ public void ShowForm(CommonDevice i_device)
{
- this.deviceMac = i_deviceMac;
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ this.deviceObj = i_device;
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
//鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
@@ -76,18 +81,14 @@
this.ClearBodyFrame();
//鍒濆鍖栨甯�
- this.InitFrameTable();
+ this.tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 562, 1175);
+
//鍒濆鍖栬澶囧洖璺浘鏍�
this.InitDeviceEpointIcon();
//淇濆瓨
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.ButtonClickEvent += async (sender, e) =>
@@ -98,7 +99,7 @@
this.ShowProgressBar();
foreach (var epoint in dicDeviceSaveName.Keys)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceMac, epoint);
+ var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
if (device == null || dicDeviceSaveName[epoint] == string.Empty)
{
//涓嶈兘鍏佽绌虹櫧鍚嶅瓧
@@ -166,29 +167,15 @@
};
//鎵�灞炲尯鍩�
- 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.AddRightArrow();
- 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);
- };
+ //鍙樻洿鎴块棿
+ HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
};
//3璺户鐢靛櫒鎴栬��1璺皟鍏夊櫒绗竷鍥炶矾鐨勯厤缃俊鎭�
@@ -205,7 +192,7 @@
//杩欓噷鍏堝幓鑾峰彇瀹冪殑骞叉帴鐐圭被鍨�
this.ShowProgressBar();
//鑾峰彇绗竷鍥炶矾鐨勯厤缃俊鎭�
- listRelayInfo7 = await HdlPanelLogic.Current.GetDryContactConfigureInfo(nowSelectDevice);
+ listRelayInfo7 = await HdlDevicePanelLogic.Current.GetDryContactConfigureInfo(nowSelectDevice);
if (listRelayInfo7 == null)
{
//鍏抽棴杩涘害鏉�
@@ -223,18 +210,8 @@
this.AddBindRow(listRelayInfo7);
//娣诲姞鑳屽厜鐏
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;
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl(bodyFrameLayout, this.listview);
}
#endregion
@@ -246,6 +223,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -266,11 +248,11 @@
string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
- if (canTest == true)
- {
- menuCount = 2;
- }
- var frame = new TopRightMenuControl(this, menuCount);
+ //if (canTest == true)
+ //{
+ // menuCount = 2;
+ //}
+ var frame = new TopRightMenuControl(menuCount, 1);
if (canTest == true)
{
//瀹氫綅
@@ -283,10 +265,10 @@
}
//鍒犻櫎
- deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
- frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
- {
- });
+ //deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
+ //frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
+ //{
+ //});
}
#endregion
@@ -337,7 +319,7 @@
//鏍囬:閫夋嫨骞叉帴鐐瑰姛鑳�
var title = Language.StringByID(R.MyInternationalizationString.uSelectDryContactFunction);
- var form = new BottomDialogSelectForm();
+ var form = new BottomItemSelectForm();
form.AddForm(title, listText, nowSelectNo);
form.FinishSelectEvent += async (selectNo) =>
{
@@ -353,7 +335,7 @@
//閫夋嫨鐨勬槸浼犳劅鍣ㄨ緭鍏�
value = 65535;
}
- var result = await HdlPanelLogic.Current.EditorDryContactFunction((Panel)nowSelectDevice, value);
+ var result = await HdlDevicePanelLogic.Current.EditorDryContactThirdFunction((Panel)nowSelectDevice, value);
if (result == true)
{
//閲嶆柊鍒濆鍖栬彍鍗曡,闅愯棌鎴栬�呭紑鏀剧粦瀹氱洰鏍囪彍鍗�
@@ -400,6 +382,11 @@
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();
};
}
}
@@ -414,7 +401,7 @@
private void AddBackLightRow()
{
//涓夎矾缁х數鍣�,鎴栬�呬竴璺皟鍏夊櫒 鐨勬椂鍊欐墠鑳藉紑鍚閫夐」
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
if (myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad
@@ -431,8 +418,8 @@
btnLight.AddRightArrow();
btnLight.ButtonClickEvent += (sender, e) =>
{
- var form = new RelayThreeLoadBackLightSettionForm();
- form.AddForm(deviceMac);
+ var form = new DeviceRelay.RelayThreeLoadBackLightSettionForm();
+ form.AddForm(deviceObj.DeviceAddr);
};
}
}
@@ -454,7 +441,8 @@
frameBorder.Gravity = Gravity.CenterHorizontal;
frameBorder.Width = Application.GetRealWidth(887);
frameBorder.Height = Application.GetRealHeight(423);
- frameBorder.BorderWidth = (uint)Application.GetMinRealAverage(3);
+ frameBorder.Radius = (uint)Application.GetRealHeight(6);
+ frameBorder.BorderWidth = 1;
frameBorder.BorderColor = 0xffd0d0d0;
bodyFrameLayout.AddChidren(frameBorder);
@@ -484,7 +472,7 @@
frame.Height = Application.GetMinRealAverage(124);
frameBack.AddChidren(frame);
//鍒濆鍖栦竴琛岃澶囧浘鏍�
- this.InitDeviceIconFrame(frame, listIcon[i], i == 0, ref index);
+ this.InitDeviceIconFrame(frame, listIcon[i], ref index);
if (listIcon.Count == 1)
{
@@ -513,10 +501,9 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="listDevice"></param>
- /// <param name="isFirstRow"></param>
/// <param name="index"></param>
/// <returns></returns>
- private void InitDeviceIconFrame(FrameLayout frame, List<CommonDevice> listDevice, bool isFirstRow, ref int index)
+ private void InitDeviceIconFrame(FrameLayout frame, List<CommonDevice> listDevice, ref int index)
{
NormalViewControl btnTemp = null;
//闂磋窛
@@ -529,7 +516,7 @@
btnIcon.Name = "btn" + listDevice[i].DeviceEpoint;
btnIcon.X = defultXX + i * (frame.Height + space);
btnIcon.Radius = (uint)frame.Height / 2;
- btnIcon.BorderWidth = (uint)Application.GetMinRealAverage(6);
+ btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
btnIcon.TextAlignment = TextAlignment.Center;
btnIcon.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -539,12 +526,12 @@
//鐐瑰嚮浜嬩欢
btnIcon.ButtonClickEvent += this.DeviceEpointSelectEvent;
- if (i == 0 && isFirstRow == true)
+ if (listDevice[i].DeviceEpoint == deviceObj.DeviceEpoint)
{
btnTemp = btnIcon;
}
}
- if (isFirstRow == true)
+ if (btnTemp != null)
{
//鍒濆鍖栬彍鍗曡
this.DeviceEpointSelectEvent(btnTemp, null);
@@ -557,7 +544,8 @@
/// <returns></returns>
private List<List<CommonDevice>> GetAllDeviceGroup()
{
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ bool hadDevice = false;
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
var listRelay = new List<CommonDevice>();
foreach (var device in listDevice)
{
@@ -565,6 +553,11 @@
{
//鍙骞叉帴鐐�
listRelay.Add(device);
+ if (device.DeviceEpoint == deviceObj.DeviceEpoint)
+ {
+ //鑳藉鍖归厤寰楀埌杩欎釜鍥炶矾
+ hadDevice = true;
+ }
}
}
//鎺掑簭
@@ -576,6 +569,12 @@
}
return -1;
});
+ if (hadDevice == false)
+ {
+ //濡傛灉鍖归厤涓嶅埌杩欎釜鍥炶矾,鍒欓粯璁ょ涓�涓�
+ this.deviceObj = listRelay[0];
+ }
+
//浠庝笅寰�涓�4涓负涓�缁�
var listIcon = new List<List<CommonDevice>>();
var listTemp = new List<CommonDevice>();
@@ -593,44 +592,6 @@
listIcon.Insert(0, listTemp);
}
return listIcon;
- }
-
- #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(562);
- 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(1175);//楂樺害灏辨槸瑕佸畠瓒呰繃
- 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(1175) - halfRoundHeigth - btnTile.Bottom - Application.GetRealHeight(17);
- detailBackFrame.AddChidren(listview);
}
#endregion
@@ -665,7 +626,7 @@
nowContr.TextColor = UserCenterColor.Current.TextColor1;
nowSelectControl = nowContr;
- nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceMac, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
+ nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
//閲嶆柊鍒濆鍖栬彍鍗曡
this.InitMenuRow();
--
Gitblit v1.8.0