Fix force close for Android 4.x due to multiDex

ccjeng · Sep 29, 2016 · 0ea9bb8 · 0ea9bb8
1 parent 5c31138
commit 0ea9bb8
Show file tree

Hide file tree

Showing 13 changed files with 294 additions and 135 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'com.oddsoft.tpetrash2'
         minSdkVersion 16
         targetSdkVersion 21
-        versionCode 58
-        versionName '4.3.1.092816TT'
+        versionCode 59
+        versionName '4.3.2.092916TT'
         multiDexEnabled true
     }
     buildTypes {
@@ -57,6 +57,7 @@ dependencies {
     compile 'com.google.firebase:firebase-config:9.6.1'
     compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:multidex:1.0.1'
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.mikepenz:iconics-core:2.7.1@aar'
     compile 'com.mikepenz:fontawesome-typeface:4.5.0.1@aar'

diff --git a/...oft/tpetrash2/view/adapter/ArrayItem.java → ...om/oddsoft/tpetrash2/model/ArrayItem.java b/...oft/tpetrash2/view/adapter/ArrayItem.java → ...om/oddsoft/tpetrash2/model/ArrayItem.java
@@ -1,4 +1,4 @@
-package com.oddsoft.tpetrash2.view.adapter;
+package com.oddsoft.tpetrash2.model;
 
 /**
  * Data model for a trash item.

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/InfoPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/InfoPresenter.java
@@ -29,7 +29,7 @@
 import com.oddsoft.tpetrash2.utils.Analytics;
 import com.oddsoft.tpetrash2.utils.Constant;
 import com.oddsoft.tpetrash2.utils.Time;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 import com.oddsoft.tpetrash2.view.adapter.CustomInfoWindowAdapter;
 import com.oddsoft.tpetrash2.view.base.Application;
 

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSPresenter.java
@@ -14,7 +14,7 @@
 import com.oddsoft.tpetrash2.controller.LocationService;
 import com.oddsoft.tpetrash2.presenter.base.BasePresenter;
 import com.oddsoft.tpetrash2.utils.Utils;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 import com.oddsoft.tpetrash2.view.base.Application;
 
 import java.util.List;

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSView.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/LBSView.java
@@ -3,7 +3,7 @@
 import android.location.Location;
 
 import com.oddsoft.tpetrash2.utils.Utils;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 
 import java.util.List;
 

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryPresenter.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryPresenter.java
@@ -11,7 +11,7 @@
 import com.oddsoft.tpetrash2.R;
 import com.oddsoft.tpetrash2.presenter.base.BasePresenter;
 import com.oddsoft.tpetrash2.utils.Utils;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 
 import java.util.List;
 

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryView.java b/app/src/main/java/com/oddsoft/tpetrash2/presenter/QueryView.java
@@ -1,7 +1,7 @@
 package com.oddsoft.tpetrash2.presenter;
 
 import com.oddsoft.tpetrash2.utils.Utils;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 
 import java.util.List;
 

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/LBSActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/LBSActivity.java
@@ -29,7 +29,7 @@
 import com.oddsoft.tpetrash2.utils.Constant;
 import com.oddsoft.tpetrash2.utils.Time;
 import com.oddsoft.tpetrash2.utils.Utils;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 import com.oddsoft.tpetrash2.view.adapter.ArrayItemAdapter;
 import com.oddsoft.tpetrash2.view.base.Application;
 import com.oddsoft.tpetrash2.view.base.MVPBaseActivity;

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/activity/QueryActivity.java b/app/src/main/java/com/oddsoft/tpetrash2/view/activity/QueryActivity.java
@@ -28,7 +28,7 @@
 import com.oddsoft.tpetrash2.utils.Constant;
 import com.oddsoft.tpetrash2.utils.Time;
 import com.oddsoft.tpetrash2.utils.Utils;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 import com.oddsoft.tpetrash2.view.adapter.ArrayItemAdapter;
 import com.oddsoft.tpetrash2.view.base.Application;
 import com.oddsoft.tpetrash2.view.base.MVPBaseActivity;

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/ArrayItemAdapter.java b/app/src/main/java/com/oddsoft/tpetrash2/view/adapter/ArrayItemAdapter.java
@@ -10,6 +10,7 @@
 import android.widget.TextView;
 
 import com.oddsoft.tpetrash2.R;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 import com.oddsoft.tpetrash2.utils.Time;
 import com.oddsoft.tpetrash2.utils.Utils;
 

diff --git a/app/src/main/java/com/oddsoft/tpetrash2/view/base/Application.java b/app/src/main/java/com/oddsoft/tpetrash2/view/base/Application.java
@@ -4,6 +4,8 @@
  * Created by andycheng on 2015/5/5.
  */
 
+import android.support.multidex.MultiDexApplication;
+
 import com.avos.avoscloud.AVOSCloud;
 import com.avos.avoscloud.AVObject;
 import com.google.android.gms.analytics.GoogleAnalytics;
@@ -12,11 +14,11 @@
 import com.oddsoft.tpetrash2.BuildConfig;
 import com.oddsoft.tpetrash2.R;
 import com.oddsoft.tpetrash2.utils.Constant;
-import com.oddsoft.tpetrash2.view.adapter.ArrayItem;
+import com.oddsoft.tpetrash2.model.ArrayItem;
 
 import java.util.HashMap;
 
-public class Application extends android.app.Application {
+public class Application extends MultiDexApplication {
     // Debugging switch 
     public static final boolean APPDEBUG = BuildConfig.DEBUG;
     public static final String APPTAG = Application.class.getSimpleName();

diff --git a/app/src/main/res/values/updates.xml b/app/src/main/res/values/updates.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <string-array name="updates">
-    	<item>4.3.1\n增加訊息公告
-			\n\n歡迎加入臉書粉絲專頁
+    	<item>4.3.2\n修正Android 4.x裝置無法使用部分功能的問題
 		</item>
 </string-array>
 </resources>