合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs

@@ -88,19 +88,7 @@
            if (listway.Count == 0)

            {

                //还没有绑定网关哦

                var btnPic = new PicViewControl(683, 392);

                btnPic.UnSelectedImagePath = "Item/NoFunction.png";

                btnPic.Y = (int)(bodyFrameLayout.Height * 0.382) - Application.GetRealHeight(392 / 2);

                btnPic.Gravity = Gravity.CenterHorizontal;

                bodyFrameLayout.AddChidren(btnPic);



                var btnView = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);

                btnView.Y = btnPic.Bottom + Application.GetRealHeight(32);

                btnView.TextID = R.MyInternationalizationString.uHadNotBindGatewayMsg;

                btnView.TextAlignment = TextAlignment.Center;

                btnView.TextSize = 12;

                btnView.TextColor = UserCenterColor.Current.TextGrayColor1;

                bodyFrameLayout.AddChidren(btnView);

                this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uHadNotBindGatewayMsg));

                return;

            }



@@ -177,8 +165,11 @@
                }

                this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                {

                    //执行切换网关操作

                    this.DoSwitchGateway(strWayId);

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        //执行切换网关操作

                        this.DoSwitchGateway(strWayId);

                    });

                });

            };



@@ -278,19 +269,22 @@
            //如果选择了刷新的网关，则不关闭管理界面

            this.closeDeviceManagForm = false;



            if (UserCenterResourse.DicActionForm.ContainsKey("DeviceListMainForm") == false)

            HdlThreadLogic.Current.RunMain(() =>

            {

                //刷新主画面

                var form = new Device.DeviceListMainForm();

                this.AddFromAndRemoveNowForm(form);

            }

            else

            {

                //关闭界面

                this.CloseForm();

                //刷新主画面(不重新获取设备状态)

                this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame", false);

            }

                if (UserCenterResourse.DicActionForm.ContainsKey("DeviceListMainForm") == false)

                {

                    //刷新主画面

                    var form = new Device.DeviceListMainForm();

                    this.AddFromAndRemoveNowForm(form);

                }

                else

                {

                    //关闭界面

                    this.CloseForm();

                    //刷新主画面(不重新获取设备状态)

                    this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame", false);

                }

            });

        }



        #endregion