需要合并

gxc

2019-11-22 9c607e921ca7c379799e4dd88b140265a1d5d5c5

 ZigbeeApp/Shared/Common/DeviceUI.cs

@@ -35,9 +35,9 @@
                var myDevice = Common.LocalDevice.Current.GetDevice(DeviceAddr, DeviceEpoint);

                if (myDevice != null)

                {

                    return $"DeviceUI_{myDevice.FilePath}";

                    return myDevice.FilePath;

                }
                return $"DeviceUI_Unkwon";
                return $"Device_Unkwon";
            }
        }

@@ -304,6 +304,11 @@
                    //中继器
                    deviceTypeR = R.MyInternationalizationString.Repeater;
                    break;
                case DeviceType.DoorLock:
                    //门锁
                    deviceTypeR = R.MyInternationalizationString.DoorLock;
                    break;

                default:
                    deviceTypeR = R.MyInternationalizationString.UnknowDevice;
                    break;