合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

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

@@ -196,20 +196,36 @@
        /// <returns></returns>
        public static string GetTimeString(int second)
        {
            string tStr;
            if (second / 3600 > 0)
            string timeStr=string.Empty;
            int hour = second / 3600;
            int minu = second % 3600 / 60;
            int sec = second % 60;
            if (hour > 0)
            {
                tStr = $"{second / 3600}{Language.StringByID(R.MyInternationalizationString.Hour)}";
                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 (second / 60 > 0)
            else if (minu > 0)
            {
                tStr = $"{second / 60}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                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;
        }
    }