时间问题修复

This commit is contained in:
jinyuera
2021-12-05 17:54:58 +08:00
parent 0761fbd2d3
commit 8e5788d6df
4 changed files with 14 additions and 14 deletions

View File

@@ -37,8 +37,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
// multiDexEnabled true // multiDexEnabled true
versionCode 1 versionCode 2
versionName "1.1.1" versionName "1.1.2"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
ndk { ndk {

View File

@@ -1 +0,0 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

View File

@@ -5,7 +5,7 @@
<!-- Required 一些系统要求的权限,如访问网络等 --> <!-- Required 一些系统要求的权限,如访问网络等 -->
<!-- <uses-permission android:name="android.permission.READ_CALENDAR" /> <!-- <uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_CALENDAR" /-->> <uses-permission android:name="android.permission.WRITE_CALENDAR" /-->
<uses-permission android:name="com.nifengkeji.xyq.permission.JPUSH_MESSAGE" /> <uses-permission android:name="com.nifengkeji.xyq.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" /> <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />

View File

@@ -27,17 +27,18 @@ public class TimeUtils {
} else if (span < TimeConstants.DAY) { } else if (span < TimeConstants.DAY) {
return String.format(Locale.getDefault(), "%d小时前", span / TimeConstants.HOUR); return String.format(Locale.getDefault(), "%d小时前", span / TimeConstants.HOUR);
} else if (span < TimeConstants.MONTH) { } else if (span < TimeConstants.MONTH) {
if (span / TimeConstants.DAY >= 7) { // if (span / TimeConstants.DAY >= 7) {
SimpleDateFormat sdr = new SimpleDateFormat("MM-dd", // SimpleDateFormat sdr = new SimpleDateFormat("MM-dd",
Locale.CHINA); // Locale.CHINA);
return sdr.format(millis); // return sdr.format(millis);
} else { // } else {
String format = String.format(Locale.getDefault(), "%d天前", span / TimeConstants.DAY); //
//
// }
String format = String.format(Locale.getDefault(), "%d天前", span / TimeConstants.DAY);
Log.e("format",format); Log.e("format",format);
return format; return format;
}
} else if (span < TimeConstants.YEAR) { } else if (span < TimeConstants.YEAR) {
SimpleDateFormat sdr; SimpleDateFormat sdr;
if (span / TimeConstants.MONTH >= 6) { if (span / TimeConstants.MONTH >= 6) {