Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 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;


@@ -199,7 +196,10 @@
            ///完成点击事件
            btnsave.MouseUpEventHandler += (sender, e) =>
            {
                
                if (timevalue == 0)
                {
                    return;
                }
                if (selectde != ""|| timevalue==5)
                {
                    Dictionary<string, object> actionsInfo = new Dictionary<string, object>();