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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs

@@ -20,6 +20,7 @@
        /// </summary>

        public void ShowForm(string i_file)

        {

            this.ScrollEnabled = false;

            //设置头部信息

            base.SetTitleText("文件内容");



@@ -74,6 +75,9 @@
            btnText.TextAlignment = TextAlignment.TopLeft;

            btnText.TextColor = UserCenterColor.Current.TextColor1;

            btnText.Text = textValue;

#if Android

            btnText.Foucs = false;

#endif

            bodyFrameLayout.AddChidren(btnText);

        }