20201224-3

wei

2020-12-24 d1af1b8337591363e60c286348501a841138dbb3

 HDL_ON/DAL/DriverLayer/Packet.cs

@@ -91,6 +91,14 @@
                }
                //处理接收到的数据
                UdpPacket_DataProcessing(subnetID, deviceID, command, usefulBytes);
#if DEBUG
                string ddd = "";
                foreach(var bb in usefulBytes)
                {
                    ddd += bb + ",";
                }
                MainPage.Log(ddd);
#endif
                //处理是否要重发数据
                ManagerReceive(subnetID, deviceID, command, usefulBytes);
            }
@@ -307,11 +315,11 @@
                            if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
                            {
                                ac.curTempType = receiveBytes[1];
                                ac.trait_IndoorTemp.curValue = receiveBytes[2];
                                ac.trait_IndoorTemp.curValue = receiveBytes[2].ToString();
                                ac.trait_on_off.curValue = receiveBytes[8] == 1 ? "on" : "off";
                                ac.curModeIndex = receiveBytes[9];
                                ac.curFanIndex = receiveBytes[10];
                                ac.trait_temp.curValue = receiveBytes[11];
                                ac.trait_temp.curValue = receiveBytes[11].ToString();
                                ac.lastState = "";
                                switch (ac.trait_mode.curValue.ToString())
                                {
@@ -401,31 +409,31 @@
                                {
                                    case "normal":
                                        fh.lastState = Language.StringByID(StringId.Normal);
                                        fh.trait_temp.curValue = receiveBytes[4];
                                        fh.trait_temp.curValue = receiveBytes[4].ToString();
                                        break;
                                    case "day":
                                        fh.lastState = Language.StringByID(StringId.Day);
                                        fh.trait_temp.curValue = receiveBytes[5];
                                        fh.trait_temp.curValue = receiveBytes[5].ToString();
                                        break;
                                    case "night":
                                        fh.lastState = Language.StringByID(StringId.Night);
                                        fh.trait_temp.curValue = receiveBytes[6];
                                        fh.trait_temp.curValue = receiveBytes[6].ToString();
                                        break;
                                    case "timer":
                                        fh.lastState = Language.StringByID(StringId.Auto);
                                        if (receiveBytes[8] == 0)
                                        {
                                            fh.timeFlag = 0;
                                            fh.trait_temp.curValue = receiveBytes[5];
                                            fh.trait_temp.curValue = receiveBytes[5].ToString();
                                        }
                                        else
                                        {
                                            fh.timeFlag = 1;
                                            fh.trait_temp.curValue = receiveBytes[6];
                                            fh.trait_temp.curValue = receiveBytes[6].ToString();
                                        }
                                        break;
                                    case "away":
                                        fh.trait_temp.curValue = receiveBytes[7];
                                        fh.trait_temp.curValue = receiveBytes[7].ToString();
                                        fh.lastState = Language.StringByID(StringId.Away);
                                        break;
                                }
@@ -535,7 +543,7 @@
                                    case 7:
                                    case 8:
                                    case 19:
                                        ac.trait_temp.curValue = receiveBytes[1];
                                        ac.trait_temp.curValue = receiveBytes[1].ToString();
                                        break;
                                    case 5:
                                        ac.curFanIndex = receiveBytes[1];
@@ -561,7 +569,7 @@
                        {
                            if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
                            {
                                ac.trait_IndoorTemp.curValue = receiveBytes[1];
                                ac.trait_IndoorTemp.curValue = receiveBytes[1].ToString();
                                FunctionPage.UpdataStates(ac);
                            }
                        }
@@ -572,6 +580,8 @@
                        MainPage.Log($"name : {Name} ; mac : {mac}");
                        if (DB_ResidenceData.Instance.residenceGatewayMAC == mac)
                        {
                            //本地搜索网关成功
                            Control.Ins.IsSearchLocalGatewaySuccessful = true;
                            Control.Ins.GatewayOnline = true;
                            Control.Ins.IsRemote = false;
                            DAL.Mqtt.MqttClient.DisConnectRemote();//断开mqtt