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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs

@@ -148,7 +148,7 @@

        /// <summary>
        /// 添加楼层UI
        /// </summary> 
        /// </summary>
        public void BindDownFrameLayout(FrameLayout frameLayout, Panel curControlDev, Dictionary<string, string> dicFloorList, ref Button btnFloorText)
        {
            var btnAddFrameLayout = new FrameLayout
@@ -300,7 +300,7 @@
                        return;
                    }
                    curControlDev.currentSelectFloorId = floorId;
                    curControlDev.ReSave();

                    if (!btnMethodText.IsSelected)
                    {
                        if (oldbutton != null)
@@ -342,4 +342,4 @@
            }
        }
    }
}
}