diff --git a/appbase/build.properties b/appbase/build.properties index a1322c2..692b0a4 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Feb 09 03:17:19 GMT 2025 +#Sun Feb 09 03:32:31 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=1.2 publishVersion=1.2.0 -buildCount=326 +buildCount=334 baseBetaVersion=1.2.1 diff --git a/libappbase/build.properties b/libappbase/build.properties index a1322c2..692b0a4 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Feb 09 03:17:19 GMT 2025 +#Sun Feb 09 03:32:31 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=1.2 publishVersion=1.2.0 -buildCount=326 +buildCount=334 baseBetaVersion=1.2.1 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java index fb482d3..7766acf 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java @@ -44,12 +44,15 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import android.widget.LinearLayout; +import android.content.pm.ApplicationInfo; public final class CrashHandler { public static final String TAG = "CrashHandler"; public static final String TITTLE = "CrashReport"; + + private static final String EXTRA_CRASH_INFO = "crashInfo"; final static String PREFS = CrashHandler.class.getName() + "PREFS"; final static String PREFS_CRASHHANDLER_ISCRASHHAPPEN = "PREFS_CRASHHANDLER_ISCRASHHAPPEN"; @@ -128,7 +131,7 @@ public final class CrashHandler { LogUtils.d(TAG, "gotoCrashActiviy: isAppCrashSafetyWireOK"); //AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(app); intent.setClass(app, GlobalCrashActiviy.class); - intent.putExtra(GlobalCrashActiviy.EXTRA_CRASH_INFO, errorLog); + intent.putExtra(EXTRA_CRASH_INFO, errorLog); // 如果发生了 CrashHandler 内部崩溃, 就调用基础的应用崩溃显示类 // intent.setClass(app, GlobalCrashActiviy.class); // intent.putExtra(GlobalCrashActiviy.EXTRA_CRASH_INFO, errorLog); @@ -138,7 +141,7 @@ public final class CrashHandler { AppCrashSafetyWire.getInstance().resumeToMaximumImmediately(); // 正常状态调用进阶的应用崩溃显示页 intent.setClass(app, CrashActiviy.class); - intent.putExtra(CrashActiviy.EXTRA_CRASH_INFO, errorLog); + intent.putExtra(EXTRA_CRASH_INFO, errorLog); } @@ -349,11 +352,20 @@ public final class CrashHandler { // } } + + public static String getAppName(Context context) { + PackageManager packageManager = context.getPackageManager(); + try { + ApplicationInfo applicationInfo = packageManager.getApplicationInfo( + context.getPackageName(), 0); + return (String) packageManager.getApplicationLabel(applicationInfo); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return null; + } public static final class CrashActiviy extends Activity implements MenuItem.OnMenuItemClickListener { - - private static final String EXTRA_CRASH_INFO = "crashInfo"; - private static final int MENUITEM_COPY = 0; private static final int MENUITEM_RESTART = 1; @@ -381,7 +393,8 @@ public final class CrashHandler { contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); setContentView(contentView); - getActionBar().setTitle(TITTLE + "(inside)"); + getActionBar().setTitle(TITTLE); + getActionBar().setSubtitle("GlobalCrashActiviy Error"); } } @@ -438,8 +451,6 @@ public final class CrashHandler { public static final class GlobalCrashActiviy extends Activity implements MenuItem.OnMenuItemClickListener { - private static final String EXTRA_CRASH_INFO = "crashInfo"; - private static final int MENUITEM_COPY = 0; private static final int MENUITEM_RESTART = 1; @@ -515,6 +526,7 @@ public final class CrashHandler { // }); getActionBar().setTitle(TITTLE); + getActionBar().setSubtitle(getAppName(getApplicationContext())); } }