Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -140,7 +140,7 @@
            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                //变更网关房间

                HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys);

                HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);

            };



            //完成初始化桌布

@@ -220,12 +220,12 @@
        /// </summary>

        /// <param name="gatewayName">网关名称</param>

        /// <param name="closeForm">关闭界面</param>

        private async void SetGatewayName(string gatewayName, bool closeForm)

        private void SetGatewayName(string gatewayName, bool closeForm)

        {

            //打开进度条

            this.ShowProgressBar();

            //修改本地网关名

            var result = await HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);

            var result = HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);

            //关闭进度条

            this.CloseProgressBar();