Studio/libappbase
4
0
Fork 0
mirror of http://gitea.winboll.cc/Studio/WinBoLL.git synced 2026-06-29 03:59:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

移除LogView控件并修复AboutView在Android 16上的Inflate崩溃

Browse Source 
- 移除主窗口 activity_main.xml 底部 LogView 面板，清理 MainActivity.java 中相关字段与 onResume 调用，修复 NPE 崩溃
- MyAppTheme 补充 aboutViewBackgroundColor/aboutViewTextColor/aboutViewTitleColor/aboutViewDividerColor 属性定义，修复 AboutActivity 在 Android 16 上的 UnsupportedOperationException 崩溃
This commit is contained in:
STUDIO_BigPickle
2026-06-04 18:03:50 +08:00
parent b2d2d7ac99
commit c08bbf7b74
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gitsion/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Thu Jun 04 17:48:23 HKT 2026 #Thu Jun 04 18:00:38 HKT 2026
stageCount=27 stageCount=27
libraryProject= libraryProject=
baseVersion=15.11 baseVersion=15.11
publishVersion=15.11.26 publishVersion=15.11.26
buildCount=43 buildCount=46
baseBetaVersion=15.11.27 baseBetaVersion=15.11.27

12
gitsion/src/main/java/cc/winboll/studio/gitsion/MainActivity.java
View File

@@ -20,7 +20,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.gitsion.R; import cc.winboll.studio.gitsion.R;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.libappbase.ToastUtils;
/** /**
@@ -33,7 +33,7 @@ public final class MainActivity extends AppCompatActivity {
//原有控件 //原有控件
private Toolbar mToolbar; private Toolbar mToolbar;
private LogView mLogView;
private Switch mSwitchService; private Switch mSwitchService;
//新增 //新增
@@ -81,7 +81,7 @@ public final class MainActivity extends AppCompatActivity {
private void initView() { private void initView() {
//原有 //原有
mToolbar = findViewById(R.id.toolbar); mToolbar = findViewById(R.id.toolbar);
mLogView = findViewById(R.id.logview);
mSwitchService = findViewById(R.id.switch_service); mSwitchService = findViewById(R.id.switch_service);
//新增 //新增
@@ -366,10 +366,6 @@ public final class MainActivity extends AppCompatActivity {
} }
} }
@Override
protected void onResume() {
super.onResume();
mLogView.start();
}
} }

14
gitsion/src/main/res/layout/activity_main.xml
View File

@@ -180,19 +180,5 @@
</ScrollView> </ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="200dp"
android:orientation="vertical"
android:id="@+id/container_log_show"
android:background="@drawable/border_gray">
<cc.winboll.studio.libappbase.LogView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/logview"/>
</LinearLayout>
</LinearLayout> </LinearLayout>

4
gitsion/src/main/res/values/styles.xml
View File

@@ -17,6 +17,10 @@
<item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item> <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="activityTextColor">?attr/mainWindowTextColor</item> <item name="activityTextColor">?attr/mainWindowTextColor</item>
<item name="debugTextColor">@color/debugTextColor</item> <item name="debugTextColor">@color/debugTextColor</item>
<item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
<item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
<item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
</style> </style>
<style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">