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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -39,9 +39,9 @@


            Type type = typeof(DirNameResourse);



            var PropertyList = type.GetFields();

            var PropertyList = type.GetProperties();



            var listFile = new List<System.Reflection.FieldInfo>();

            var listFile = new List<System.Reflection.PropertyInfo>();

            foreach (var item in PropertyList)

            {

                if (item.Name.EndsWith("Directory") == true)

@@ -64,7 +64,7 @@
            row1.ButtonClickEvent += (sender, e) =>

            {

                var form = new HideOptionFileListForm();

                form.AddForm(UserCenterLogic.CombinePath());

                form.AddForm(Common.Config.Instance.FullPath);

            };



            //查看全部文件

@@ -84,12 +84,7 @@


        private void AddRowControl(VerticalListControl listView, string directory, string directoryValue, bool addLine)

        {

            string myPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, directoryValue);

            if (directoryValue == DirNameResourse.LocalMemoryDirectory)

            {

                myPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory);

            }

            if (System.IO.Directory.Exists(myPath) == false)

            if (System.IO.Directory.Exists(directoryValue) == false)

            {

                return;

            }

@@ -105,7 +100,7 @@
            row1.ButtonClickEvent += (sender, e) =>

            {

                var form = new HideOptionFileListForm();

                form.AddForm(myPath);

                form.AddForm(directoryValue);

            };

        }