2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

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

@@ -1154,10 +1154,10 @@
                    }

                    else if (data.Type == "1")

                    {

                        var scene = Common.SceneRoomUI.AllSceneRoomUIList.Find((obj) => obj.sceneUI.Id == data.ScenesId);

                        var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(data.ScenesId);

                        if (scene != null)

                        {

                            string msg = scene.sceneUI.Name + "\r\n";

                            string msg = scene.Name + "\r\n";

                            //目标场景不存在

                            msg += Language.StringByID(R.MyInternationalizationString.uTargetSceneIsNotExsit);

                            this.ShowTipMsg(msg);

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