请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -95,8 +95,7 @@
            for (int i = 0; i < listway.Count; i++)

            {

                //添加行

                var gwId = HdlGatewayLogic.Current.GetGatewayId(listway[i]);

                this.AddRowLayout(gwId, i != listway.Count - 1);

                this.AddRowLayout(listway[i].GwId, i != listway.Count - 1);

            }



            //调整列表控件的高度

@@ -131,7 +130,7 @@
            //提示新版本

            var btnNew = new InformationTipView(gatewayRow.btnIcon);

            btnNew.Visible = false;

            gatewayRow.frameTable.AddChidren(btnNew, ChidrenBindMode.BindEventOnly);

            gatewayRow.frameTable.AddChidren(btnNew, ChidrenBindMode.BindEvent);

            gatewayRow.AddTag("btnNew", btnNew);

            //单击事件

            gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>

@@ -207,7 +206,7 @@
                {

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        this.DeleteGateway(strWayId, gatewayRow);

                        this.DeleteGateway(strWayId);

                    });

                });

            };

@@ -226,7 +225,7 @@
                btnNow.Y = Application.GetMinReal(23) + gatewayRow.frameTable.chidrenYaxis;

                btnNow.UnSelectedImagePath = "Item/NowAcctionTip.png";

                btnNow.X = gatewayRow.btnName.X + gatewayRow.btnName.GetRealWidthByText();

                gatewayRow.frameTable.AddChidren(btnNow, ChidrenBindMode.BindEventOnly);

                gatewayRow.frameTable.AddChidren(btnNow, ChidrenBindMode.BindEvent);

            }

        }



@@ -239,7 +238,7 @@
        /// </summary>

        /// <param name="strWayId"></param>

        /// <param name="row"></param>

        private async void DeleteGateway(string strWayId, GatewayRowControl row)

        private async void DeleteGateway(string strWayId)

        {

            //打开进度条

            this.ShowProgressBar();

@@ -361,7 +360,7 @@
                {

                    return;

                }

                string gwid = HdlGatewayLogic.Current.GetGatewayId(gateWay);

                string gwid = gateWay.GwId;

                if (this.dicRowContr.ContainsKey(gwid) == true && this.dicRowContr[gwid] != null)

                {

                    this.dicRowContr[gwid].IsOnline = online;

@@ -391,7 +390,7 @@
                    continue;

                }

                //获取最新版本

                var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(way, ShowErrorMode.NO);

                var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(way, ShowErrorMode.NO);

                if (result == null)

                {

                    continue;

@@ -399,8 +398,8 @@
                if (result[0] != null || result[1] != null || result[2] != null)

                {

                    //有新版本

                    string gwid = HdlGatewayLogic.Current.GetGatewayId(way);

                    Application.RunOnMainThread(() =>

                    string gwid = way.GwId;

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (this.dicRowContr.ContainsKey(gwid) == true && this.dicRowContr[gwid] != null)

                        {