合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs

@@ -271,6 +271,14 @@
                        //面板的最后一个回路是温度传感器

                        epointName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId11);

                    }

                    else if (deviceInfoType.ConcreteType == Common.DeviceConcreteType.Sensor_Pir)

                    {

                        //pir传感器,它又搞特殊东西,传感器自身用自己的名字,继电器回路的话……

                        if (device.Type == DeviceType.OnOffOutput)

                        {

                            epointName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2300);

                        }

                    }

                    else

                    {

                        //XXXXX(N回路)