请合并新代码，更改多功能面板绑定表重复问题

xm

2020-08-14 a45fe56aeeac8f28a9891b83362954067c8166dc

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

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

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

                    {

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

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

                    }

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

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

                    }

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

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

                }

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

                {

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

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

                    {

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

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

                    }

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

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

                }

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

                {

@@ -377,19 +377,19 @@
                var tempera = device as TemperatureSensor;

                if (tempera.SensorDiv == 1)

                {

                    if (tempera.Temperatrue == 0)

                    if (tempera.currentTemperature == 0)

                    {

                        return "--℃";

                        return "0.0℃";

                    }

                    return $"{tempera.Temperatrue}℃";

                    return $"{tempera.currentTemperature}℃";

                }

                else if (tempera.SensorDiv == 2)

                {

                    if (tempera.Humidity == 0)

                    if (tempera.currentHumidity == 0)

                    {

                        return "--%";

                    }

                    return $"{tempera.Humidity}%";

                    return $"{tempera.currentHumidity}%";

                }

                return null;

            }