From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs | 179 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 101 insertions(+), 78 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
index 649569b..0e493af 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
@@ -5,7 +5,22 @@
/// 娣诲姞缃戝叧鐨勯�夋嫨鐢婚潰
/// </summary>
public class NewGateWayMenuSelectForm : EditorCommonForm
- {
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鏄惁鏄剧ず鎻愮ず璁剧疆浣忓畢鍦扮悊浣嶇疆
+ /// </summary>
+ private bool showSettion = true;
+ /// <summary>
+ /// 鎻愮ず鐨凢rameLayout
+ /// </summary>
+ private FrameLayout frameTip = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
@@ -42,6 +57,11 @@
row1.AddBottomLine();
row1.ButtonClickEvent += (sender, e) =>
{
+ //妫�娴嬩綇瀹呯粡绾害
+ if (this.CheckResidencePoint() == false)
+ {
+ return;
+ }
var form = new WiredGatewayDirectionForm();
form.AddForm();
};
@@ -56,6 +76,11 @@
row2.AddRightArrow();
row2.ButtonClickEvent += (sender, e) =>
{
+ //妫�娴嬩綇瀹呯粡绾害
+ if (this.CheckResidencePoint() == false)
+ {
+ return;
+ }
var menuContr = new BottomMenuSelectForm();
menuContr.AddForm(2);
//UDP妯″紡(鎺ㄨ崘)
@@ -71,89 +96,87 @@
form.AddForm();
});
};
+
+ //濡傛灉杩樻病鏈夎缃湴鐞嗕綅缃�
+ if (Common.Config.Instance.Home.Latitude == 0 && Common.Config.Instance.Home.Longitude == 0)
+ {
+ this.frameTip = new FrameLayout();
+ frameTip.X = Application.GetRealWidth(179);
+ frameTip.Y = Application.GetRealHeight(1426);
+ frameTip.Height = Application.GetRealHeight(100);
+ frameTip.Width = Application.GetRealWidth(714);
+ bodyFrameLayout.AddChidren(frameTip);
+
+ var btnIcon = new IconViewControl(58);
+ btnIcon.UnSelectedImagePath = "Item/Tips.png";
+ frameTip.AddChidren(btnIcon);
+
+ //濡傛灉涓嶈缃綇瀹呯殑鍦扮悊浣嶇疆,鍒欎細褰卞搷鑷姩鍖栧湴鐞嗗洿鏍忓姛鑳界殑璁剧疆
+ var btnTip = new NormalViewControl(Application.GetRealWidth(636), Application.GetRealHeight(100), false);
+ btnTip.X = btnIcon.Right + Application.GetRealWidth(20);
+ btnTip.TextAlignment = TextAlignment.Center;
+ btnTip.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnTip.TextSize = 12;
+ btnTip.IsMoreLines = true;
+ btnTip.Text = Language.StringByID(R.MyInternationalizationString.uNotSetLocationWillAffectTheAutomaticGeofencingFunction);
+ frameTip.AddChidren(btnTip);
+ }
}
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
/// <summary>
- /// 鑿滃崟鎺т欢
+ /// 妫�娴嬩綇瀹呯粡绾害
/// </summary>
- private class SearchWirelessMenuControl : DialogCommonForm
+ /// <returns></returns>
+ private bool CheckResidencePoint()
{
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
+ //鍙脊涓�娆�
+ if (this.showSettion == false)
{
- var frameBack1 = new FrameLayoutControl();
- frameBack1.UseClickStatu = false;
- frameBack1.Y = Application.GetRealHeight(1420);
- frameBack1.Gravity = Gravity.CenterHorizontal;
- frameBack1.Radius = 12;
- frameBack1.Width = Application.GetRealWidth(1034);
- frameBack1.Height = Application.GetRealHeight(300);
- frameBack1.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(frameBack1);
-
- //UDP妯″紡(鎺ㄨ崘)
- var btnUdp = new NormalViewControl(900, 156, true);
- btnUdp.Gravity = Gravity.CenterHorizontal;
- btnUdp.TextAlignment = TextAlignment.Center;
- btnUdp.TextColor = 0xff0075ff;
- btnUdp.TextSize = 17;
- btnUdp.TextID = R.MyInternationalizationString.uUdpModeRecommend;
- frameBack1.AddChidren(btnUdp, ChidrenBindMode.NotBind);
- btnUdp.ButtonClickEvent += (sender, e) =>
- {
- //鍏抽棴鐣岄潰
- this.CloseForm();
- var form = new WirelessUdpDirectionForm();
- form.AddForm();
- };
-
- //绾�
- var btnLine = new NormalViewControl(frameBack1.Width, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
- btnLine.Y = btnUdp.Bottom;
- frameBack1.AddChidren(btnLine, ChidrenBindMode.NotBind);
- //AP妯″紡
- var btnAp = new NormalViewControl(900, 144, true);
- btnAp.Y = btnLine.Bottom;
- btnAp.Gravity = Gravity.CenterHorizontal;
- btnAp.TextAlignment = TextAlignment.Center;
- btnAp.TextColor = 0xff0075ff;
- btnAp.TextSize = 17;
- btnAp.TextID = R.MyInternationalizationString.uApMode;
- frameBack1.AddChidren(btnAp, ChidrenBindMode.NotBind);
- btnAp.ButtonClickEvent += (sender, e) =>
- {
- //鍏抽棴鐣岄潰
- this.CloseForm();
- var form = new WirelessApDirection1Form();
- form.AddForm();
- };
-
- var frameBack2 = new FrameLayoutControl();
- frameBack2.UseClickStatu = false;
- frameBack2.Y = frameBack1.Bottom + Application.GetRealHeight(23);
- frameBack2.Gravity = Gravity.CenterHorizontal;
- frameBack2.Radius = 12;
- frameBack2.Width = Application.GetRealWidth(1034);
- frameBack2.Height = Application.GetRealHeight(156);
- frameBack2.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(frameBack2);
- //鍙栨秷
- var btnCancel = new NormalViewControl(900, 156, true);
- btnCancel.Gravity = Gravity.CenterHorizontal;
- btnCancel.TextAlignment = TextAlignment.Center;
- btnCancel.TextColor = 0xff0075ff;
- btnCancel.TextSize = 17;
- btnCancel.TextID = R.MyInternationalizationString.uCancel;
- frameBack2.AddChidren(btnCancel, ChidrenBindMode.NotBind);
- btnCancel.ButtonClickEvent += (sender, e) =>
- {
- //鍏抽棴鐣岄潰
- this.CloseForm();
- };
+ return true;
}
- }
+ this.showSettion = false;
+
+ if (Common.Config.Instance.Home.Latitude == 0 && Common.Config.Instance.Home.Longitude == 0)
+ {
+ //璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+ string msg = Language.StringByID(R.MyInternationalizationString.uGotoResidenceAndSetLocation).Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ var form = new Residence.ResidenceManagementForm();
+ form.AddForm(false);
+
+ }, Language.StringByID(R.MyInternationalizationString.uGotoSettion));
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
+
+ /// <summary>
+ /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
+ /// </summary>
+ public override int FormActionAgainEvent()
+ {
+ if (frameTip == null)
+ {
+ return 0;
+ }
+ if (Common.Config.Instance.Home.Latitude != 0 || Common.Config.Instance.Home.Longitude != 0)
+ {
+ //绉婚櫎鎺夋彁绀�
+ frameTip.RemoveFromParent();
+ return 1;
+ }
+ return 1;
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0