请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs

@@ -275,7 +275,7 @@
                    ShowErrorTip(Language.StringByID(R.MyInternationalizationString.timeNull),true);
                    return;
                }
                if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12)
                if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12|| int.Parse(editTime.Text)>(int.MaxValue-1))
                {  ///限制输入数字范围;
                    string str = Language.StringByID(R.MyInternationalizationString.less) + Language.StringByID(R.MyInternationalizationString.or) + Language.StringByID(R.MyInternationalizationString.more);
                    ShowErrorTip(str, true);
@@ -469,7 +469,7 @@
                TextSize = 14,
            };
            tipFLayout.AddChidren(Text1Btn);



           
            new System.Threading.Thread(() =>
            {
                System.Threading.Thread.Sleep(timeValue*1000);
@@ -482,3 +482,5 @@
        }
    }
}