Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-28 af0266fa5570b6adcdb22f631bf13170e8646ca5

 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs

@@ -411,7 +411,7 @@
        {

            List<string> listAllFile = Global.FileListByHomeId();



            string strroot = UserCenterResourse.LocalRootPath;

            string strroot = Common.Config.Instance.FullPath;

            string autoPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);

            foreach (string file in listAllFile)

            {