合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Common/DeviceUI.cs

@@ -208,6 +208,10 @@
                    //中继器
                    ImagePath = "Device/AirSwitch.png";
                    break;
                case DeviceType.TemperatureSensor:
                    //温湿度传感器
                    ImagePath = "Device/Sensor.png";
                    break;
                default:
                    ImagePath= "Device/Relay.png";
                    break;
@@ -309,6 +313,10 @@
                    deviceTypeR = R.MyInternationalizationString.DoorLock;
                    break;

                case DeviceType.TemperatureSensor:
                    //温度传感器
                    deviceTypeR = R.MyInternationalizationString.TemperatureAndHumiditySensor;
                    break;
                default:
                    deviceTypeR = R.MyInternationalizationString.UnknowDevice;
                    break;