From 0a98073283b211e44819eddac069f8269699bc2e Mon Sep 17 00:00:00 2001
From: kfl_614 <kfl_614@163.com>
Date: Tue, 24 Mar 2020 18:51:37 +0800
Subject: [PATCH] =?utf8?q?1.=E4=BF=AE=E5=A4=8DFragment=20commit=20=20?=
 =?utf8?q?=E6=8F=90=E4=BA=A4=E4=BC=9A=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8?=
 =?utf8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: kfl_614 <kfl_614@163.com>
---
 app/src/main/AndroidManifest.xml                          | 2 ++
 .../main/java/com/ic/launcher/IcLauncherApplication.java  | 4 ++--
 app/src/main/java/com/ic/launcher/MainActivity.java       | 8 +++++++-
 app/version_code.properties                               | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c8fe296..bafab39 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".IcLauncherApplication"
diff --git a/app/src/main/java/com/ic/launcher/IcLauncherApplication.java b/app/src/main/java/com/ic/launcher/IcLauncherApplication.java
index ce9624c..24b1c8f 100644
--- a/app/src/main/java/com/ic/launcher/IcLauncherApplication.java
+++ b/app/src/main/java/com/ic/launcher/IcLauncherApplication.java
@@ -30,8 +30,8 @@ public class IcLauncherApplication extends Application {
         appListPresenter = new AppListPresenter(this);
         mHardwarePresenter = new HardwarePresenter(this);
 
-        //CrashHandler crashHandler = CrashHandler.getInstance();
-        //crashHandler.init(getApplicationContext());
+        CrashHandler crashHandler = CrashHandler.getInstance();
+        crashHandler.init(getApplicationContext());
     }
 
     public PhoneStatePresenter getPhoneStatePresenter() {
diff --git a/app/src/main/java/com/ic/launcher/MainActivity.java b/app/src/main/java/com/ic/launcher/MainActivity.java
index c471081..dea0c91 100644
--- a/app/src/main/java/com/ic/launcher/MainActivity.java
+++ b/app/src/main/java/com/ic/launcher/MainActivity.java
@@ -95,6 +95,10 @@ public class MainActivity extends AppCompatActivity implements
     }
 
     private void commitFragment(Fragment fragment) {
+        if (isFinishing()) {
+            return;
+        }
+
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
         for (int i = 0; i < mAddFt.size(); i++) {
@@ -110,7 +114,9 @@ public class MainActivity extends AppCompatActivity implements
             fragmentTransaction.add(R.id.main_content_fl, fragment);
         }
 
-        fragmentTransaction.commitAllowingStateLoss();
+        //fragmentTransaction.commitAllowingStateLoss();
+
+        fragmentTransaction.commit();
     }
 
     @Override
diff --git a/app/version_code.properties b/app/version_code.properties
index 9d0e34f..61818d9 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Mar 07 15:05:05 CST 2020
-VERSION_CODE=10
+#Tue Mar 24 16:41:40 CST 2020
+VERSION_CODE=14
-- 
2.17.1