合并了全部的代码，IOS 图片需要从新引入工程

黄学彪

2019-11-07 82a773d1783549caca563831aac8affc059deedf

 ZigbeeApp/Shared/Common/Device.cs

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

                }