合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -2128,7 +2128,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;

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

                {

                    string deviceFileName = deleteFile.Substring(5);

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

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

                    {

                        //不是设备文件

                        continue;