From dce6c3481a37216292724013ff9d2b75ceb82f86 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 10 六月 2020 15:47:28 +0800 Subject: [PATCH] 添加小度的代码 --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs | 113 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 80 insertions(+), 33 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs index 3b4222c..7c9024b 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs @@ -57,13 +57,8 @@ row1.AddBottomLine(); row1.ButtonClickEvent += (sender, e) => { - //妫�娴嬩綇瀹呯粡绾害 - if (this.CheckResidencePoint() == false) - { - return; - } - var form = new WiredGatewayDirectionForm(); - form.AddForm(); + //鑿滃崟鎸夐挳鐨勭偣鍑讳簨浠� + this.MenuButtonClickEvent(1); }; //鏃犵嚎缃戝叧 @@ -77,25 +72,8 @@ row2.AddBottomLine(); row2.ButtonClickEvent += (sender, e) => { - //妫�娴嬩綇瀹呯粡绾害 - if (this.CheckResidencePoint() == false) - { - return; - } - var menuContr = new BottomMenuSelectForm(); - menuContr.AddForm(2); - //UDP妯″紡(鎺ㄨ崘) - menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uUdpModeRecommend), () => - { - var form = new WirelessUdpDirectionForm(); - form.AddForm(); - }); - //AP妯″紡 - menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uApMode), () => - { - var form = new WirelessApDirection1Form(); - form.AddForm(); - }); + //鑿滃崟鎸夐挳鐨勭偣鍑讳簨浠� + this.MenuButtonClickEvent(2); }; //Mini缃戝叧 @@ -108,13 +86,8 @@ row3.AddRightArrow(); row3.ButtonClickEvent += (sender, e) => { - //妫�娴嬩綇瀹呯粡绾害 - if (this.CheckResidencePoint() == false) - { - return; - } - var form = new MiniGatewayDirection1Form(); - form.AddForm(); + //鑿滃崟鎸夐挳鐨勭偣鍑讳簨浠� + this.MenuButtonClickEvent(3); }; listView.AdjustRealHeight(Application.GetRealHeight(23)); @@ -142,6 +115,80 @@ btnTip.Text = Language.StringByID(R.MyInternationalizationString.uNotSetLocationWillAffectTheAutomaticGeofencingFunction); frameTip.AddChidren(btnTip); } + } + + #endregion + + #region 鈻� 鎸夐敭鐐瑰嚮___________________________ + + /// <summary> + /// 鑿滃崟鎸夐挳鐨勭偣鍑讳簨浠� + /// </summary> + /// <param name="menuDiv">1:鏈夌嚎缃戝叧 2:鏃犵嚎缃戝叧 3:mini缃戝叧</param> + private void MenuButtonClickEvent(int menuDiv) + { + //鍙脊涓�娆� + if (this.showSettion == true && Common.Config.Instance.Home.Latitude == 0 && Common.Config.Instance.Home.Longitude == 0) + { + this.showSettion = false; + //璇峰墠寰�浣忓畢绠$悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃� + string msg = Language.StringByID(R.MyInternationalizationString.uGotoResidenceAndSetLocation).Replace("{0}", "\r\n"); + var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, + Language.StringByID(R.MyInternationalizationString.uGotoSettion), + Language.StringByID(R.MyInternationalizationString.uNeglect)); + alert.Show(); + + //蹇界暐 + alert.CancelClickEvent += () => + { + //鏄剧ず鎸囧畾鐨勭晫闈� + this.ShowFormByMenuDiv(menuDiv); + }; + //鍘昏缃� + alert.ConfirmClickEvent += () => + { + var form = new Residence.ResidenceManagementForm(); + form.AddForm(false); + }; + return; + } + //鏄剧ず鎸囧畾鐨勭晫闈� + this.ShowFormByMenuDiv(menuDiv); + } + + /// <summary> + /// 鏄剧ず鎸囧畾鐨勭晫闈� + /// </summary> + /// <param name="menuDiv">1:鏈夌嚎缃戝叧 2:鏃犵嚎缃戝叧 3:mini缃戝叧</param> + private void ShowFormByMenuDiv(int menuDiv) + { + if (menuDiv == 1) + { + var form = new WiredGatewayDirectionForm(); + form.AddForm(); + } + else if (menuDiv == 2) + { + var menuContr = new BottomMenuSelectForm(); + menuContr.AddForm(2); + //UDP妯″紡(鎺ㄨ崘) + menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uUdpModeRecommend), () => + { + var form = new WirelessUdpDirectionForm(); + form.AddForm(); + }); + //AP妯″紡 + menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uApMode), () => + { + var form = new WirelessApDirection1Form(); + form.AddForm(); + }); + } + else if (menuDiv == 3) + { + var form = new MiniGatewayDirection1Form(); + form.AddForm(); + } } #endregion -- Gitblit v1.8.0