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 | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
old mode 100644
new mode 100755
similarity index 98%
rename from ZigbeeApp20200414/Shared/Phone/Device/Logic/AddLogicPage.cs
rename to ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index e2168a2..dcc6be2
--- a/ZigbeeApp20200414/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -23,11 +23,11 @@
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
-
+
var middle = new FrameLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1925 - 184),
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -36,25 +36,25 @@
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.funFrameLayout.Height = Application.GetRealHeight(160+20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
positionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/position.png";
positionView.funnameBtn.TextID = MyInternationalizationString.location;
positionView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
@@ -335,8 +335,7 @@
#endregion
string strname = "";
//鍒拌揪鍦扮偣鐐瑰嚮浜嬩欢
- athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
+ athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
strname = athomeView.titleBtn.Text;
leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -345,15 +344,14 @@
athomeView.selectedIconBtn.Visible = true;
};
//绂诲紑鍦扮偣鐐瑰嚮浜嬩欢
- leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
+ leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
strname = leaveView.titleBtn.Text;
leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
leaveView.selectedIconBtn.Visible = true;
athomeView.selectedIconBtn.Visible = false;
};
-
+
double latitude = Config.Instance.Home.Latitude;//绾害
double longitude = Config.Instance.Home.Longitude;//缁忓害
int r = 500;//鍗婂緞
@@ -521,8 +519,7 @@
timeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
#endregion
//绔嬪嵆鎵ц鐐瑰嚮浜嬩欢
- timepointView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
+ timepointView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
@@ -530,8 +527,7 @@
timepointView.selectedIconBtn.Visible = true;
};
//鏃堕棿鑼冨洿鐐瑰嚮浜嬩欢
- timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
+ timeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
timeView.selectedIconBtn.Visible = true;
--
Gitblit v1.8.0