From e5f993f52e09eb46878baced83bb8492f147d41c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 17:58:40 +0800
Subject: [PATCH] 2019-11-04-1
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 307 ++++++++++++++++++++++++++++----------------------
1 files changed, 172 insertions(+), 135 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
old mode 100755
new mode 100644
index 9ed8a71..127e178
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -543,7 +543,7 @@
/// <param name="selectedBtn">閫変腑閭ｄ釜鐣岄潰 0--鍔熻兘 1--鍦烘櫙 2--鑷姩鍖� </param>
public void Show(int selectedBtn = 1)
{
-
+
ZbGateway.StatusList.Add(this);
RemoveAll();
@@ -585,7 +585,7 @@
var midFL = new FrameLayout
{
Y = topView.Bottom,
- Height = Application.GetRealHeight(CommonPage.AppRealHeight - CommonPage.TabbarHeight) - topView.Bottom,
+ Height = Application.GetRealHeight(1549),
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
};
AddChidren(midFL);
@@ -596,18 +596,17 @@
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
};
midFL.AddChidren(functionSceneAutoBG);
- //鍔熻兘
- functionBtn = new ButtonLineForm(CommonFormResouce.X_Left, 34, 150, 68);
- functionSceneAutoBG.AddChidren(functionBtn);
- functionBtn.Init();
- functionBtn.SetTitle(R.MyInternationalizationString.Function);
//鍦烘櫙
- sceneBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 + 20, 34, 150, 68);
+ sceneBtn = new ButtonLineForm(CommonFormResouce.X_Left, 34, 150, 68);
functionSceneAutoBG.AddChidren(sceneBtn);
sceneBtn.Init();
sceneBtn.SetTitle(R.MyInternationalizationString.Scence);
-
+ //鍔熻兘
+ functionBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 + 20, 34, 150, 68);
+ functionSceneAutoBG.AddChidren(functionBtn);
+ functionBtn.Init();
+ functionBtn.SetTitle(R.MyInternationalizationString.Function);
//鑷姩鍖�
automationBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 * 2 + 20, 34, 150, 68);
automationBtn.Init();
@@ -748,6 +747,12 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void AutomationBtn_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
{
+ ///绗竴娆¤繘鏉ュ垵濮嬪寲璁惧鍒楄〃锛�
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
functionBtn.IsSelected = false;
sceneBtn.IsSelected = false;
automationBtn.IsSelected = true;
@@ -824,6 +829,7 @@
else if (automationBtn.IsSelected)
{
ShowAutotion();
+
}
}
@@ -895,11 +901,10 @@
deviceListScrolView = new VerticalScrolViewLayout
{
X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Y = functionTypeScrowView.Bottom + Application.GetRealHeight(50),
+ Y = Application.GetRealHeight(35+275),
Width = Application.GetRealWidth(1028),
- Height = functionSceneBodyView.Height - Application.GetRealHeight(279 + 50) - 1,
+ Height = Application.GetRealHeight(938) - 1,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
-
};
functionSceneBodyView.AddChidren(deviceListScrolView);
tempFunctionTypeBtn = new FunctionButton();
@@ -987,18 +992,18 @@
var deviceTypeRowLayout = new RowLayout()
{
- Height = Application.GetRealHeight(127 + 35),
+ Height = Application.GetRealHeight(129 + 35),
LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
deviceListScrolView.AddChidren(deviceTypeRowLayout);
- var deviceRow = new FunctionRow(0, 35);
+ var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
deviceRow.SetStatu(light.IsOnline == 1);
+ deviceRow.SetZoneText(deviceUI.GetZone());
deviceTypeRowLayout.AddChidren(deviceRow);
-
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
{
@@ -1007,6 +1012,7 @@
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
(send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+ deviceRow.IsSelected = (send2 as Button).IsSelected;
if ((send2 as Button).IsSelected)
{
light.SwitchControl(1);
@@ -1028,6 +1034,15 @@
DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
}
});
+ };
+
+ deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+ {
+ var lightControl = new Phone.Device.Light.LightControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1080,10 +1095,11 @@
};
deviceListScrolView.AddChidren(deviceTypeRowLayout);
- var deviceRow = new FunctionRow(0, 35);
+ var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
deviceRow.SetStatu(airSwitch.IsOnline == 1);
+ deviceRow.SetZoneText(deviceUI.GetZone());
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1115,6 +1131,15 @@
DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
}
});
+ };
+
+ deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+ {
+ var lightControl = new Phone.Device.Light.LightControl();
+ UserView.HomePage.Instance.AddChidren(lightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ lightControl.action = RefreshBodyView;
+ lightControl.Show(deviceUI, room);
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1163,16 +1188,17 @@
var deviceTypeRowLayout = new RowLayout()
{
- Height = Application.GetRealHeight(127 + 35),
+ Height = Application.GetRealHeight(129 + 35),
LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
deviceListScrolView.AddChidren(deviceTypeRowLayout);
- var deviceRow = new FunctionRow(0, 35);
+ var deviceRow = new CategoryFunctionRow(0, 35);
deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
deviceRow.SetStatu(dimmableLight.IsOnline == 1);
+ deviceRow.SetZoneText(deviceUI.GetZone());
deviceTypeRowLayout.AddChidren(deviceRow);
deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1204,6 +1230,16 @@
DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
}
});
+ };
+
+ deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+ {
+ var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
+ UserView.HomePage.Instance.AddChidren(dimmableLightControl);
+ UserView.HomePage.Instance.PageIndex += 1;
+ UserView.HomePage.Instance.ScrollEnabled = false;
+ dimmableLightControl.action = RefreshBodyView;
+ dimmableLightControl.Show(deviceUI, room);
};
var editBtn = new CommonForm.RowLayoutEditButton()
@@ -1411,7 +1447,7 @@
}
else
{
-
+
}
}
};
@@ -1434,13 +1470,15 @@
typeRowLayout.AddChidren(functionTypeIMG);
functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
-
+
if (deviceType == room.DeviceUIList[0].CommonDevice.Type)
{
ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
}
}
+
+
}
}
@@ -1452,7 +1490,7 @@
var roomFL = new HorizontalScrolViewLayout()
{
X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Height = Application.GetRealHeight(167),
+ Height = Application.GetRealHeight(170),
Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonFormResouce.X_Left),
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
};
@@ -1462,7 +1500,7 @@
functionSceneBodyView = new FrameLayout()
{
Y = roomFL.Bottom,
- Height = Application.GetRealHeight(1316),
+ Height = Application.GetRealHeight(973+279),
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
};
functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
@@ -1505,7 +1543,7 @@
{
RefreshFunction(room);
}
-
+
}
roomBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -1526,7 +1564,7 @@
}
};
}
-
+
}
#endregion
@@ -1556,7 +1594,7 @@
{
var sceneScrolView = new VerticalScrolViewLayout
{
- Y = Application.GetRealHeight(58)
+ //Y = Application.GetRealHeight(58)
};
functionSceneBodyView.AddChidren(sceneScrolView);
foreach (var scene in sceneList)
@@ -1611,7 +1649,7 @@
Tag = scene
};
leftFL.AddChidren(collectionBtn);
-
+
var sceneNameBtn = new Button()
{
Width = Application.GetRealWidth(176),
@@ -1760,7 +1798,7 @@
}
};
}
-
+
};
deleteBtn.MouseUpEventHandler += delEvent;
//缂栬緫鍦烘櫙
@@ -1822,10 +1860,9 @@
/// 鑷姩鍖�
/// </summary>
private async void ShowAutotion()
- {
+ {
functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
-
var bjFrameLayout = new FrameLayout
{
Width = Application.GetRealWidth(1080 - 58),
@@ -1958,12 +1995,7 @@
}
else
{
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- Common.Logic.CurrentLogic.LogicType = 2;
+
Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
Logic.TemplatePage templatePage = new Logic.TemplatePage();
Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
@@ -1982,7 +2014,7 @@
Yheight = 0;
}
logicScrolView.Y = scenehorizontalScrol.Bottom + Yheight;
- logicScrolView.Height = functionSceneBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
+ logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
Automationview(logicScrolView);
};
@@ -2008,6 +2040,7 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
+
}
/// <summary>
@@ -2019,32 +2052,26 @@
refresview.RemoveAll();
foreach (var logic in Common.Logic.LogicList)
{
- var bjRow = new RowLayout
- {
- Width = Application.GetRealWidth(1080 - 58),
- Height = Application.GetRealHeight(220),
- LineColor = ZigbeeColor.Current.LogicBackgroundColor,
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- refresview.AddChidren(bjRow);
var logicRowlayout = new RowLayout
{
- Y = Application.GetRealHeight(220 - 190),
- Height = Application.GetRealHeight(190),
- Width = Application.GetRealWidth(1080 - 58 - 46),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- X = Application.GetRealWidth(46),
+ Height = Application.GetRealHeight(190 + 30),
+ Width = Application.GetRealWidth(1080),
+ LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
- bjRow.AddChidren(logicRowlayout);
+ refresview.AddChidren(logicRowlayout);
+
+
var logicnameBtn = new Button
{
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(350),
Text = logic.LogicName,
- X = Application.GetRealWidth(12),
+ X = Application.GetRealWidth(12 + 46),
+ Y = Application.GetRealHeight(30),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
@@ -2057,8 +2084,8 @@
Height = Application.GetMinRealAverage(63),
UnSelectedImagePath = "ZigeeLogic/logicclose.png",
SelectedImagePath = "ZigeeLogic/logicopen.png",
- X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
- Y = Application.GetRealHeight(58 + 30 + 9),
+ X = logicRowlayout.Width - Application.GetRealWidth(104 + 58 + 58),
+ Y = Application.GetRealHeight(58 + 30 + 9 + 30),
};
logicRowlayout.AddChidren(logicswitchBtn);
@@ -2102,11 +2129,6 @@
logicRowlayout.AddRightView(edit);
edit.MouseUpEventHandler += (sender, e) =>
{
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
Common.Logic.CurrentLogic = logic;
var logicCommunalPage = new Logic.LogicCommunalPage();
HomePage.Instance.AddChidren(logicCommunalPage);
@@ -2140,91 +2162,32 @@
alert.Show();
};
-
- }
-
-
- }
-
- #region 鈼� 鎺у埗鐘舵�乢________________________
-
- /// <summary>
- /// 鏄剧ず璁惧鎺у埗鐘舵��
- /// </summary>
- /// <param name="command">Command.</param>
- /// <param name="objValue">Object value.</param>
- private void UpdateDeviceControllStatu(string command, object objValue)
- {
- if (command != "DeviceDefaultAck" || objValue == null)
- {
- return;
- }
- var tempDevice = (CommonDevice)objValue;
- if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == tempDevice.DeviceEpoint && obj.DeviceAddr == tempDevice.DeviceAddr))
- {
- return;
- }
- //鏍囪宸茬粡鍙戦�佹帶鍒跺懡浠ゅ埌缃戝叧
- sendedControlCommand = true;
- //DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
- }
-
- /// <summary>
- /// 绉婚櫎鍏ㄩ儴鏇存柊鎺у埗璁惧鐨刟ction
- /// </summary>
- private void RemoveAllUpdateControlDeviceStatuAction()
- {
- foreach (var gateway in zbGatewayList)
- {
- //绉婚櫎action
- if (gateway != null)
+ var line = new Button
{
- gateway.ReportAction -= UpdateDeviceControllStatu;
- }
+ Y = Application.GetRealHeight(215),
+ Height = Application.GetRealHeight(5),
+ Width = Application.GetRealWidth(1080 - 58),
+ BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ X = Application.GetRealWidth(58),
+ };
+ logicRowlayout.AddChidren(line);
}
- }
+ }
/// <summary>
- /// 绉婚櫎鍗曚釜鎺у埗璁惧鐨勬洿鏂扮姸鎬乤ction
+ /// 鏄剧ず鍥炬爣鐨勯鑹�
/// </summary>
- /// <param name="gateway">Gateway.</param>
- private void RemoveUpdateControlDeviceStatuAction(ZbGateway gateway)
- {
- //绉婚櫎action
- if (gateway != null)
- {
- gateway.ReportAction -= UpdateDeviceControllStatu;
- }
- }
-
- /// <summary>
- /// 娣诲姞闇�瑕佺洃鎺у洖璋冪姸鎬佺殑缃戝叧鍜岃澶�
- /// </summary>
- /// <param name="gatewayList">Gateway list.</param>
- /// <param name="gateway">Gateway.</param>
- /// <param name="deviceList">Device list.</param>
- /// <param name="common">Common.</param>
- private void AddZbGateway(List<ZbGateway> gatewayList, ZbGateway gateway, List<CommonDevice> deviceList, CommonDevice common)
- {
- if (null == gatewayList.Find((obj) => obj.getGatewayBaseInfo.gwID == gateway.getGatewayBaseInfo.gwID))
- {
- gatewayList.Add(gateway);
- }
- if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == common.DeviceEpoint && obj.DeviceAddr == common.DeviceAddr))
- {
- commonDeviceList.Add(common);
- }
- }
-
- #endregion
-
+ /// <param name="logic"></param>
+ /// <param name="logicRowlayout"></param>
+ /// <param name="intvalue"></param>
private void StatusColor(Common.Logic logic, RowLayout logicRowlayout, int intvalue)
{
var logictimeBtn = new Button
{
Height = Application.GetRealHeight(58),
- Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350),
+ Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350 + 58),
+ Y = Application.GetRealHeight(30),
X = Application.GetRealWidth(365),
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
@@ -2515,8 +2478,8 @@
{
Width = Application.GetRealWidth(82),
Height = Application.GetRealHeight(82),
- X = Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
- Y = Application.GetRealHeight(58 + 30),
+ X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
+ Y = Application.GetRealHeight(58 + 30 + 30),
Radius = (uint)Application.GetRealHeight(41),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
@@ -2534,7 +2497,7 @@
var connectIconBtn = new Button
{
Y = typebjBtn.Y + Application.GetRealHeight(35),
- X = Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
+ X = Application.GetRealWidth(58) + Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
Width = Application.GetRealWidth(48),
Height = Application.GetRealHeight(15),
UnSelectedImagePath = "ZigeeLogic/connect.png",
@@ -2612,5 +2575,79 @@
}
}
#endregion
+
+ #region 鈼� 鎺у埗鐘舵�乢________________________
+
+ /// <summary>
+ /// 鏄剧ず璁惧鎺у埗鐘舵��
+ /// </summary>
+ /// <param name="command">Command.</param>
+ /// <param name="objValue">Object value.</param>
+ private void UpdateDeviceControllStatu(string command, object objValue)
+ {
+ if (command != "DeviceDefaultAck" || objValue == null)
+ {
+ return;
+ }
+ var tempDevice = (CommonDevice)objValue;
+ if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == tempDevice.DeviceEpoint && obj.DeviceAddr == tempDevice.DeviceAddr))
+ {
+ return;
+ }
+ //鏍囪宸茬粡鍙戦�佹帶鍒跺懡浠ゅ埌缃戝叧
+ sendedControlCommand = true;
+ //DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
+ }
+
+ /// <summary>
+ /// 绉婚櫎鍏ㄩ儴鏇存柊鎺у埗璁惧鐨刟ction
+ /// </summary>
+ private void RemoveAllUpdateControlDeviceStatuAction()
+ {
+ foreach (var gateway in zbGatewayList)
+ {
+ //绉婚櫎action
+ if (gateway != null)
+ {
+ gateway.ReportAction -= UpdateDeviceControllStatu;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 绉婚櫎鍗曚釜鎺у埗璁惧鐨勬洿鏂扮姸鎬乤ction
+ /// </summary>
+ /// <param name="gateway">Gateway.</param>
+ private void RemoveUpdateControlDeviceStatuAction(ZbGateway gateway)
+ {
+ //绉婚櫎action
+ if (gateway != null)
+ {
+ gateway.ReportAction -= UpdateDeviceControllStatu;
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞闇�瑕佺洃鎺у洖璋冪姸鎬佺殑缃戝叧鍜岃澶�
+ /// </summary>
+ /// <param name="gatewayList">Gateway list.</param>
+ /// <param name="gateway">Gateway.</param>
+ /// <param name="deviceList">Device list.</param>
+ /// <param name="common">Common.</param>
+ private void AddZbGateway(List<ZbGateway> gatewayList, ZbGateway gateway, List<CommonDevice> deviceList, CommonDevice common)
+ {
+ if (null == gatewayList.Find((obj) => obj.getGatewayBaseInfo.gwID == gateway.getGatewayBaseInfo.gwID))
+ {
+ gatewayList.Add(gateway);
+ }
+ if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == common.DeviceEpoint && obj.DeviceAddr == common.DeviceAddr))
+ {
+ commonDeviceList.Add(common);
+ }
+ }
+
+ #endregion
+
+
}
}
--
Gitblit v1.8.0