diff --git a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java index 182b8915..4d71fd90 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java @@ -27,6 +27,7 @@ import com.idormy.sms.forwarder.BroadCastReceiver.SmsForwarderBroadcastReceiver; import com.idormy.sms.forwarder.adapter.LogAdapter; import com.idormy.sms.forwarder.model.vo.LogVo; import com.idormy.sms.forwarder.utils.LogUtil; +import com.idormy.sms.forwarder.utils.aUtil; import com.umeng.analytics.MobclickAgent; import java.util.ArrayList; @@ -130,9 +131,9 @@ public class MainActivity extends AppCompatActivity implements ReFlashListView.I builder.setTitle("详情"); String simInfo = logVo.getSimInfo(); if (simInfo != null) { - builder.setMessage(logVo.getFrom() + "\n\n" + logVo.getContent() + "\n\n" + logVo.getSimInfo() + "\n\n" + logVo.getRule() + "\n\n" + logVo.getTime()); + builder.setMessage(logVo.getFrom() + "\n\n" + logVo.getContent() + "\n\n" + logVo.getSimInfo() + "\n\n" + logVo.getRule() + "\n\n" + aUtil.utc2Local(logVo.getTime())); } else { - builder.setMessage(logVo.getFrom() + "\n\n" + logVo.getContent() + "\n\n" + logVo.getRule() + "\n\n" + logVo.getTime()); + builder.setMessage(logVo.getFrom() + "\n\n" + logVo.getContent() + "\n\n" + logVo.getRule() + "\n\n" + aUtil.utc2Local(logVo.getTime())); } builder.show(); } diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/aUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/aUtil.java index fca29a43..3a56cc29 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/aUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/aUtil.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Environment; -import android.util.Log; import java.io.File; import java.io.FileInputStream; @@ -13,6 +12,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; +import java.util.TimeZone; public class aUtil { private static String TAG = "aUtil"; @@ -59,19 +59,19 @@ public class aUtil { } //友好时间显示 - public static String friendlyTime(String sdate) { - - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date time = null; + public static String friendlyTime(String utcTime) { + SimpleDateFormat utcFormater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + utcFormater.setTimeZone(TimeZone.getTimeZone("UTC"));//时区定义并进行时间获取 + Date utcDate = null; try { - time = sf.parse(sdate); + utcDate = utcFormater.parse(utcTime); } catch (ParseException e) { e.printStackTrace(); + return utcTime; } - Log.d(TAG, time.getTime() + ""); - //获取time距离当前的秒数 - int ct = (int) ((System.currentTimeMillis() - time.getTime()) / 1000); + //获取utcDate距离当前的秒数 + int ct = (int) ((System.currentTimeMillis() - utcDate.getTime()) / 1000); if (ct == 0) { return "刚刚"; @@ -97,4 +97,31 @@ public class aUtil { return ct / 31104000 + "年前"; } + + /** + * 函数功能描述:UTC时间转本地时间格式 + * + * @param utcTime UTC时间 + * @return 本地时间格式的时间 + */ + public static String utc2Local(String utcTime) { + String utcTimePatten = "yyyy-MM-dd HH:mm:ss"; + String localTimePatten = "yyyy-MM-dd HH:mm:ss"; + SimpleDateFormat utcFormater = new SimpleDateFormat(utcTimePatten); + utcFormater.setTimeZone(TimeZone.getTimeZone("UTC"));//时区定义并进行时间获取 + + Date utcDate = null; + try { + utcDate = utcFormater.parse(utcTime); + } catch (ParseException e) { + e.printStackTrace(); + return utcTime; + } + + SimpleDateFormat localFormater = new SimpleDateFormat(localTimePatten); + localFormater.setTimeZone(TimeZone.getDefault()); + String localTime = localFormater.format(utcDate.getTime()); + return localTime; + } + } diff --git a/app/src/main/res/layout/tlog_item.xml b/app/src/main/res/layout/tlog_item.xml index 9778e4a4..d029cca2 100644 --- a/app/src/main/res/layout/tlog_item.xml +++ b/app/src/main/res/layout/tlog_item.xml @@ -8,27 +8,26 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_alignParentEnd="true" - android:layout_marginLeft="10dp" + android:layout_marginLeft="5dp" android:layout_marginTop="10dp" /> + android:paddingTop="5dp" + android:paddingBottom="5dp"> + android:layout_alignParentStart="true" />