临时备份

xm

2020-07-31 ecba45c93391066bc30c7bd602c3a7683fbb99a7

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

@@ -313,7 +313,7 @@
                    //烟雾

                    if (ias.iASInfo?.Alarm1 == 1)

                    {

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

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

                    }

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

                }

@@ -322,9 +322,9 @@
                    //pir

                    if (ias.iASInfo?.Alarm1 == 1)

                    {

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

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

                    }

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

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

                }

                else if (info.ConcreteType == DeviceConcreteType.Sensor_Keyfob)

                {

@@ -340,9 +340,9 @@
                    //运动传感器

                    if (ias.iASInfo?.Alarm1 == 1)

                    {

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

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

                    }

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

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

                }

                else if (info.ConcreteType == DeviceConcreteType.Sensor_EmergencyButton)

                {