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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

old mode 100755
new mode 100644
@@ -202,7 +202,7 @@
            nameRow.SetTitle(string.IsNullOrEmpty(device.CommonDevice.DeviceEpointName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : device.CommonDevice.DeviceEpointName);
            nameFL.AddChidren(nameRow);

            

            var zoneFL = new FrameLayout
            {
                Height = Application.GetRealHeight(127 + 12)