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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

old mode 100755
new mode 100644
@@ -124,10 +124,10 @@
            this.midFrameLayout.AddChidren(bottomFrameLayout1);
        }

        /// <summary>
        /// 显示重新加载的界面(主要是用在界面加载错误时，再次加载)
        /// <summary>

        /// 显示重新加载的界面(主要是用在界面加载错误时，再次加载)

        /// </summary>
        public void ShowReLoadView()
        public void ShowReLoadView()

        {
            var frame = new FrameLayout();
            frame.BackgroundColor = UserCenterColor.Current.White;
@@ -143,12 +143,12 @@
            {
                ReLoadAction?.Invoke();
                ReLoadAction = null;
            };
            };

        }

        /// <summary>
        /// 添加楼层UI
        /// </summary> 
        /// </summary>
        public void BindDownFrameLayout(FrameLayout frameLayout, Panel curControlDev, Dictionary<string, string> dicFloorList, ref Button btnFloorText)
        {
            var btnAddFrameLayout = new FrameLayout
@@ -342,4 +342,4 @@
            }
        }
    }
}
}