diff --git a/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/AboutActivity.java b/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/AboutActivity.java
index dd2215a..6ae7160 100644
--- a/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/AboutActivity.java
+++ b/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/AboutActivity.java
@@ -2,10 +2,10 @@ package cc.winboll.studio.bytheway.activities;
import android.os.Bundle;
import android.view.View;
-import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.bytheway.MainActivity;
import cc.winboll.studio.bytheway.R;
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libaes.views.ASupportToolbar;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.models.APPInfo;
import cc.winboll.studio.libappbase.views.AboutView;
@@ -19,7 +19,7 @@ public class AboutActivity extends BaseWinBoLLActivity {
public static final String TAG = "AboutActivity";
- private Toolbar mToolbar;
+ private ASupportToolbar mToolbar;
@Override
public String getTag() {
@@ -35,27 +35,41 @@ public class AboutActivity extends BaseWinBoLLActivity {
initToolbar();
AboutView aboutView = findViewById(R.id.aboutview);
- aboutView.setAPPInfo(genDefaultAppInfo());
+ if (aboutView != null) {
+ aboutView.setAPPInfo(genDefaultAppInfo());
+ LogUtils.d(TAG, "AboutView初始化完成");
+ } else {
+ LogUtils.e(TAG, "onCreate() | AboutView未找到");
+ }
}
private void initToolbar() {
LogUtils.d(TAG, "initToolbar() 开始初始化");
- mToolbar = findViewById(R.id.toolbar);
- if (mToolbar == null) {
+ View toolbarView = findViewById(R.id.toolbar);
+ if (toolbarView == null) {
LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
return;
}
+ if (toolbarView instanceof ASupportToolbar) {
+ mToolbar = (ASupportToolbar) toolbarView;
+ LogUtils.d(TAG, "initToolbar() 正确获取到ASupportToolbar");
+ } else {
+ LogUtils.e(TAG, "initToolbar() | 类型转换失败,实际类型: " + toolbarView.getClass().getName());
+ // 尝试直接创建一个新的ASupportToolbar
+ mToolbar = new ASupportToolbar(this);
+ LogUtils.d(TAG, "initToolbar() 已创建新的ASupportToolbar实例");
+ }
setSupportActionBar(mToolbar);
mToolbar.setSubtitle(getTag());
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- LogUtils.d(TAG, "导航栏 点击返回按钮");
- WinBoLLActivityManager.getInstance().resumeActivity(MainActivity.class);
- WinBoLLActivityManager.getInstance().finish(AboutActivity.this);
- }
- });
+ @Override
+ public void onClick(View v) {
+ LogUtils.d(TAG, "导航栏 点击返回按钮");
+ WinBoLLActivityManager.getInstance().resumeActivity(MainActivity.class);
+ WinBoLLActivityManager.getInstance().finish(AboutActivity.this);
+ }
+ });
LogUtils.d(TAG, "initToolbar() 配置完成");
}
diff --git a/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/BaseWinBoLLActivity.java b/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/BaseWinBoLLActivity.java
index fbd1edf..1c82ace 100644
--- a/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/BaseWinBoLLActivity.java
+++ b/bytheway/src/main/java/cc/winboll/studio/bytheway/activities/BaseWinBoLLActivity.java
@@ -21,7 +21,7 @@ public abstract class BaseWinBoLLActivity extends AppCompatActivity implements I
@Override
protected void onCreate(Bundle savedInstanceState) {
- //AESThemeUtil.applyAppCompatTheme(this);
+ AESThemeUtil.applyAppCompatTheme(this);
mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
super.onCreate(savedInstanceState);
diff --git a/bytheway/src/main/res/layout/activity_about.xml b/bytheway/src/main/res/layout/activity_about.xml
index 5cbe3fd..6ddc1b8 100644
--- a/bytheway/src/main/res/layout/activity_about.xml
+++ b/bytheway/src/main/res/layout/activity_about.xml
@@ -9,7 +9,9 @@
+ android:id="@+id/toolbar"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>