Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -353,6 +353,15 @@
                    }

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

                }

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

                {

                    //球型移动传感器

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

                    {

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

                    }

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

                }

                else

                {

                    //其他传感器