添加小度的代码

黄学彪

2020-06-10 dce6c3481a37216292724013ff9d2b75ceb82f86

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs

@@ -167,7 +167,7 @@
            btnReDo.Gravity = Gravity.CenterHorizontal;

            btnReDo.TextAlignment = TextAlignment.Center;

            btnReDo.TextID = R.MyInternationalizationString.uReDoAgain;

            frameback.AddChidren(btnReDo, ChidrenBindMode.BindEventOnly);

            frameback.AddChidren(btnReDo, ChidrenBindMode.BindEvent);

            frameback.ButtonClickEvent += (sender, e) =>

            {

                //初始化初始中部控件

@@ -315,12 +315,12 @@
            List<string> listId = new List<string>();

            for (int i = 0; i < ZbGateway.GateWayList.Count; i++)

            {

                if (ZbGateway.GateWayList[i].getGatewayBaseInfo.IpAddress == string.Empty)

                if (ZbGateway.GateWayList[i].GwIP == string.Empty)

                {

                    //IP没有的网关，我也不知道它是干嘛的

                    continue;

                }

                string gwId = HdlGatewayLogic.Current.GetGatewayId(ZbGateway.GateWayList[i]);

                string gwId = ZbGateway.GateWayList[i].GwId;

                //重复添加检测

                if (this.dicIdCheckCount.ContainsKey(gwId) == false)

                {

@@ -342,7 +342,7 @@
            }

            for (int i = 0; i < listId.Count; i++)

            {

                ZbGateway way = ZbGateway.GateWayList.Find((obj) => HdlGatewayLogic.Current.GetGatewayId(obj) == listId[i]);

                ZbGateway way = ZbGateway.GateWayList.Find((obj) => obj.GwId == listId[i]);

                if (way == null)

                {

                    continue;

@@ -352,9 +352,9 @@
                GatewayBindMode mode = GatewayBindMode.BindAgain;

                //如果是第一次绑定,或者是以前已经绑定过了的

                if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true

                    || way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)

                    || way.HomeId == Common.Config.Instance.HomeId)

                {

                    if (way.getGatewayBaseInfo.HomeId != Common.Config.Instance.HomeId)

                    if (way.HomeId != Common.Config.Instance.HomeId)

                    {

                        //第一次绑定,也就是网关住宅ID为空

                        mode = GatewayBindMode.First;