From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 162 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 117 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 3d0f6c6..34909fd 100755
--- 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,17 +19,17 @@
}
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 鏈�涓嬮潰鐨勫竷灞�浠ｇ爜
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
+
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);
@@ -37,41 +38,21 @@
timeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
timeView.funnameBtn.TextID = MyInternationalizationString.timecondition;
middle.AddChidren(timeView.FunFrameView());
- 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) =>
- {
- 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) =>
- {
- //CurtainPanel.ButtonSet buttonSet = new CurtainPanel.ButtonSet();
- //UserView.HomePage.Instance.AddChidren(buttonSet);
- //UserView.HomePage.Instance.PageIndex += 1;
- //buttonSet.Show();
- //return;
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- SecurityView(flMain, false);
- };
+
///鍦扮悊鍥存爮
FunView positionView = new FunView();
positionView.funFrameLayout.Y = securityView.funFrameLayout.Bottom;
@@ -80,15 +61,33 @@
positionView.funnameBtn.TextID = MyInternationalizationString.location;
positionView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
middle.AddChidren(positionView.FunFrameView());
+ #endregion
+
+ timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ TimeView();
+ };
+ 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));
+
+ };
+ securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ this.AddChidren(flMain);
+ SecurityView(flMain, false);
+ };
positionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LocationView(flMain, false);
};
-
- #endregion
-
}
/// <summary>
@@ -339,7 +338,8 @@
#endregion
string strname = "";
//鍒拌揪鍦扮偣鐐瑰嚮浜嬩欢
- athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
+ athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
strname = athomeView.titleBtn.Text;
leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -348,14 +348,15 @@
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;//鍗婂緞
@@ -442,15 +443,81 @@
LocationConditionsInfo.Remove("AtHome");
}
LocationConditionsInfo.Add("AtHome", "1");
- }
-
- //璋冪敤鏂规硶锛岃烦杞〉闈�
- GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
- {
- //鎴彇瀛楃涓插悗绗�6浣嶏紱
- //var len = name.Substring(name.Length - 6, 6);
-
- //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+ }
+
+#if Android
+ //鐢宠瀹氫綅鏉冮檺
+ ((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
+ {
+ if (result1 == false) { return; }
+
+ //鐢宠鍏佽绋嬪簭鍐欏叆澶栭儴瀛樺偍锛屽SD鍗′笂鍐欐枃浠�
+ ((BaseActivity)Application.Activity).SetPermission((result2) =>
+ {
+ if (result2 == false) { return; }
+ //璇诲彇鐢佃瘽鐘舵�佹潈闄�
+ ((BaseActivity)Application.Activity).SetPermission((result3) =>
+ {
+ if (result3 == false) { return; }
+
+ //璋冪敤鏂规硶锛岃烦杞〉闈�
+ GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+ {
+ //鎴彇瀛楃涓插悗绗�6浣嶏紱
+ //var len = name.Substring(name.Length - 6, 6);
+
+ //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+ var latitudW = (int)Math.Truncate(mLatitude * 1000000);
+ var longitudeH = (int)Math.Truncate(mLongitude * 1000000);
+ Dictionary<string, string> accounts = new Dictionary<string, string>();
+ if (accounts.ContainsKey("Account"))
+ {
+ accounts.Remove("Account");
+ }
+ if (accounts.ContainsKey("Type"))
+ {
+ accounts.Remove("Type");
+ }
+ if (accounts.ContainsKey("Latitude"))
+ {
+ accounts.Remove("latitude");
+ }
+ if (accounts.ContainsKey("Longitude"))
+ {
+ accounts.Remove("Longitude");
+ }
+ if (accounts.ContainsKey("Radius"))
+ {
+ accounts.Remove("radius");
+ }
+ accounts.Add("Account", Config.Instance.Guid);
+ accounts.Add("Type", "7");
+ accounts.Add("Latitude", latitudW.ToString());
+ accounts.Add("Longitude", longitudeH.ToString());
+ accounts.Add("Radius", mRadius.ToString());
+
+ LogicIfon.Addaccounts(accounts);
+ LogicIfon.AddLocationconditions(LocationConditionsInfo);
+
+ var logicCommunalPage = new LogicCommunalPage();
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
+
+ }, "android.permission.READ_PHONE_STATE");
+
+ }, "android.permission.WRITE_EXTERNAL_STORAGE");
+ });
+#endif
+#if iOS
+ //璋冪敤鏂规硶锛岃烦杞〉闈�
+ GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+ {
+ //鎴彇瀛楃涓插悗绗�6浣嶏紱
+ //var len = name.Substring(name.Length - 6, 6);
+
+ //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
var latitudW = (int)Math.Truncate(mLatitude * 1000000);
var longitudeH = (int)Math.Truncate(mLongitude * 1000000);
Dictionary<string, string> accounts = new Dictionary<string, string>();
@@ -479,13 +546,16 @@
accounts.Add("Latitude", latitudW.ToString());
accounts.Add("Longitude", longitudeH.ToString());
accounts.Add("Radius", mRadius.ToString());
+
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);
+#endif
};
}
@@ -494,6 +564,7 @@
/// </summary>
void TimeView()
{
+
UserView.HomePage.Instance.ScrollEnabled = false;
Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
#region ------鐣岄潰甯冨眬閮ㄥ垎
@@ -575,6 +646,7 @@
};
}
+
}
}
--
Gitblit v1.8.0