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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs

@@ -144,7 +144,7 @@
            };
            bodyFrameLayout.AddChidren(deviceIMG);

            var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device.CommonDevice });
            var info = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device.CommonDevice);

            var deviceTypeName = new Button()
            {