diff --git a/appbase/build.gradle b/appbase/build.gradle index 6b6346e..caa0354 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -29,7 +29,7 @@ android { // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "1.2" + versionName "1.3" if(true) { versionName = genVersionName("${versionName}") } diff --git a/appbase/build.properties b/appbase/build.properties index 4c70ac1..2d223ea 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 11 04:40:18 GMT 2025 -stageCount=5 +#Tue Feb 11 05:09:05 GMT 2025 +stageCount=0 libraryProject=libappbase -baseVersion=1.2 -publishVersion=1.2.4 -buildCount=62 -baseBetaVersion=1.2.5 +baseVersion=1.3 +publishVersion=1.3.0 +buildCount=1 +baseBetaVersion=1.3.1 diff --git a/libappbase/build.properties b/libappbase/build.properties index 4c70ac1..2d223ea 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 11 04:40:18 GMT 2025 -stageCount=5 +#Tue Feb 11 05:09:05 GMT 2025 +stageCount=0 libraryProject=libappbase -baseVersion=1.2 -publishVersion=1.2.4 -buildCount=62 -baseBetaVersion=1.2.5 +baseVersion=1.3 +publishVersion=1.3.0 +buildCount=1 +baseBetaVersion=1.3.1 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java index 8504715..a9690d0 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java @@ -30,10 +30,10 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe private static final int MENUITEM_RESTART = 1; String mLog; - int colorPrimary; - int colorPrimaryDark; - int colorAccent; + int colorTittle; + int colorTittleBackground; int colorText; + int colorTextBackground; public static final String TAG = "GlobalCrashActivity"; @@ -42,38 +42,35 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe super.onCreate(savedInstanceState); CrashHandler.AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext()); - mLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_INFO); //setTheme(android.R.style.Theme_Holo_Light_NoActionBar); setTheme(R.style.APPBaseTheme); setContentView(R.layout.activity_globalcrash); - TypedArray a = obtainStyledAttributes(R.attr.globalCrashActivity, R.styleable.GlobalCrashActivity); - colorPrimary = a.getColor(R.styleable.GlobalCrashActivity_attrPrimary, Color.WHITE); - colorPrimaryDark = a.getColor(R.styleable.GlobalCrashActivity_attrPrimaryDark, Color.BLACK); - colorAccent = a.getColor(R.styleable.GlobalCrashActivity_attrAccent, Color.RED); - colorText = a.getColor(R.styleable.GlobalCrashActivity_attrText, Color.RED); + TypedArray a = obtainStyledAttributes(R.styleable.GlobalCrashActivity); + colorTittle = a.getColor(R.styleable.GlobalCrashActivity_colorTittle, Color.WHITE); + colorTittleBackground = a.getColor(R.styleable.GlobalCrashActivity_colorTittleBackgound, Color.BLACK); + colorText = a.getColor(R.styleable.GlobalCrashActivity_colorText, Color.RED); + colorTextBackground = a.getColor(R.styleable.GlobalCrashActivity_colorTextBackgound, Color.RED); // 返回一个绑定资源结束的信号给资源 a.recycle(); LinearLayout llMain = findViewById(R.id.activityglobalcrashLinearLayout1); - llMain.setBackgroundColor(colorPrimaryDark); + llMain.setBackgroundColor(colorTextBackground); Toolbar toolbar = findViewById(R.id.activityglobalcrashToolbar1); - toolbar.setBackgroundColor(colorPrimary); - toolbar.setTitleTextColor(colorAccent); - toolbar.setSubtitleTextColor(colorAccent); + toolbar.setBackgroundColor(colorTittleBackground); + toolbar.setTitleTextColor(colorTittle); + toolbar.setSubtitleTextColor(colorTittle); setActionBar(toolbar); TextView tvLog = findViewById(R.id.activityglobalcrashTextView1); tvLog.setText(mLog); - tvLog.setTextColor(colorPrimary); - tvLog.setBackgroundColor(colorPrimaryDark); + tvLog.setTextColor(colorText); + tvLog.setBackgroundColor(colorTextBackground); getActionBar().setTitle(CrashHandler.TITTLE); getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext())); } - - @Override public void onBackPressed() { restart(); @@ -122,7 +119,7 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe for (int i = 0; i < menu.size(); i++) { MenuItem item = menu.getItem(i); SpannableString spanString = new SpannableString(item.getTitle().toString()); - spanString.setSpan(new ForegroundColorSpan(colorAccent), 0, spanString.length(), 0); + spanString.setSpan(new ForegroundColorSpan(colorTittle), 0, spanString.length(), 0); item.setTitle(spanString); } return true; diff --git a/libappbase/src/main/res/values/attrs.xml b/libappbase/src/main/res/values/attrs.xml index 49801a3..a221b8f 100644 --- a/libappbase/src/main/res/values/attrs.xml +++ b/libappbase/src/main/res/values/attrs.xml @@ -1,20 +1,12 @@ - - - - - - + - - - - - + + + + diff --git a/libappbase/src/main/res/values/styles.xml b/libappbase/src/main/res/values/styles.xml index 72d14c8..3272ca0 100644 --- a/libappbase/src/main/res/values/styles.xml +++ b/libappbase/src/main/res/values/styles.xml @@ -1,20 +1,9 @@ - -