合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

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

@@ -235,6 +235,8 @@
            var arry = tempValue.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);

            var objName = arry[0].Trim();



            //获取设备类型

            var deviceInfoType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(this.listNewDevice);

            foreach (var device in this.listNewDevice)

            {

                if (Common.LocalDevice.Current.GetSimpleEpointName(device) != string.Empty)

@@ -244,6 +246,11 @@
                var epointName = objName;

                if (this.listNewDevice.Count > 1)

                {

                    if (deviceInfoType.BeloneType == Common.DeviceBeloneType.A按键面板 && device.Type == DeviceType.TemperatureSensor)

                    {

                        //面板的最后一个回路是温度传感器

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

                    }

                    //XXXXX(N回路)

                    epointName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";

                }