From 7ded9bc93b6beb5d7311ed4d013f90c521f85b5e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 24 八月 2020 11:47:24 +0800
Subject: [PATCH] 2020.08.24.1
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
old mode 100755
new mode 100644
index 53eb7f4..5e267b2
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -7,6 +7,7 @@
using ZigBee.Device;
using Shared.Phone.Device.Logic.LogicView;
+
namespace Shared.Phone.Device.Logic
{
@@ -18,71 +19,76 @@
}
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);
UserView.HomePage.Instance.PageIndex += 1;
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>
@@ -473,13 +479,22 @@
accounts.Add("Latitude", latitudW.ToString());
accounts.Add("Longitude", longitudeH.ToString());
accounts.Add("Radius", mRadius.ToString());
+
+ if (Send.It_Exist == "0")
+ {
+ //濡傛灉娌℃湁寮�鍚疓PS鏈嶅姟,鎵撳紑鏈嶅姟骞朵笖淇濆瓨鐘舵�佸湪鏈湴锛�
+ Application.StartGPSLocationService();
+ Send.SaveLocalFile("GPS_File", "1");
+ }
+
LogicIfon.Addaccounts(accounts);
LogicIfon.AddLocationconditions(LocationConditionsInfo);
+
var logicCommunalPage = new LogicCommunalPage();
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);
};
}
@@ -488,6 +503,7 @@
/// </summary>
void TimeView()
{
+
UserView.HomePage.Instance.ScrollEnabled = false;
Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
#region ------鐣岄潰甯冨眬閮ㄥ垎
@@ -569,6 +585,7 @@
};
}
+
}
}
--
Gitblit v1.8.0