From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 53eb7f4..dcc6be2 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -18,36 +18,54 @@
}
public void Show()
{
- #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ #region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
- #endregion
- #region 鏈�涓嬮潰鐨勫竷灞�浠ｇ爜
+
var middle = new FrameLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
///鏃堕棿
- FunView timeview = new FunView();
- timeview.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
- timeview.funnameBtn.TextID = MyInternationalizationString.timecondition;
- middle.AddChidren(timeview.FunFrameView());
- timeview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ FunView timeView = new FunView();
+ timeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
+ timeView.funnameBtn.TextID = MyInternationalizationString.timecondition;
+ middle.AddChidren(timeView.FunFrameView());
+
+ ///璁惧
+ FunView functionView = new FunView();
+ functionView.funFrameLayout.Y = timeView.funFrameLayout.Bottom;
+ functionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
+ functionView.funnameBtn.TextID = MyInternationalizationString.device;
+ middle.AddChidren(functionView.FunFrameView());
+
+ ///瀹夐槻
+ FunView securityView = new FunView();
+ securityView.funFrameLayout.Y = functionView.funFrameLayout.Bottom;
+ securityView.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
+ securityView.funnameBtn.TextID = MyInternationalizationString.security;
+ middle.AddChidren(securityView.FunFrameView());
+
+ ///鍦扮悊鍥存爮
+ FunView positionView = new FunView();
+ positionView.funFrameLayout.Y = securityView.funFrameLayout.Bottom;
+ positionView.funFrameLayout.Height = Application.GetRealHeight(160+20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
+ positionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/position.png";
+ positionView.funnameBtn.TextID = MyInternationalizationString.location;
+ positionView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ middle.AddChidren(positionView.FunFrameView());
+ #endregion
+
+ timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
TimeView();
};
- ///璁惧
- FunView functionview = new FunView();
- functionview.funFrameLayout.Y = timeview.funFrameLayout.Bottom;
- functionview.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
- functionview.funnameBtn.TextID = MyInternationalizationString.device;
- middle.AddChidren(functionview.FunFrameView());
- functionview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var roomAndDeviceView = new RoomAndDeviceView();
UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
@@ -55,34 +73,18 @@
roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic;
roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate));
};
- ///瀹夐槻
- FunView securityview = new FunView();
- securityview.funFrameLayout.Y = functionview.funFrameLayout.Bottom;
- securityview.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
- securityview.funnameBtn.TextID = MyInternationalizationString.security;
- middle.AddChidren(securityview.FunFrameView());
- securityview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
SecurityView(flMain, false);
};
- ///鍦扮悊鍥存爮
- FunView positionview = new FunView();
- positionview.funFrameLayout.Y = securityview.funFrameLayout.Bottom;
- positionview.iconBtn.UnSelectedImagePath = "ZigeeLogic/position.png";
- positionview.funnameBtn.TextID = MyInternationalizationString.location;
- positionview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
- middle.AddChidren(positionview.FunFrameView());
- positionview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ positionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LocationView(flMain, false);
};
-
- #endregion
-
}
/// <summary>
@@ -479,7 +481,7 @@
UserView.HomePage.Instance.AddChidren(logicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
- }, strname, true, latitude, longitude, r);
+ }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
};
}
--
Gitblit v1.8.0