Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

 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;
@@ -304,6 +308,15 @@
                    //中继器
                    deviceTypeR = R.MyInternationalizationString.Repeater;
                    break;
                case DeviceType.DoorLock:
                    //门锁
                    deviceTypeR = R.MyInternationalizationString.DoorLock;
                    break;

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