Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs

@@ -4,9 +4,6 @@
using Shared.Common;
using Shared.Phone;
using Shared.R;
//if (Application.DeviceType == Device.Android) {
//}
//using UIKit;//ios平台才有，android没有；
using ZigBee.Device;