From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期三, 13 十一月 2019 16:28:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs index 88dbcba..b9c9a7f 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs @@ -56,8 +56,20 @@ row2.AddRightArrow(); row2.ButtonClickEvent += (sender, e) => { - var form = new SearchWirelessMenuControl(); - form.AddForm(); + 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(); + }); }; } @@ -115,6 +127,8 @@ { //鍏抽棴鐣岄潰 this.CloseForm(); + var form = new WirelessApDirection1Form(); + form.AddForm(); }; var frameBack2 = new FrameLayoutControl(); -- Gitblit v1.8.0