2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

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

@@ -11,14 +11,23 @@
        public const int AppRealWidth = 1080;

        /// <summary>
        /// 14
        /// </summary>
        public const int TextSize = 14;
        /// <summary>
        /// 16
        /// </summary>
        public const int TextSize_Selected = 16;

        /// <summary>
        /// 字体12
        /// </summary>
        public const int loginTextSize = 12;
        /// <summary>
        /// 占位字体大小
        /// 12
        /// 14
        /// </summary>
        public const int PlaceHolderTextSize = 12;
        public const int PlaceHolderTextSize = 14;

        /// <summary>
        /// Row_Height
@@ -45,13 +54,13 @@
        /// </summary>
        public const int TopFrameLayout_Height = 184;
        /// <summary>
        /// topview 状态栏高度 60
        /// topview 状态栏高度 74
        /// </summary>
        public const int TopStatuFrameLayout_Height = 60;
        public const int TopStatuFrameLayout_Height = 74;
        /// <summary>
        /// topview 状态栏高度 124
        /// topview 状态栏高度 110
        /// </summary>
        public const int Topview_Height = 124;
        public const int Topview_Height = 110;

        /// <summary>
        /// 标题大小 17
@@ -196,18 +205,22 @@
        /// <returns></returns>
        public static string GetTimeString(int second)
        {
            string timeStr=string.Empty;
            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)
                if (minu > 0)
                {
                    timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                }
                if(sec>0)
                if (sec > 0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
@@ -216,7 +229,7 @@
            else if (minu > 0)
            {
                timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                if(sec>0)
                if (sec > 0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
@@ -227,6 +240,21 @@
                return $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
            }
        }
    }

        /// <summary>
        /// 显示提示
        /// </summary>
        /// <param name="r">The red component.</param>
        public static void ShowTip(string msg)
        {
            Application.RunOnMainThread(() =>
            {
                var myTip = new Tip();
                myTip.Direction = AMPopTipDirection.None;
                myTip.CloseTime = 2;
                myTip.Text = msg;
                myTip.Show(Common.CommonPage.Instance);
            });
        }
    }
}