From 6e1cf1b6c83c27107ed8de283b6c9db5dc9f1616 Mon Sep 17 00:00:00 2001
From: xingxing <xxx823952375@gmail.com>
Date: Sun, 27 Nov 2016 13:14:03 +0800
Subject: [PATCH] Fix time parse error, that ExceptionInInitializerError use
 https://github.com/dlew/joda-time-android library

---
 app/build.gradle                              |  7 +++
 .../java/org/houxg/leamonax/Leamonax.java     |  3 +
 .../org/houxg/leamonax/utils/TimeUtils.java   | 59 ++++---------------
 3 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f9b6c6b..ec1329a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,6 +32,11 @@ android {
         abortOnError false
     }
 
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -87,4 +92,6 @@ dependencies {
     compile 'com.facebook.stetho:stetho:1.4.1'
     compile 'com.github.houxg:FlexLayout:1.2'
     compile 'com.flurry.android:analytics:6.4.2'
+
+    compile 'net.danlew:android.joda:2.9.5'
 }
diff --git a/app/src/main/java/org/houxg/leamonax/Leamonax.java b/app/src/main/java/org/houxg/leamonax/Leamonax.java
index 076ffaa..f1dcea7 100644
--- a/app/src/main/java/org/houxg/leamonax/Leamonax.java
+++ b/app/src/main/java/org/houxg/leamonax/Leamonax.java
@@ -9,6 +9,8 @@ import com.flurry.android.FlurryAgent;
 import com.raizlabs.android.dbflow.config.FlowConfig;
 import com.raizlabs.android.dbflow.config.FlowManager;
 
+import net.danlew.android.joda.JodaTimeAndroid;
+
 import org.greenrobot.eventbus.EventBus;
 
 public class Leamonax extends Application {
@@ -33,5 +35,6 @@ public class Leamonax extends Application {
                 .installDefaultEventBus();
         FlowManager.init(new FlowConfig.Builder(this).build());
         Stetho.initializeWithDefaults(this);
+        JodaTimeAndroid.init(this);
     }
 }
diff --git a/app/src/main/java/org/houxg/leamonax/utils/TimeUtils.java b/app/src/main/java/org/houxg/leamonax/utils/TimeUtils.java
index f52677c..07b6bea 100644
--- a/app/src/main/java/org/houxg/leamonax/utils/TimeUtils.java
+++ b/app/src/main/java/org/houxg/leamonax/utils/TimeUtils.java
@@ -1,6 +1,13 @@
 package org.houxg.leamonax.utils;
 
 
+import android.text.format.DateUtils;
+import android.util.Log;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -8,66 +15,26 @@ import java.util.Date;
 import java.util.Locale;
 
 public class TimeUtils {
-
-    private static final SimpleDateFormat mServerWithMillsFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.US);
-    private static final SimpleDateFormat mServerFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
-    private static final SimpleDateFormat mTimeFormat = new SimpleDateFormat("H:mm:ss", Locale.US);
-    private static final SimpleDateFormat mDateFormat = new SimpleDateFormat("M-dd H:mm:ss", Locale.US);
-    private static final SimpleDateFormat mYearFormat = new SimpleDateFormat("yyyy-M-dd H:mm:ss", Locale.US);
+    public static final String TAG = "TimeUtils";
 
     public static long toTimestamp(String serverTime) {
-        try {
-            serverTime = StringUtils.replace(serverTime,
-                    "T\\d{2}:\\d{2}:\\d{2}.\\d+\\+",
-                    "\\.\\d+",
-                    new StringUtils.Replacer() {
-                        @Override
-                        public String replaceWith(String original, Object... extraData) {
-                            String modified;
-                            if (original.length() > 4) {
-                                modified = original.substring(0, 4);
-                            } else {
-                                modified = original;
-                            }
-                            return modified;
-                        }
-                    });
-            serverTime = StringUtils.replace(serverTime,
-                    "\\+\\d+:\\d+",
-                    "\\d+:\\d+",
-                    new StringUtils.Replacer() {
-                        @Override
-                        public String replaceWith(String original, Object... extraData) {
-                            String[] vals = original.split(":");
-                            return String.format(Locale.US, "%02d:%02d", Integer.valueOf(vals[0]), Integer.valueOf(vals[1]));
-                        }
-                    });
-            Date date = mServerWithMillsFormat.parse(serverTime);
-            return date.getTime();
-        } catch (ParseException e) {
-            try {
-                return mServerFormat.parse(serverTime).getTime();
-            } catch (ParseException e1) {
-                e.printStackTrace();
-                return -1;
-            }
-        }
+        return DateTime.parse(serverTime).getMillis();
     }
 
     public static String toServerTime(long timeInMills) {
-        return mServerWithMillsFormat.format(new Date(timeInMills));
+        return DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").print(timeInMills);
     }
 
     public static String toTimeFormat(long timeInMills) {
-        return mTimeFormat.format(new Date(timeInMills));
+        return DateTimeFormat.forPattern("H:mm:ss").print(timeInMills);
     }
 
     public static String toDateFormat(long timeInMills) {
-        return mDateFormat.format(new Date(timeInMills));
+        return DateTimeFormat.forPattern("M-dd H:mm:ss").print(timeInMills);
     }
 
     public static String toYearFormat(long timeInMills) {
-        return mYearFormat.format(new Date(timeInMills));
+        return DateTimeFormat.forPattern("yyyy-M-dd H:mm:ss").print(timeInMills);
     }
 
     public static Calendar getToday() {