2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

old mode 100755
new mode 100644
@@ -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
@@ -196,21 +205,56 @@
        /// <returns></returns>
        public static string GetTimeString(int second)
        {
            string tStr;
            if (second / 3600 > 0)
            if (second == 0)
            {
                tStr = $"{second / 3600}{Language.StringByID(R.MyInternationalizationString.Hour)}";
                return null;
            }
            else if (second / 60 > 0)
            string timeStr = string.Empty;
            int hour = second / 3600;
            int minu = second % 3600 / 60;
            int sec = second % 60;
            if (hour > 0)
            {
                tStr = $"{second / 60}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                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
            {
                tStr = $"{second}{Language.StringByID(R.MyInternationalizationString.Second)}";
                return $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
            }
            return tStr;
        }

        /// <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);
            });
        }
    }

}