新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/Device/CommonForm/SelectTime.cs

@@ -4,7 +4,7 @@

namespace Shared.Phone.Device.CommonForm
{
    public class SelectTime: UserCenter.FrameLayoutBase
    public class SelectTime : FrameLayoutBase
    {
        public Action<int> TimeAction;

@@ -68,7 +68,7 @@

            var confrim=new Button
            {
                X = Application.GetRealWidth(CommonFormResouce.AppRealWidth-80-300),
                X = dialog.Width - Application.GetRealWidth(80 - 300),
                Width = Application.GetRealWidth(300),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
@@ -202,7 +202,7 @@
            timeBtn.MouseUpEventHandler += eventHandler;
            trow.MouseUpEventHandler += eventHandler;

            timeBtn.Text =CommonFormResouce.GetTimeString(timess);
            timeBtn.Text = this.GetTimeString(timess);

            if (timess == TempTime)
            {
@@ -215,6 +215,49 @@
        }

        /// <summary>
        /// 获取场景延时字符串
        /// </summary>
        /// <param name="second"></param>
        /// <returns></returns>
        private string GetTimeString(int second)
        {
            if (second == 0)
            {
                return null;
            }
            string timeStr = string.Empty;
            int hour = second / 3600;
            int minu = second % 3600 / 60;
            int sec = second % 60;
            if (hour > 0)
            {
                timeStr += $"{hour}{Language.StringByID(R.MyInternationalizationString.Hour)}";
                if (minu > 0)
                {
                    timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                }
                if (sec > 0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
                return timeStr;
            }
            else if (minu > 0)
            {
                timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                if (sec > 0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
                return timeStr;
            }
            else
            {
                return $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
            }
        }

        /// <summary>
        /// Close
        /// </summary>
        /// <param name="sender"></param>