上传代码

黄学彪

2020-05-13 2be70a32d2a8c517bd9868fb60913fcc843e66fe

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

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

@@ -2085,7 +2085,7 @@
                            dicSort[modelNo] = Language.StringByID(R.MyInternationalizationString.Mode_Dry);

                        }

                    }

                    else if (info.Data1 == 4 || info.Data1 == 5)

                    else if (info.Data1 == 4 || info.Data1 == 5|| info.Data1 == 7)

                    {

                        //温度

                        dicSort[temparetureNo] = $"{ info.Data2 / 100}℃";