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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Common/Device.cs

@@ -251,7 +251,7 @@
                //添加缓存

                this.AddDeviceToMemory(ref device);



                //移除存在的设备内存 
                //移除存在的设备内存

                string maikey = this.GetDeviceMainKeys(device);

                if (dicExist.ContainsKey(maikey) == true)

                {

@@ -1796,7 +1796,7 @@
                        string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceListFail);

                        msg += "\r\n[" + HdlGatewayLogic.Current.GetGatewayName(zbGateway).ToString() + "]";

                        msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时", false);

                        this.ShowErrorMsg(msg);

                        this.ShowTipMsg(msg);

                    }

                    return null;

                }