UI: Fix some bug

Signed-off-by: Fung Gwo <[email protected]>
fython · Feb 17, 2019 · dfbd462 · dfbd462
1 parent a24a01a
commit dfbd462
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/mobile/src/main/kotlin/info/papdt/express/helper/model/Kuaidi100Package.kt b/mobile/src/main/kotlin/info/papdt/express/helper/model/Kuaidi100Package.kt
@@ -108,11 +108,15 @@ class Kuaidi100Package() : Parcelable {
     }
 
     fun getLastStatusTime(): Calendar {
-        if (data?.isNotEmpty() == true) {
-            val dates = data!!.map {
-                DateHelper.dateToCalendar(DEFAULT_STATUS_TIME_FORMAT.parse(it.ftime!!))
+        try {
+            if (data?.isNotEmpty() == true) {
+                val dates = data!!.map {
+                    DateHelper.dateToCalendar(DEFAULT_STATUS_TIME_FORMAT.parse(it.ftime ?: it.time))
+                }
+                return dates.sorted().last()
             }
-            return dates.sorted().last()
+        } catch (ignored: Exception) {
+
         }
         return Calendar.getInstance().apply { add(Calendar.YEAR, 1) }
     }

diff --git a/mobile/src/main/kotlin/info/papdt/express/helper/ui/DetailsActivity.kt b/mobile/src/main/kotlin/info/papdt/express/helper/ui/DetailsActivity.kt
@@ -238,6 +238,10 @@ class DetailsActivity : AbsActivity() {
 		}
 
 		override fun onPostExecute(items: Items) {
+            if (!this@DetailsActivity::data.isInitialized) {
+                return
+            }
+
 			mStatusBinder.setData(data)
 			mAdapter.items = items
 			mStatusBinder.showChiba =