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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

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

@@ -625,7 +625,7 @@
            }



            //获取全部设备

            bool result = await LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);

            bool result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);

            //关闭进度条

            ProgressBar.Close();

            if (result == false)

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

            }