2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -77,7 +77,7 @@
                this.ShowTipMsg(msg);

                return false;

            }

            var mainWayId = HdlGatewayLogic.Current.GetGatewayId(mainGateway);

            var mainWayId = mainGateway.GwId;



            //主题数固定5+3+1

            int topicCount = 9;

@@ -104,7 +104,7 @@
                {

                    var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);



                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.Safeguard.ErrorResponData>(jobject["Data"].ToString());

                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

                    if (temp != null)

                    {

                        string msg = HdlCheckLogic.Current.CheckCommonErrorCode(temp.Error);

@@ -2154,7 +2154,7 @@
            bool success = false;

            //超时时间

            int TimeOut = 0;

            string checkTopic = HdlGatewayLogic.Current.GetGatewayId(realWay) + "/Security/AdminSetNewPassword_Respon";

            string checkTopic = realWay.GwId + "/Security/AdminSetNewPassword_Respon";

            Action<string, string> getResultAction = (topic, message) =>

            {

                try