From 6190d728db952db7c05c04c544d5014cc9b974d7 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 02:01:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=BA=93=E6=A8=A1=E5=9D=97=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=AE=89=E5=8D=93=E7=89=88=E6=9C=AC=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.gradle | 21 +++++++++++++++++++ appbase/build.properties | 4 ++-- libappbase/build.gradle | 20 ------------------ libappbase/build.properties | 4 ++-- .../libappbase/GlobalCrashActivity.java | 11 +++++----- .../libappbase/GlobalCrashReportView.java | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/appbase/build.gradle b/appbase/build.gradle index 727c7be..94efd36 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -47,4 +47,25 @@ android { dependencies { api project(':libappbase') api fileTree(dir: 'libs', include: ['*.jar']) + + // Android 类库 + //api 'com.android.support:appcompat-v7:28.0.0' + implementation('com.android.support:appcompat-v7:28.0.0'){ + //exclude group: "com.android.support", module: "support-vector-drawable" + exclude group: "com.android.support:animated-vector-drawable:28.0.0" + } + // https://mvnrepository.com/artifact/com.android.support/support-compat + //api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选） + // https://mvnrepository.com/artifact/com.android.support/support-v4 + implementation 'com.android.support:support-v4:28.0.0' + // https://mvnrepository.com/artifact/com.android.support/support-media-compat + implementation 'com.android.support:support-media-compat:28.0.0' + // https://mvnrepository.com/artifact/com.android.support/support-core-utils + implementation 'com.android.support:support-core-utils:28.0.0' + // https://mvnrepository.com/artifact/com.android.support/support-core-ui + implementation 'com.android.support:support-core-ui:28.0.0' + // https://mvnrepository.com/artifact/com.android.support/support-fragment + implementation 'com.android.support:support-fragment:28.0.0' + // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 + implementation 'com.android.support:recyclerview-v7:28.0.0' } diff --git a/appbase/build.properties b/appbase/build.properties index 545554a..5374279 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Apr 26 16:44:11 GMT 2025 +#Sat Apr 26 18:00:33 GMT 2025 stageCount=6 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.5 -buildCount=6 +buildCount=10 baseBetaVersion=15.2.6 diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 2071132..b5abec6 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -23,24 +23,4 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - // Android 类库 - //api 'com.android.support:appcompat-v7:28.0.0' - api('com.android.support:appcompat-v7:28.0.0'){ - //exclude group: "com.android.support", module: "support-vector-drawable" - exclude group: "com.android.support:animated-vector-drawable:28.0.0" - } - // https://mvnrepository.com/artifact/com.android.support/support-compat - //api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选） - // https://mvnrepository.com/artifact/com.android.support/support-v4 - api 'com.android.support:support-v4:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-media-compat - api 'com.android.support:support-media-compat:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-utils - api 'com.android.support:support-core-utils:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-ui - api 'com.android.support:support-core-ui:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-fragment - api 'com.android.support:support-fragment:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 - api 'com.android.support:recyclerview-v7:28.0.0' } diff --git a/libappbase/build.properties b/libappbase/build.properties index 545554a..5374279 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Apr 26 16:44:11 GMT 2025 +#Sat Apr 26 18:00:33 GMT 2025 stageCount=6 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.5 -buildCount=6 +buildCount=10 baseBetaVersion=15.2.6 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 dbf8c8a..0509ac9 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java @@ -4,20 +4,19 @@ package cc.winboll.studio.libappbase; * @Author ZhanGSKen@AliYun.Com * @Date 2025/02/11 00:14:05 */ +import android.app.Activity; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; import cc.winboll.studio.libappbase.R; -public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener { +public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener { private static final int MENUITEM_COPY = 0; private static final int MENUITEM_RESTART = 1; @@ -39,10 +38,10 @@ public final class GlobalCrashActivity extends AppCompatActivity implements Menu setContentView(R.layout.activity_globalcrash); mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1); mGlobalCrashReportView.setReport(mLog); - setSupportActionBar(mGlobalCrashReportView.getToolbar()); + setActionBar(mGlobalCrashReportView.getToolbar()); - getSupportActionBar().setTitle(CrashHandler.TITTLE); - getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext())); + getActionBar().setTitle(CrashHandler.TITTLE); + getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext())); } @Override diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java index 533e5da..efdfb3a 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java @@ -8,7 +8,6 @@ package cc.winboll.studio.libappbase; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; -import android.support.v7.widget.Toolbar; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; @@ -17,6 +16,7 @@ import android.view.MenuItem; import android.widget.LinearLayout; import android.widget.TextView; import cc.winboll.studio.libappbase.R; +import android.widget.Toolbar; public class GlobalCrashReportView extends LinearLayout {