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

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

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

old mode 100755
new mode 100644
@@ -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;