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

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

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

@@ -117,10 +117,20 @@
            {

                return;

            }



            List<string> listBackupGwId = new List<string>();

            var fileData = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);

            if (fileData != null)

            {

                //新增：虽然概率低，但是确实发生了。如果有网络时，App重新绑定记录的网关失败的话

                //不应该删除它

                listBackupGwId = JsonConvert.DeserializeObject<List<string>>(System.Text.Encoding.UTF8.GetString(fileData));

            }



            List<string> listDelete = new List<string>();
            foreach (var gatewayId in this.dicGateway.Keys)

            {

                if (result.ContainsKey(gatewayId) == false)

                if (result.ContainsKey(gatewayId) == false && listBackupGwId.Contains(gatewayId) == false)

                {

                    //本地存在云端不存在的网关，则删除

                    listDelete.Add(gatewayId);

@@ -1318,7 +1328,7 @@
            }

            else

            {

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

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

            }