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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 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;


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