合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -196,18 +196,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 +220,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 +231,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);
            });
        }
    }
}