From e41577d72b90fcd17999ffdd614072ecf313a733 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 18 三月 2020 14:51:03 +0800
Subject: [PATCH] 2020-03-18-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs | 200 +++++++-------------------------------------------
1 files changed, 28 insertions(+), 172 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
old mode 100644
new mode 100755
index 7ec80cf..fec52b8
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
@@ -10,199 +10,55 @@
public AddAction()
{
- Tag = "LockLogic";
+ Tag = "Logic";
}
public void Show()
{
-
-
- #region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
- {
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
- };
- this.AddChidren(topRowLayout);
-
- var titleName = new Button
- {
- TextSize = 17,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.addaction,
- IsBold = true,
- };
- topRowLayout.AddChidren(titleName);
-
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
- var back = new Button
- {
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
- };
- topRowLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) => {
- RemoveFromParent();
- };
+ #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.TextID = MyInternationalizationString.addaction;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
#endregion
-
var middle = new FrameLayout
{
- Y = topRowLayout.Bottom,
+ Y =view.topRowLayout.Bottom,
Height = Application.GetRealHeight(1920 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
- #region ----- 璁惧------
- var deviceframelayout = new FrameLayout
+ #region ----- 璁惧------
+
+ FunView deviceview = new FunView();
+ deviceview.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
+ deviceview.funnameBtn.TextID = MyInternationalizationString.device;
+ middle.AddChidren(deviceview.FunFrameView());
+ deviceview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(deviceframelayout);
-
- var deviceiconBtn = new Button
- {
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(58),
- Y = Application.GetRealHeight(55),
- UnSelectedImagePath = "ZigeeLogic/function.png",
-
- };
- deviceframelayout.AddChidren(deviceiconBtn);
-
- var devicerow = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(850),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(176),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- deviceframelayout.AddChidren(devicerow);
-
-
- var btndevice = new Button
- {
- TextID = MyInternationalizationString.device,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextSize = 15,
- };
- devicerow.AddChidren(btndevice);
-
- var btndeviceback = new Button
- {
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(789),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "ZigeeLogic/next.png",
-
- };
- devicerow.AddChidren(btndeviceback);
-
- EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
- {
- var lockAddDevice = new LockAddDevice();
- UserView.HomePage.Instance.AddChidren(lockAddDevice);
+ var roomAndDeviceView = new RoomAndDeviceView();
+ UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
UserView.HomePage.Instance.PageIndex += 1;
- lockAddDevice.Show();
+ roomAndDeviceView.IfType = LogicView.IfString.Action_LockAction;
+ roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.addaction));
};
- deviceframelayout.MouseUpEventHandler += devicestateclick;
- btndevice.MouseUpEventHandler += devicestateclick;
- btndeviceback.MouseUpEventHandler += devicestateclick;
- deviceiconBtn.MouseUpEventHandler += devicestateclick;
- devicerow.MouseUpEventHandler += devicestateclick;
+
#endregion
#region ----- 鍦烘櫙------
-
-
- var sceneframelayout = new FrameLayout
+ FunView sceneview = new FunView();
+ sceneview.iconBtn.UnSelectedImagePath = "ZigeeLogic/scene.png";
+ sceneview.funnameBtn.TextID = MyInternationalizationString.scene;
+ sceneview.funFrameLayout.Y = deviceview.funFrameLayout.Bottom;
+ middle.AddChidren(sceneview.FunFrameView());
+ sceneview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Y = deviceframelayout.Bottom,
- };
- middle.AddChidren(sceneframelayout);
-
- var sceneiconBtn = new Button
- {
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(58),
- Y = Application.GetRealHeight(55),
- UnSelectedImagePath = "ZigeeLogic/scene.png",
-
- };
- sceneframelayout.AddChidren(sceneiconBtn);
-
-
- var sceneRowLayout = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(850),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(176),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- sceneframelayout.AddChidren(sceneRowLayout);
-
- var scene = new Button
- {
- TextID = MyInternationalizationString.scene,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextSize = 15,
- };
- sceneRowLayout.AddChidren(scene);
-
- var btnsceneback = new Button
- {
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(789),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "ZigeeLogic/next.png",
- };
- sceneRowLayout.AddChidren(btnsceneback);
-
- EventHandler<MouseEventArgs> sceneclick = (sender, e) =>
- {
- var lockAddScene = new LockAddScene();
- UserView.HomePage.Instance.AddChidren(lockAddScene);
+ var addScenePage = new AddScenePage();
+ UserView.HomePage.Instance.AddChidren(addScenePage);
UserView.HomePage.Instance.PageIndex += 1;
- lockAddScene.Show();
+ addScenePage.Show(LogicView.IfString.Action_LockScene);
};
- sceneRowLayout.MouseUpEventHandler += sceneclick;
- scene.MouseUpEventHandler += sceneclick;
- btnsceneback.MouseUpEventHandler += sceneclick;
- sceneframelayout.MouseUpEventHandler += sceneclick;
- sceneiconBtn.MouseUpEventHandler += sceneclick;
#endregion
}
--
Gitblit v1.8.0