最新代码

黄学彪

2020-04-02 9904031f5291daaf56985146bb671f25e18ebbdf

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

@@ -104,6 +104,11 @@
        {

            if (device.Type == DeviceType.OnOffOutput)

            {

                //在网关没有回复之前,默认离线

                if (device.HadReadDeviceStatu == false)

                {

                    return Language.StringByID(R.MyInternationalizationString.uOffLine);

                }

                if ((device as ToggleLight).OnOffStatus == 1)

                {

                    return Language.StringByID(R.MyInternationalizationString.uOpen1);

@@ -112,6 +117,11 @@
            }

            else if (device.Type == DeviceType.AirSwitch)

            {

                //在网关没有回复之前,默认离线

                if (device.HadReadDeviceStatu == false)

                {

                    return Language.StringByID(R.MyInternationalizationString.uOffLine);

                }

                if ((device as AirSwitch).OnOffStatus == 1)

                {

                    return Language.StringByID(R.MyInternationalizationString.uOpen1);

@@ -120,6 +130,11 @@
            }

            else if (device.Type == DeviceType.DimmableLight)

            {

                //在网关没有回复之前,默认离线

                if (device.HadReadDeviceStatu == false)

                {

                    return Language.StringByID(R.MyInternationalizationString.uOffLine);

                }

                if ((device as DimmableLight).OnOffStatus == 0 || (device as DimmableLight).Level == 0)

                {

                    return Language.StringByID(R.MyInternationalizationString.Close);

@@ -128,6 +143,11 @@
            }

            else if (device.Type == DeviceType.WindowCoveringDevice)

            {

                //在网关没有回复之前,默认离线

                if (device.HadReadDeviceStatu == false)

                {

                    return Language.StringByID(R.MyInternationalizationString.uOffLine);

                }

                if ((device as Rollershade).WcdCurrentPositionLiftPercentage == 0)

                {

                    return Language.StringByID(R.MyInternationalizationString.Close);

@@ -136,6 +156,11 @@
            }

            else if (device.Type == DeviceType.Thermostat)

            {

                //在网关没有回复之前,默认离线

                if (device.HadReadDeviceStatu == false)

                {

                    return Language.StringByID(R.MyInternationalizationString.uOffLine);

                }

                //温度，模式，风速

                string tempareture = string.Empty;

                string model = string.Empty;

@@ -150,7 +175,7 @@
                else if (ac.currentSystemMode == 1)

                {

                    model = Language.StringByID(R.MyInternationalizationString.Mode_Auto);

                    tempareture = $"{ac.currentCoolingSetpoint} ℃";

                    tempareture = $"{ac.currentAutoSetpoint} ℃";

                }

                else if (ac.currentSystemMode == 3)

                {