Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

@@ -1042,7 +1042,7 @@
            }

            else

            {

                //获取本地的属性 
                //获取本地的属性

                objValue = localWay.getGwInfo.GetType().InvokeMember(attributeName, System.Reflection.BindingFlags.GetField, null, localWay.getGwInfo, null);

            }



@@ -1080,7 +1080,7 @@
            }

            else

            {

                //获取本地属性 
                //获取本地属性

                objValue = localWay.getGatewayBaseInfo.GetType().InvokeMember(attributeName, System.Reflection.BindingFlags.GetField, null, localWay.getGatewayBaseInfo, null);

            }



@@ -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;