From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
index 3823419..624973a 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
+++ b/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;
}
}
--
Gitblit v1.8.0