20200715

wxr

2020-07-15 9dcd17ee7578c5a06bfcd960cc72ea2995716004

 HDL_ON/DriverLayer/CommonPage.cs

@@ -211,8 +211,25 @@
                    case Command.ReadCurtainStutasACK:
                        foreach (var curtain in DB_ResidenceData.residenceData.functionList.curtains)
                        {
                            if (curtain.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
                            if (curtain.bus_Data.SubnetID == subnetID && curtain.bus_Data.DeviceID == deviceID)
                            {
                                if (receiveBytes[0] == 17)
                                {
                                    if (receiveBytes[1] > 1)
                                    {
                                        curtain.on_off = "on";
                                    }
                                    else
                                    {
                                        curtain.on_off = "off";
                                    }
                                    curtain.openLevel = receiveBytes[1];
                                    curtain.lastState = Language.StringByID(StringId.Open) + curtain.openLevel + "%";
                                }
                                else
                                {
                                    if (curtain.bus_Data.LoopID != receiveBytes[0])
                                        continue;
                                switch(receiveBytes[1])
                                {
                                    case 0:
@@ -226,23 +243,13 @@
                                        curtain.on_off = "off";
                                        curtain.lastState = Language.StringByID(StringId.Close);
                                        break;
                                    default:
                                        if (receiveBytes[1] > 1)
                                        {
                                            curtain.on_off = "on";
                                        }
                                        else
                                        {
                                            curtain.on_off = "off";
                                        }
                                        curtain.openLevel = receiveBytes[1];
                                        curtain.lastState = Language.StringByID(StringId.Open) + curtain.openLevel + "%";
                                        break;
                                }
                                RoomPage.UpdataStates(curtain);
                                FunctionPage.UpdataStates(curtain);
                                HomePage.UpdataFunctionStates(curtain);
                                ClassificationPage.UpdataInfo(curtain);
                                RollingShutterPage.UpdataState(curtain);
                                switch (curtain.functionType)
                                {
                                    case FunctionType.Curtain: