2020.06.24.01

陈嘉乐

2020-06-24 adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e

 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) =>

@@ -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);

            }

        }



@@ -340,7 +339,7 @@
                        return;

                    }

                    bool online = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(way);

                    this.GatewayOnlinePush(way, online);

                    this.GatewayOnlinePush(way, online, true);

                }

                //网关新版本检测

                this.CheckGatewayNewVersion(listway);

@@ -352,7 +351,8 @@
        /// </summary>

        /// <param name="gateWay">网关对象</param>

        /// <param name="online">在线状态变更后的状态</param>

        public override void GatewayOnlinePush(ZbGateway gateWay, bool online)

        /// <param name="hadGwOnline">2020.05.25追加:此住宅是否拥有网关在线</param>

        public override void GatewayOnlinePush(ZbGateway gateWay, bool online, bool hadGwOnline)

        {

            Application.RunOnMainThread(() =>

            {

@@ -360,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;

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

                {

                    //有新版本

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

                    string gwid = way.GwId;

                    Application.RunOnMainThread(() =>

                    {

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