From 8e5788d6dfd21f2ff83faf1df17df5d733c60452 Mon Sep 17 00:00:00 2001
From: jinyuera <454386664@qq.com>
Date: Sun, 5 Dec 2021 17:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                       |  4 ++--
 app/release/output.json                |  1 -
 app/src/main/AndroidManifest.xml       |  2 +-
 app/src/main/java/utils/TimeUtils.java | 21 +++++++++++----------
 4 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 app/release/output.json

diff --git a/app/build.gradle b/app/build.gradle
index 7c71ba8..c10a5fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
 //        multiDexEnabled true
-        versionCode 1
-        versionName "1.1.1"
+        versionCode 2
+        versionName "1.1.2"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
 
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index 6270ab4..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -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":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b5191af..ece7436 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <!-- Required 一些系统要求的权限，如访问网络等 -->
     <!--  <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="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/app/src/main/java/utils/TimeUtils.java b/app/src/main/java/utils/TimeUtils.java
index b376ec1..b16d5e9 100644
--- a/app/src/main/java/utils/TimeUtils.java
+++ b/app/src/main/java/utils/TimeUtils.java
@@ -27,17 +27,18 @@ public class TimeUtils {
         } else if (span < TimeConstants.DAY) {
             return String.format(Locale.getDefault(), "%d小时前", span / TimeConstants.HOUR);
         } else if (span < TimeConstants.MONTH) {
-            if (span / TimeConstants.DAY >= 7) {
-                SimpleDateFormat sdr = new SimpleDateFormat("MM-dd",
-                        Locale.CHINA);
-                return sdr.format(millis);
-            } else {
-                String format = String.format(Locale.getDefault(), "%d天前", span / TimeConstants.DAY);
+//            if (span / TimeConstants.DAY >= 7) {
+//                SimpleDateFormat sdr = new SimpleDateFormat("MM-dd",
+//                        Locale.CHINA);
+//                return sdr.format(millis);
+//            } else {
+//
+//
+//            }
+            String format = String.format(Locale.getDefault(), "%d天前", span / TimeConstants.DAY);
 
-                Log.e("format",format);
-                return format;
-
-            }
+            Log.e("format",format);
+            return format;
         } else if (span < TimeConstants.YEAR) {
             SimpleDateFormat sdr;
             if (span / TimeConstants.MONTH >= 6) {