Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs

@@ -1993,7 +1993,7 @@
            var listSaveFile = new HashSet<string>();

            foreach (string fileName in listBackFile)

            {

                if (fileName.Length < 10 || fileName.StartsWith(Common.LocalDevice.deviceFirstName) == false)

                if (fileName.Length < 10 || fileName.StartsWith("Device_") == false)

                {

                    //不是设备备份文件

                    continue;

@@ -2053,7 +2053,7 @@
                if (deleteFile.Length > 12)

                {

                    string deviceFileName = deleteFile.Substring(5);

                    if (deviceFileName.StartsWith(Common.LocalDevice.deviceFirstName) == false)

                    if (deviceFileName.StartsWith("Device_") == false)

                    {

                        //不是设备文件

                        continue;