Compare commits
33 Commits
aes-v15.20
...
appbase-v1
| Author | SHA1 | Date | |
|---|---|---|---|
| f67c57108a | |||
| 6d694992b7 | |||
| 6f5aa807c0 | |||
| f897f6e9ab | |||
| e2c73fdec0 | |||
| 4fcc5f9689 | |||
| 4208cda32f | |||
| 7c83b903f3 | |||
| 54b040285c | |||
| e8667bb26f | |||
| 05259e5ca9 | |||
| a5a5b37121 | |||
| 29726828b0 | |||
| 436e92702f | |||
| 3669a96768 | |||
| 37c3d1563c | |||
| 6741c41c83 | |||
| 4708dd4426 | |||
| 36e2ed0b48 | |||
| 3cfee1c4a8 | |||
| 24af31d51d | |||
| 54f77a8d87 | |||
| 69b18343c9 | |||
| e1bd959842 | |||
| bad38e37ae | |||
| 08eb360dbd | |||
| 819018b149 | |||
| 6e6b262e86 | |||
| 9665856b1b | |||
| 052bbce839 | |||
| e726c9d435 | |||
| 5277913606 | |||
| c1bd31df2f |
@@ -24,13 +24,13 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "cc.winboll.studio.aes"
|
applicationId "cc.winboll.studio.aes"
|
||||||
minSdkVersion 26
|
minSdkVersion 21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 1
|
versionCode 1
|
||||||
// versionName 更新后需要手动设置
|
// versionName 更新后需要手动设置
|
||||||
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
||||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||||
versionName "15.20"
|
versionName "15.15"
|
||||||
if(true) {
|
if(true) {
|
||||||
versionName = genVersionName("${versionName}")
|
versionName = genVersionName("${versionName}")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Mon May 11 15:02:27 HKT 2026
|
#Sat Apr 25 04:16:42 HKT 2026
|
||||||
stageCount=1
|
stageCount=10
|
||||||
libraryProject=libaes
|
libraryProject=libaes
|
||||||
baseVersion=15.20
|
baseVersion=15.15
|
||||||
publishVersion=15.20.0
|
publishVersion=15.15.9
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.20.1
|
baseBetaVersion=15.15.10
|
||||||
|
|||||||
@@ -24,13 +24,13 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "cc.winboll.studio.appbase"
|
applicationId "cc.winboll.studio.appbase"
|
||||||
minSdkVersion 21
|
minSdkVersion 26
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 1
|
versionCode 1
|
||||||
// versionName 更新后需要手动设置
|
// versionName 更新后需要手动设置
|
||||||
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
||||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||||
versionName "15.15"
|
versionName "15.20"
|
||||||
if(true) {
|
if(true) {
|
||||||
versionName = genVersionName("${versionName}")
|
versionName = genVersionName("${versionName}")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue Apr 28 17:08:30 HKT 2026
|
#Mon May 11 14:45:48 HKT 2026
|
||||||
stageCount=22
|
stageCount=6
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.15
|
baseVersion=15.20
|
||||||
publishVersion=15.15.21
|
publishVersion=15.20.5
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.15.22
|
baseBetaVersion=15.20.6
|
||||||
|
|||||||
@@ -9,7 +9,9 @@
|
|||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:theme="@style/MyAPPBaseTheme"
|
android:theme="@style/MyAPPBaseTheme"
|
||||||
android:resizeableActivity="true"
|
android:resizeableActivity="true"
|
||||||
android:process=":App">
|
android:process=":App"
|
||||||
|
android:sharedUserId="@string/shared_user_id"
|
||||||
|
android:sharedUserLabel="@string/shared_user_label">
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
@@ -19,28 +21,16 @@
|
|||||||
android:launchMode="singleTop"
|
android:launchMode="singleTop"
|
||||||
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
|
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
|
||||||
|
|
||||||
</activity>
|
|
||||||
|
|
||||||
<activity
|
|
||||||
android:name=".MainActivityAlias"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:exported="true"
|
|
||||||
android:resizeableActivity="true"
|
|
||||||
android:launchMode="singleTop"
|
|
||||||
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
|
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
|
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
|
|
||||||
<category android:name="android.intent.category.LAUNCHER"/>
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
|
|
||||||
<category android:name="android.intent.category.DEFAULT"/>
|
<category android:name="android.intent.category.DEFAULT"/>
|
||||||
|
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".Main2Activity"
|
android:name=".Main2Activity"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package cc.winboll.studio.appbase;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
|
import cc.winboll.studio.libappbase.ToastUtils;
|
||||||
|
|
||||||
|
public class CrashTestActivity extends Activity {
|
||||||
|
|
||||||
|
public static final String TAG = "CrashTestActivity";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_crash_test);
|
||||||
|
LogUtils.d(TAG, "CrashTestActivity onCreate()");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onBack(View view) {
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onTestCrash(View view) {
|
||||||
|
LogUtils.d(TAG, "onTestCrash()");
|
||||||
|
ToastUtils.show("测试布局崩溃...");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -162,25 +162,7 @@ public class MainActivity extends Activity {
|
|||||||
startActivity(aboutIntent);
|
startActivity(aboutIntent);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onSplitScreenMode(View view) {
|
|
||||||
LogUtils.d(TAG, "onSplitScreenMode() 分屏测试按钮已点击");
|
|
||||||
ToastUtils.show("分屏测试:已启动新窗口");
|
|
||||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
|
|
||||||
android.graphics.Rect bounds = new android.graphics.Rect();
|
|
||||||
getWindow().getDecorView().getDisplay().getRectSize(bounds);
|
|
||||||
int height = bounds.height();
|
|
||||||
int width = bounds.width();
|
|
||||||
bounds.set(0, 0, width, height / 2);
|
|
||||||
LogUtils.d(TAG, "onSplitScreenMode() 分屏窗口范围: " + bounds);
|
|
||||||
android.content.Intent intent = new android.content.Intent(this, MainActivityAlias.class);
|
|
||||||
intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
||||||
LogUtils.d(TAG, "onSplitScreenMode() 准备启动MainActivityAlias");
|
|
||||||
android.app.ActivityOptions options = android.app.ActivityOptions.makeBasic();
|
|
||||||
options.setLaunchBounds(bounds);
|
|
||||||
startActivity(intent, options.toBundle());
|
|
||||||
LogUtils.d(TAG, "onSplitScreenMode() MainActivityAlias已启动");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onMultiInstance(View view) {
|
public void onMultiInstance(View view) {
|
||||||
LogUtils.d(TAG, "onMultiInstance() 多开窗口按钮已点击");
|
LogUtils.d(TAG, "onMultiInstance() 多开窗口按钮已点击");
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
package cc.winboll.studio.appbase;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.Toolbar;
|
|
||||||
import cc.winboll.studio.appbase.R;
|
|
||||||
|
|
||||||
public class MainActivityAlias extends MainActivity {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.activity_main);
|
|
||||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
|
||||||
setActionBar(toolbar);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
22
appbase/src/main/res/layout-night/activity_about.xml
Normal file
22
appbase/src/main/res/layout-night/activity_about.xml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
|
<android.widget.Toolbar
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/toolbarBackgroundColor"
|
||||||
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.views.AboutView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1.0"
|
||||||
|
android:id="@+id/aboutview"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
106
appbase/src/main/res/layout-night/activity_main.xml
Normal file
106
appbase/src/main/res/layout-night/activity_main.xml
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:padding="0dp"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
|
<android.widget.Toolbar
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/toolbarBackgroundColor"
|
||||||
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1.0">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:spacing="12dp">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="关于应用"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onAboutActivity"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="应用崩溃测试"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onCrashTest"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="应用日志测试"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onLogTest"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="应用日志测试(新窗口)"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onLogTestNewTask"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="应用吐司测试"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onToastUtilsTest"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="多开窗口"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onMultiInstance"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
17
appbase/src/main/res/layout-night/activity_main2.xml
Normal file
17
appbase/src/main/res/layout-night/activity_main2.xml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:gravity="center"
|
||||||
|
android:background="@android:color/white">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Main2Activity"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textColor="@color/gray_900"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -4,11 +4,13 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
<android.widget.Toolbar
|
<android.widget.Toolbar
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/toolbarBackgroundColor"
|
||||||
android:id="@+id/toolbar"/>
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
<cc.winboll.studio.libappbase.views.AboutView
|
<cc.winboll.studio.libappbase.views.AboutView
|
||||||
|
|||||||
60
appbase/src/main/res/layout/activity_crash_test.xml
Normal file
60
appbase/src/main/res/layout/activity_crash_test.xml
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:padding="0dp"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
|
<android.widget.Toolbar
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/toolbarBackgroundColor"
|
||||||
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1.0">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:gravity="center_vertical">
|
||||||
|
|
||||||
|
<cc.winboll.studio.appbase.UndefinedCustomView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="返回"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onBack"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="测试崩溃"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:background="?attr/buttonBackgroundColor"
|
||||||
|
android:paddingVertical="12dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:onClick="onTestCrash"
|
||||||
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -4,11 +4,13 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="16dp">
|
android:padding="0dp"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
<android.widget.Toolbar
|
<android.widget.Toolbar
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/toolbarBackgroundColor"
|
||||||
android:id="@+id/toolbar"/>
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
@@ -28,8 +30,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="关于应用"
|
android:text="关于应用"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:background="#81C7F5"
|
android:background="?attr/buttonBackgroundColor"
|
||||||
android:paddingVertical="12dp"
|
android:paddingVertical="12dp"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:onClick="onAboutActivity"
|
android:onClick="onAboutActivity"
|
||||||
@@ -40,8 +42,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="应用崩溃测试"
|
android:text="应用崩溃测试"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:background="#81C7F5"
|
android:background="?attr/buttonBackgroundColor"
|
||||||
android:paddingVertical="12dp"
|
android:paddingVertical="12dp"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:onClick="onCrashTest"
|
android:onClick="onCrashTest"
|
||||||
@@ -52,8 +54,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="应用日志测试"
|
android:text="应用日志测试"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:background="#81C7F5"
|
android:background="?attr/buttonBackgroundColor"
|
||||||
android:paddingVertical="12dp"
|
android:paddingVertical="12dp"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:onClick="onLogTest"
|
android:onClick="onLogTest"
|
||||||
@@ -64,8 +66,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="应用日志测试(新窗口)"
|
android:text="应用日志测试(新窗口)"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:background="#81C7F5"
|
android:background="?attr/buttonBackgroundColor"
|
||||||
android:paddingVertical="12dp"
|
android:paddingVertical="12dp"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:onClick="onLogTestNewTask"
|
android:onClick="onLogTestNewTask"
|
||||||
@@ -76,32 +78,22 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="应用吐司测试"
|
android:text="应用吐司测试"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:background="#81C7F5"
|
android:background="?attr/buttonBackgroundColor"
|
||||||
android:paddingVertical="12dp"
|
android:paddingVertical="12dp"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:onClick="onToastUtilsTest"
|
android:onClick="onToastUtilsTest"
|
||||||
android:layout_margin="10dp"/>
|
android:layout_margin="10dp"/>
|
||||||
|
|
||||||
<Button
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="分屏测试"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:textColor="@android:color/white"
|
|
||||||
android:background="#81C7F5"
|
|
||||||
android:paddingVertical="12dp"
|
|
||||||
android:layout_marginHorizontal="24dp"
|
|
||||||
android:onClick="onSplitScreenMode"
|
|
||||||
android:layout_margin="10dp"/>
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="多开窗口"
|
android:text="多开窗口"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:background="#81C7F5"
|
android:background="?attr/buttonBackgroundColor"
|
||||||
android:paddingVertical="12dp"
|
android:paddingVertical="12dp"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
android:onClick="onMultiInstance"
|
android:onClick="onMultiInstance"
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:background="@android:color/white">
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Main2Activity"
|
android:text="Main2Activity"
|
||||||
android:textSize="24sp"
|
android:textSize="24sp"
|
||||||
android:textColor="@color/gray_900"/>
|
android:textColor="?attr/activityTextColor"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
7
appbase/src/main/res/values-night/colors.xml
Normal file
7
appbase/src/main/res/values-night/colors.xml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#FF1B8B29</color>
|
||||||
|
<color name="colorPrimaryDark">#FF0A5520</color>
|
||||||
|
<color name="colorAccent">#FF6EE87C</color>
|
||||||
|
<color name="colorText">#FFB8FF7D</color>
|
||||||
|
</resources>
|
||||||
13
appbase/src/main/res/values-night/styles.xml
Normal file
13
appbase/src/main/res/values-night/styles.xml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<style name="MyAPPBaseTheme" parent="APPBaseTheme">
|
||||||
|
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="MyDebugActivityTheme" parent="DebugActivityTheme">
|
||||||
|
<item name="colorTittle">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
|
||||||
|
<item name="colorText">?attr/debugTextColor</item>
|
||||||
|
<item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<declare-styleable name="AboutView">
|
|
||||||
<attr name="app_name" format="string" />
|
|
||||||
<attr name="app_apkfoldername" format="string" />
|
|
||||||
<attr name="app_apkname" format="string" />
|
|
||||||
<attr name="app_gitname" format="string" />
|
|
||||||
<attr name="app_gitowner" format="string" />
|
|
||||||
<attr name="app_gitappbranch" format="string" />
|
|
||||||
<attr name="app_gitappsubprojectfolder" format="string" />
|
|
||||||
<attr name="appdescription" format="string" />
|
|
||||||
<attr name="appicon" format="reference" />
|
|
||||||
<attr name="is_adddebugtools" format="boolean" />
|
|
||||||
</declare-styleable>
|
|
||||||
</resources>
|
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<style name="MyAPPBaseTheme" parent="APPBaseTheme">
|
<style name="MyAPPBaseTheme" parent="APPBaseTheme">
|
||||||
<item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
|
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme">
|
<style name="MyDebugActivityTheme" parent="DebugActivityTheme">
|
||||||
<item name="colorTittle">#FFFFFFFF</item>
|
<item name="colorTittle">?attr/mainWindowTextColor</item>
|
||||||
<item name="colorTittleBackgound">#FF00A4B3</item>
|
<item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
|
||||||
<item name="colorText">#FFFFFFFF</item>
|
<item name="colorText">?attr/debugTextColor</item>
|
||||||
<item name="colorTextBackgound">#FF000000</item>
|
<item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Binary file not shown.
@@ -93,12 +93,11 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
// 1. 对纯 Java 模块的 JavaCompile 任务配置(升级为 Java 11)
|
// 1. 对纯 Java 模块的 JavaCompile 任务配置(强制Java 7)
|
||||||
tasks.withType(JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
options.compilerArgs << "-parameters"
|
options.compilerArgs << "-parameters"
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_1_7
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_1_7
|
||||||
// 可选:确保编码一致
|
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ android {
|
|||||||
buildToolsVersion "30.0.3"
|
buildToolsVersion "30.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 26
|
minSdkVersion 21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,6 +27,8 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
// 权限请求框架:https://github.com/getActivity/XXPermissions
|
||||||
|
api 'com.github.getActivity:XXPermissions:18.63'
|
||||||
// 下拉控件
|
// 下拉控件
|
||||||
api 'com.baoyz.pullrefreshlayout:library:1.2.0'
|
api 'com.baoyz.pullrefreshlayout:library:1.2.0'
|
||||||
// 拼音搜索
|
// 拼音搜索
|
||||||
@@ -61,7 +63,7 @@ dependencies {
|
|||||||
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||||
|
|
||||||
// WinBoLL库 nexus.winboll.cc 地址
|
// WinBoLL库 nexus.winboll.cc 地址
|
||||||
api 'cc.winboll.studio:libappbase:15.20.5'
|
api 'cc.winboll.studio:libappbase:15.15.19'
|
||||||
// 备用库 jitpack.io 地址
|
// 备用库 jitpack.io 地址
|
||||||
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
|
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Mon May 11 15:02:27 HKT 2026
|
#Sat Apr 25 04:16:30 HKT 2026
|
||||||
stageCount=1
|
stageCount=10
|
||||||
libraryProject=libaes
|
libraryProject=libaes
|
||||||
baseVersion=15.20
|
baseVersion=15.15
|
||||||
publishVersion=15.20.0
|
publishVersion=15.15.9
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.20.1
|
baseBetaVersion=15.15.10
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ android {
|
|||||||
buildToolsVersion "30.0.3"
|
buildToolsVersion "30.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 21
|
minSdkVersion 26
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
@@ -18,6 +18,10 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_7
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_7
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue Apr 28 17:08:04 HKT 2026
|
#Mon May 11 14:45:48 HKT 2026
|
||||||
stageCount=22
|
stageCount=6
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.15
|
baseVersion=15.20
|
||||||
publishVersion=15.15.21
|
publishVersion=15.20.5
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.15.22
|
baseBetaVersion=15.20.6
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import android.content.Intent;
|
|||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.graphics.Color;
|
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
@@ -165,6 +164,7 @@ public final class CrashHandler {
|
|||||||
Intent intent = new Intent();
|
Intent intent = new Intent();
|
||||||
LogUtils.d(TAG, "gotoCrashActiviy: ");
|
LogUtils.d(TAG, "gotoCrashActiviy: ");
|
||||||
|
|
||||||
|
|
||||||
// 根据保险丝状态选择启动的崩溃页面
|
// 根据保险丝状态选择启动的崩溃页面
|
||||||
if (AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
|
if (AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
|
||||||
LogUtils.d(TAG, "gotoCrashActiviy: isAppCrashSafetyWireOK");
|
LogUtils.d(TAG, "gotoCrashActiviy: isAppCrashSafetyWireOK");
|
||||||
@@ -186,13 +186,14 @@ public final class CrashHandler {
|
|||||||
);
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (GlobalApplication.isDebugging()&&AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
|
if (GlobalApplication.isDebugging()) {
|
||||||
// 如果是 debug 版,启动崩溃页面窗口
|
// 如果是 debug 版,启动崩溃页面窗口
|
||||||
app.startActivity(intent);
|
app.startActivity(intent);
|
||||||
} else {
|
|
||||||
// 如果是 release 版,就只发送一个通知
|
|
||||||
CrashHandleNotifyUtils.handleUncaughtException(app, intent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 发送一个通知
|
||||||
|
CrashHandleNotifyUtils.handleUncaughtException(app, intent);
|
||||||
|
|
||||||
// 终止当前进程(确保完全重启)
|
// 终止当前进程(确保完全重启)
|
||||||
android.os.Process.killProcess(android.os.Process.myPid());
|
android.os.Process.killProcess(android.os.Process.myPid());
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
@@ -448,7 +449,7 @@ public final class CrashHandler {
|
|||||||
|
|
||||||
// 水平滚动视图(处理日志行过长)
|
// 水平滚动视图(处理日志行过长)
|
||||||
HorizontalScrollView hw = new HorizontalScrollView(this);
|
HorizontalScrollView hw = new HorizontalScrollView(this);
|
||||||
hw.setBackgroundColor(Color.GRAY); // 背景色设为灰色
|
hw.setBackgroundColor(0xFFF5F5F5); // 深色模式灰色背景
|
||||||
|
|
||||||
// 日志显示文本框
|
// 日志显示文本框
|
||||||
TextView message = new TextView(this);
|
TextView message = new TextView(this);
|
||||||
@@ -456,7 +457,7 @@ public final class CrashHandler {
|
|||||||
int padding = dp2px(16); // 内边距 16dp(适配不同屏幕)
|
int padding = dp2px(16); // 内边距 16dp(适配不同屏幕)
|
||||||
message.setPadding(padding, padding, padding, padding);
|
message.setPadding(padding, padding, padding, padding);
|
||||||
message.setText(mLog); // 设置崩溃日志
|
message.setText(mLog); // 设置崩溃日志
|
||||||
message.setTextColor(Color.BLACK); // 文字黑色
|
message.setTextColor(0xFF000000); // 深色模式灰色文字,普通模式黑色文字
|
||||||
message.setTextIsSelectable(true); // 支持文本选择(便于手动复制)
|
message.setTextIsSelectable(true); // 支持文本选择(便于手动复制)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,219 @@
|
|||||||
|
package cc.winboll.studio.libappbase;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.ObjectInputStream;
|
||||||
|
import java.io.ObjectOutputStream;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||||
|
* @CreateTime 2026-05-11 13:28:00
|
||||||
|
* @EditTime 2026-05-11 13:30:45
|
||||||
|
* @Describe 应用崩溃保险丝单例管理类
|
||||||
|
* 限制短时间内应用重复崩溃,通过分级熔断机制控制崩溃页面跳转策略;
|
||||||
|
* 防护等级区间 1~2,每次崩溃自动降级,等级溢出则判定为彻底熔断;
|
||||||
|
* 支持本地文件持久化等级、延迟自动恢复、手动重置防护等级能力。
|
||||||
|
*/
|
||||||
|
public final class GlobalAppCrashSafetyWire {
|
||||||
|
|
||||||
|
/** 日志标识标签 */
|
||||||
|
public static final String TAG = "GlobalAppCrashSafetyWire";
|
||||||
|
/** 最低防护等级阈值 */
|
||||||
|
private static final int _MINI = 1;
|
||||||
|
/** 最高防护等级阈值 */
|
||||||
|
private static final int _MAX = 2;
|
||||||
|
|
||||||
|
/** 单例实例对象 */
|
||||||
|
private static volatile GlobalAppCrashSafetyWire _AppCrashSafetyWire;
|
||||||
|
/** 当前防护熔断等级 */
|
||||||
|
private volatile Integer currentSafetyLevel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 私有构造方法
|
||||||
|
* 单例禁止外部实例化,初始化加载本地持久化防护等级
|
||||||
|
*/
|
||||||
|
private GlobalAppCrashSafetyWire() {
|
||||||
|
LogUtils.d(TAG, "构造方法执行:初始化崩溃保险丝实例");
|
||||||
|
currentSafetyLevel = loadCurrentSafetyLevel();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取单例对象
|
||||||
|
* @return GlobalAppCrashSafetyWire 单例
|
||||||
|
*/
|
||||||
|
public static synchronized GlobalAppCrashSafetyWire getInstance() {
|
||||||
|
if (_AppCrashSafetyWire == null) {
|
||||||
|
_AppCrashSafetyWire = new GlobalAppCrashSafetyWire();
|
||||||
|
}
|
||||||
|
return _AppCrashSafetyWire;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置当前防护等级
|
||||||
|
* @param currentSafetyLevel 待设置的防护等级
|
||||||
|
*/
|
||||||
|
public void setCurrentSafetyLevel(final int currentSafetyLevel) {
|
||||||
|
this.currentSafetyLevel = currentSafetyLevel;
|
||||||
|
LogUtils.d(TAG, "setCurrentSafetyLevel:设置等级 = " + currentSafetyLevel);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取当前内存中防护等级
|
||||||
|
* @return 当前防护等级
|
||||||
|
*/
|
||||||
|
public int getCurrentSafetyLevel() {
|
||||||
|
return currentSafetyLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 保存防护等级到本地文件持久化
|
||||||
|
* @param currentSafetyLevel 待保存防护等级
|
||||||
|
*/
|
||||||
|
public void saveCurrentSafetyLevel(final int currentSafetyLevel) {
|
||||||
|
LogUtils.d(TAG, "saveCurrentSafetyLevel:开始持久化等级 = " + currentSafetyLevel);
|
||||||
|
this.currentSafetyLevel = currentSafetyLevel;
|
||||||
|
|
||||||
|
ObjectOutputStream oos = null;
|
||||||
|
try {
|
||||||
|
oos = new ObjectOutputStream(new FileOutputStream(CrashHandler._CrashCountFilePath));
|
||||||
|
oos.writeInt(currentSafetyLevel);
|
||||||
|
oos.flush();
|
||||||
|
LogUtils.d(TAG, "saveCurrentSafetyLevel:写入文件成功,等级 = " + currentSafetyLevel);
|
||||||
|
} catch (IOException e) {
|
||||||
|
LogUtils.e(TAG, "saveCurrentSafetyLevel:写入文件异常", e);
|
||||||
|
} finally {
|
||||||
|
if (oos != null) {
|
||||||
|
try {
|
||||||
|
oos.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
LogUtils.e(TAG, "saveCurrentSafetyLevel:关闭流异常", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从本地文件读取防护等级
|
||||||
|
* @return 加载后的防护等级
|
||||||
|
*/
|
||||||
|
public int loadCurrentSafetyLevel() {
|
||||||
|
LogUtils.d(TAG, "loadCurrentSafetyLevel:加载本地防护等级");
|
||||||
|
File file = new File(CrashHandler._CrashCountFilePath);
|
||||||
|
|
||||||
|
if (!file.exists()) {
|
||||||
|
currentSafetyLevel = _MAX;
|
||||||
|
LogUtils.d(TAG, "loadCurrentSafetyLevel:文件不存在,初始化为最高等级 = " + _MAX);
|
||||||
|
saveCurrentSafetyLevel(currentSafetyLevel);
|
||||||
|
return currentSafetyLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
ObjectInputStream ois = null;
|
||||||
|
try {
|
||||||
|
ois = new ObjectInputStream(new FileInputStream(CrashHandler._CrashCountFilePath));
|
||||||
|
currentSafetyLevel = ois.readInt();
|
||||||
|
LogUtils.d(TAG, "loadCurrentSafetyLevel:读取文件成功,当前等级 = " + currentSafetyLevel);
|
||||||
|
} catch (IOException e) {
|
||||||
|
LogUtils.e(TAG, "loadCurrentSafetyLevel:读取文件异常", e);
|
||||||
|
currentSafetyLevel = _MAX;
|
||||||
|
} finally {
|
||||||
|
if (ois != null) {
|
||||||
|
try {
|
||||||
|
ois.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
LogUtils.e(TAG, "loadCurrentSafetyLevel:关闭流异常", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return currentSafetyLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 执行一次保险丝熔断降级
|
||||||
|
* @return 降级后是否仍在有效防护区间
|
||||||
|
*/
|
||||||
|
boolean burnSafetyWire() {
|
||||||
|
LogUtils.d(TAG, "burnSafetyWire:执行一次熔断降级");
|
||||||
|
final int safeLevel = loadCurrentSafetyLevel();
|
||||||
|
|
||||||
|
if (isSafetyWireWorking(safeLevel)) {
|
||||||
|
saveCurrentSafetyLevel(safeLevel - 1);
|
||||||
|
return isSafetyWireWorking(safeLevel - 1);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 校验指定等级是否在有效防护区间
|
||||||
|
* @param safetyLevel 待校验防护等级
|
||||||
|
* @return true=防护有效 false=已熔断
|
||||||
|
*/
|
||||||
|
boolean isSafetyWireWorking(final int safetyLevel) {
|
||||||
|
LogUtils.d(TAG, "isSafetyWireWorking:校验等级 = " + safetyLevel);
|
||||||
|
if (safetyLevel >= _MINI && safetyLevel <= _MAX) {
|
||||||
|
LogUtils.d(TAG, "isSafetyWireWorking:等级在合法区间内");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
LogUtils.d(TAG, "isSafetyWireWorking:等级超出合法区间,已熔断");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 立即恢复防护等级为最高等级
|
||||||
|
*/
|
||||||
|
void resumeToMaximumImmediately() {
|
||||||
|
LogUtils.d(TAG, "resumeToMaximumImmediately:重置为最高防护等级");
|
||||||
|
GlobalAppCrashSafetyWire.getInstance().saveCurrentSafetyLevel(_MAX);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 关闭防护,设置为临界最低等级
|
||||||
|
*/
|
||||||
|
void off() {
|
||||||
|
LogUtils.d(TAG, "off:设置为临界最低防护等级");
|
||||||
|
saveCurrentSafetyLevel(_MINI);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查当前整体保险丝是否处于可用防护状态
|
||||||
|
* @return true=防护正常 false=已熔断
|
||||||
|
*/
|
||||||
|
boolean isAppCrashSafetyWireOK() {
|
||||||
|
LogUtils.d(TAG, "isAppCrashSafetyWireOK:检测当前防护状态");
|
||||||
|
currentSafetyLevel = loadCurrentSafetyLevel();
|
||||||
|
return isSafetyWireWorking(currentSafetyLevel);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 延迟异步检测并自动恢复防护等级
|
||||||
|
* @param context 上下文对象
|
||||||
|
*/
|
||||||
|
void postResumeCrashSafetyWireHandler(final Context context) {
|
||||||
|
LogUtils.d(TAG, "postResumeCrashSafetyWireHandler:开启延迟自动恢复任务");
|
||||||
|
new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
final int nextLevel = currentSafetyLevel - 1;
|
||||||
|
if (!GlobalAppCrashSafetyWire.getInstance().isSafetyWireWorking(nextLevel)) {
|
||||||
|
GlobalAppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
|
||||||
|
LogUtils.d(TAG, "postResumeCrashSafetyWireHandler:临近熔断,自动重置最高等级");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void testGlobalAppCrashSafetyWire(Context context) {
|
||||||
|
if (GlobalAppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
|
||||||
|
GlobalAppCrashSafetyWire.getInstance().burnSafetyWire();
|
||||||
|
for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
|
||||||
|
context.getString(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ public class GlobalApplication extends Application {
|
|||||||
public static boolean isDebugging() {
|
public static boolean isDebugging() {
|
||||||
return isDebugging;
|
return isDebugging;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 新增:设置 WinBoLL 服务器主机地址(同时保存到 SP 持久化)
|
// 新增:设置 WinBoLL 服务器主机地址(同时保存到 SP 持久化)
|
||||||
public static void setWinbollHost(String host) {
|
public static void setWinbollHost(String host) {
|
||||||
if (sInstance == null) {
|
if (sInstance == null) {
|
||||||
@@ -100,7 +100,7 @@ public class GlobalApplication extends Application {
|
|||||||
sp.edit().putString(SP_KEY_WINBOLL_HOST, host).apply();
|
sp.edit().putString(SP_KEY_WINBOLL_HOST, host).apply();
|
||||||
LogUtils.d(TAG, "setWinbollHost: 服务器地址已设置并持久化,host=" + host);
|
LogUtils.d(TAG, "setWinbollHost: 服务器地址已设置并持久化,host=" + host);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 新增:获取 WinBoLL 服务器主机地址(优先内存,内存为空则从 SP 读取)
|
// 新增:获取 WinBoLL 服务器主机地址(优先内存,内存为空则从 SP 读取)
|
||||||
public static String getWinbollHost() {
|
public static String getWinbollHost() {
|
||||||
|
|||||||
@@ -13,173 +13,123 @@ import android.widget.Toast;
|
|||||||
import cc.winboll.studio.libappbase.R;
|
import cc.winboll.studio.libappbase.R;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
|
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||||
* @Date 2025/11/11 19:58
|
* @CreateTime 2025-11-11 19:58:00
|
||||||
|
* @EditTime 2025-11-11 20:15:32
|
||||||
* @Describe 应用异常报告观察活动窗口类
|
* @Describe 应用异常报告观察活动窗口类
|
||||||
* 核心功能:应用发生未捕获崩溃时,由 CrashHandler 启动此页面,展示崩溃日志详情,
|
* 应用发生未捕获崩溃时,由 CrashHandler 启动此页面,展示崩溃日志详情,
|
||||||
* 并提供「复制日志」「重启应用」操作入口,便于开发者定位问题和用户恢复应用
|
* 提供复制日志、重启应用操作入口,便于开发者定位问题及用户恢复应用;
|
||||||
|
* 页面初始化异常时捕获错误并输出调试日志,提升崩溃页面自身稳定性。
|
||||||
*/
|
*/
|
||||||
public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
|
public final class GlobalCrashActivity extends Activity
|
||||||
|
implements MenuItem.OnMenuItemClickListener {
|
||||||
|
|
||||||
/** 日志标签(用于调试日志输出,唯一标识当前 Activity) */
|
/** 日志标签 */
|
||||||
public static final String TAG = "GlobalCrashActivity";
|
public static final String TAG = "GlobalCrashActivity";
|
||||||
|
|
||||||
/** 菜单标识:复制崩溃日志(用于区分菜单项点击事件) */
|
/** 菜单标识:复制崩溃日志 */
|
||||||
private static final int MENU_ITEM_COPY = 0;
|
private static final int MENU_ITEM_COPY = 0;
|
||||||
/** 菜单标识:重启应用(用于区分菜单项点击事件) */
|
/** 菜单标识:重启应用 */
|
||||||
private static final int MENU_ITEM_RESTART = 1;
|
private static final int MENU_ITEM_RESTART = 1;
|
||||||
|
|
||||||
/** 崩溃报告展示自定义视图 */
|
/** 崩溃报告自定义视图 */
|
||||||
// 负责渲染崩溃日志文本、提供 Toolbar 容器,封装了日志展示和菜单样式控制逻辑
|
|
||||||
private GlobalCrashReportView mCrashReportView;
|
private GlobalCrashReportView mCrashReportView;
|
||||||
|
/** 崩溃日志文本 */
|
||||||
/** 崩溃日志文本内容 */
|
|
||||||
// 从 CrashHandler 通过 Intent 传递过来,包含异常堆栈、设备信息等完整崩溃数据
|
|
||||||
private String mCrashLog;
|
private String mCrashLog;
|
||||||
|
|
||||||
/**
|
|
||||||
* Activity 创建时初始化(生命周期核心方法,仅执行一次)
|
|
||||||
* @param savedInstanceState 保存的实例状态(崩溃页面无需恢复状态,此处仅作兼容)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
LogUtils.d(TAG, "onCreate: 初始化崩溃展示页面");
|
||||||
|
|
||||||
// 初始化崩溃安全防护机制
|
final Context appContext = getApplicationContext();
|
||||||
// 作用:防止应用重启后短时间内再次崩溃,由 CrashHandler 内部实现防护逻辑
|
GlobalAppCrashSafetyWire.getInstance()
|
||||||
CrashHandler.AppCrashSafetyWire.getInstance()
|
.postResumeCrashSafetyWireHandler(appContext);
|
||||||
.postResumeCrashSafetyWireHandler(getApplicationContext());
|
|
||||||
|
|
||||||
// 从 Intent 中获取崩溃日志数据(EXTRA_CRASH_INFO 为 CrashHandler 定义的常量键)
|
mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
|
||||||
mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
|
setContentView(R.layout.activity_globalcrash);
|
||||||
|
|
||||||
// 设置当前 Activity 的布局文件(展示崩溃报告的 UI 结构)
|
mCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
|
||||||
setContentView(R.layout.activity_globalcrash);
|
if (mCrashReportView != null) {
|
||||||
|
mCrashReportView.setReport(mCrashLog);
|
||||||
|
setActionBar(mCrashReportView.getToolbar());
|
||||||
|
}
|
||||||
|
|
||||||
// 初始化崩溃报告展示视图(通过布局 ID 找到自定义 View 实例)
|
if (getActionBar() != null) {
|
||||||
mCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
|
getActionBar().setTitle(CrashHandler.TITTLE);
|
||||||
// 将崩溃日志设置到视图中,由自定义 View 负责排版和显示
|
final String appName = GlobalApplication.getAppName(appContext);
|
||||||
mCrashReportView.setReport(mCrashLog);
|
getActionBar().setSubtitle(appName);
|
||||||
|
}
|
||||||
// 设置页面的 ActionBar(复用自定义 View 中的 Toolbar 作为系统 ActionBar)
|
LogUtils.d(TAG, "onCreate: 崩溃页面初始化完成");
|
||||||
setActionBar(mCrashReportView.getToolbar());
|
|
||||||
|
|
||||||
// 配置 ActionBar 标题和副标题(非空判断避免空指针异常)
|
|
||||||
if (getActionBar() != null) {
|
|
||||||
// 设置标题:使用 CrashHandler 中定义的统一标题(如 "应用崩溃报告")
|
|
||||||
getActionBar().setTitle(CrashHandler.TITTLE);
|
|
||||||
// 设置副标题:显示当前应用名称(从全局 Application 工具方法获取)
|
|
||||||
getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 重写返回键点击事件
|
|
||||||
* 逻辑:点击手机返回键时,直接重启应用(而非返回上一页,因崩溃后上一页状态可能异常)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackPressed() {
|
public void onBackPressed() {
|
||||||
restartApp();
|
restartApp();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 重启当前应用(核心工具方法)
|
* 重启当前应用
|
||||||
* 实现逻辑:
|
|
||||||
* 1. 获取应用的启动意图(默认启动 AndroidManifest 中配置的主 Activity)
|
|
||||||
* 2. 设置意图标志,清除原有任务栈,避免残留异常页面
|
|
||||||
* 3. 启动主 Activity 并终止当前进程,确保应用完全重启
|
|
||||||
*/
|
*/
|
||||||
private void restartApp() {
|
private void restartApp() {
|
||||||
// 获取 PackageManager 实例(用于获取应用相关信息和意图)
|
LogUtils.d(TAG, "restartApp: 执行应用重启操作");
|
||||||
PackageManager packageManager = getPackageManager();
|
final PackageManager packageManager = getPackageManager();
|
||||||
// 获取应用的启动意图(参数为当前应用包名,返回主 Activity 的意图)
|
final Intent launchIntent = packageManager.getLaunchIntentForPackage(getPackageName());
|
||||||
Intent launchIntent = packageManager.getLaunchIntentForPackage(getPackageName());
|
|
||||||
|
|
||||||
if (launchIntent != null) {
|
if (launchIntent != null) {
|
||||||
// 设置意图标志:
|
|
||||||
// FLAG_ACTIVITY_NEW_TASK:创建新的任务栈启动 Activity
|
|
||||||
// FLAG_ACTIVITY_CLEAR_TOP:清除目标 Activity 之上的所有 Activity
|
|
||||||
// FLAG_ACTIVITY_CLEAR_TASK:清除当前任务栈中的所有 Activity
|
|
||||||
launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
|
launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
|
||||||
| Intent.FLAG_ACTIVITY_CLEAR_TOP
|
| Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||||
| Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
| Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||||
// 启动应用主 Activity
|
|
||||||
startActivity(launchIntent);
|
startActivity(launchIntent);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 关闭当前崩溃报告页面
|
|
||||||
finish();
|
finish();
|
||||||
// 终止当前应用进程(确保释放所有资源,避免内存泄漏)
|
|
||||||
android.os.Process.killProcess(android.os.Process.myPid());
|
android.os.Process.killProcess(android.os.Process.myPid());
|
||||||
// 强制退出虚拟机(彻底终止应用,防止残留线程继续运行)
|
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 菜单项点击事件回调(实现 MenuItem.OnMenuItemClickListener 接口)
|
|
||||||
* @param item 被点击的菜单项实例
|
|
||||||
* @return boolean:true 表示事件已消费,不再向下传递;false 表示未消费
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onMenuItemClick(MenuItem item) {
|
public boolean onMenuItemClick(MenuItem item) {
|
||||||
// 根据菜单项 ID 判断点击的是哪个功能
|
final int itemId = item.getItemId();
|
||||||
switch (item.getItemId()) {
|
switch (itemId) {
|
||||||
case MENU_ITEM_COPY:
|
case MENU_ITEM_COPY:
|
||||||
// 点击「复制」菜单,执行复制崩溃日志到剪贴板
|
|
||||||
copyCrashLogToClipboard();
|
copyCrashLogToClipboard();
|
||||||
break;
|
break;
|
||||||
case MENU_ITEM_RESTART:
|
case MENU_ITEM_RESTART:
|
||||||
// 点击「重启」菜单:先恢复崩溃防护机制到最大等级,再重启应用
|
GlobalAppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
|
||||||
CrashHandler.AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
|
|
||||||
restartApp();
|
restartApp();
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 创建页面顶部菜单(ActionBar 菜单)
|
|
||||||
* @param menu 菜单容器,用于添加菜单项
|
|
||||||
* @return boolean:true 表示显示菜单;false 表示不显示
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
// 添加「复制」菜单项:
|
|
||||||
// 参数说明:菜单组 ID(0 表示默认组)、菜单项 ID(MENU_ITEM_COPY)、排序号(0)、菜单文本("Copy")
|
|
||||||
// setOnMenuItemClickListener(this):绑定点击事件到当前 Activity
|
|
||||||
// setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM):有空间时显示在 ActionBar 上,否则放入溢出菜单
|
|
||||||
menu.add(0, MENU_ITEM_COPY, 0, "Copy")
|
menu.add(0, MENU_ITEM_COPY, 0, "Copy")
|
||||||
.setOnMenuItemClickListener(this)
|
.setOnMenuItemClickListener(this)
|
||||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||||
|
|
||||||
// 添加「重启」菜单项(参数含义同上)
|
|
||||||
menu.add(0, MENU_ITEM_RESTART, 0, "Restart")
|
menu.add(0, MENU_ITEM_RESTART, 0, "Restart")
|
||||||
.setOnMenuItemClickListener(this)
|
.setOnMenuItemClickListener(this)
|
||||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||||
|
|
||||||
// 调用自定义视图的方法,更新菜单文字样式(如颜色、字体大小等,由自定义 View 内部实现)
|
if (mCrashReportView != null) {
|
||||||
mCrashReportView.updateMenuStyle();
|
mCrashReportView.updateMenuStyle();
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 将崩溃日志复制到系统剪贴板(工具方法)
|
* 复制崩溃日志到系统剪贴板
|
||||||
* 功能:用户点击复制菜单后,将完整崩溃日志存入剪贴板,方便粘贴到聊天工具或文档中
|
|
||||||
*/
|
*/
|
||||||
private void copyCrashLogToClipboard() {
|
private void copyCrashLogToClipboard() {
|
||||||
// 获取系统剪贴板服务(需通过 getSystemService 方法获取)
|
LogUtils.d(TAG, "copyCrashLogToClipboard: 复制崩溃日志到剪贴板");
|
||||||
ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
|
final ClipboardManager clipboardManager = (ClipboardManager)
|
||||||
|
getSystemService(Context.CLIPBOARD_SERVICE);
|
||||||
// 创建剪贴板数据:
|
final ClipData clipData = ClipData.newPlainText(getPackageName(), mCrashLog);
|
||||||
// 参数 1:标签(用于标识剪贴板内容来源,此处用应用包名)
|
|
||||||
// 参数 2:实际复制的文本内容(崩溃日志)
|
|
||||||
ClipData clipData = ClipData.newPlainText(getPackageName(), mCrashLog);
|
|
||||||
|
|
||||||
// 将数据设置到剪贴板(完成复制操作)
|
|
||||||
clipboardManager.setPrimaryClip(clipData);
|
clipboardManager.setPrimaryClip(clipData);
|
||||||
|
|
||||||
// 显示复制成功的 Toast 提示(告知用户操作结果)
|
|
||||||
Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
|
|||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toolbar;
|
import android.widget.Toolbar;
|
||||||
import cc.winboll.studio.libappbase.R;
|
import cc.winboll.studio.libappbase.R;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
|
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
|
||||||
@@ -175,10 +176,11 @@ public class GlobalCrashReportView extends LinearLayout {
|
|||||||
* 初始化默认配置(无自定义属性时使用)
|
* 初始化默认配置(无自定义属性时使用)
|
||||||
*/
|
*/
|
||||||
private void initDefaultConfig() {
|
private void initDefaultConfig() {
|
||||||
// 设置默认配色
|
// 设置默认配色(使用 debugTextColor 属性)
|
||||||
mTitleColor = Color.WHITE;
|
Resources.Theme theme = mContext.getTheme();
|
||||||
mTitleBackgroundColor = Color.BLACK;
|
mTitleColor = theme.getResources().getColor(android.R.color.holo_green_dark);
|
||||||
mTextColor = Color.BLACK;
|
mTitleBackgroundColor = Color.GRAY;
|
||||||
|
mTextColor = obtainDebugTextColor(theme);
|
||||||
mTextBackgroundColor = Color.WHITE;
|
mTextBackgroundColor = Color.WHITE;
|
||||||
// 加载布局
|
// 加载布局
|
||||||
inflateView();
|
inflateView();
|
||||||
@@ -186,6 +188,21 @@ public class GlobalCrashReportView extends LinearLayout {
|
|||||||
initWidgetStyle();
|
initWidgetStyle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int obtainDebugTextColor(Resources.Theme theme) {
|
||||||
|
int[] attrs = new int[] { cc.winboll.studio.libappbase.R.attr.themeDebug };
|
||||||
|
TypedArray themeTypedArray = theme.obtainStyledAttributes(attrs);
|
||||||
|
int themeResId = themeTypedArray.getResourceId(0, 0);
|
||||||
|
themeTypedArray.recycle();
|
||||||
|
if (themeResId != 0) {
|
||||||
|
int[] debugAttrs = new int[] { cc.winboll.studio.libappbase.R.attr.debugTextColor };
|
||||||
|
TypedArray debugTypedArray = theme.obtainStyledAttributes(themeResId, debugAttrs);
|
||||||
|
int color = debugTypedArray.getColor(0, Color.GRAY);
|
||||||
|
debugTypedArray.recycle();
|
||||||
|
return color;
|
||||||
|
}
|
||||||
|
return Color.GRAY;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化视图(解析自定义属性 + 加载布局 + 设置样式)
|
* 初始化视图(解析自定义属性 + 加载布局 + 设置样式)
|
||||||
* @param attrs 自定义属性集合
|
* @param attrs 自定义属性集合
|
||||||
@@ -195,23 +212,20 @@ public class GlobalCrashReportView extends LinearLayout {
|
|||||||
TypedArray typedArray = mContext.obtainStyledAttributes(
|
TypedArray typedArray = mContext.obtainStyledAttributes(
|
||||||
attrs,
|
attrs,
|
||||||
R.styleable.GlobalCrashActivity,
|
R.styleable.GlobalCrashActivity,
|
||||||
R.attr.themeGlobalCrashActivity,
|
R.attr.themeDebug,
|
||||||
0
|
0
|
||||||
);
|
);
|
||||||
|
|
||||||
// 读取自定义属性值(无设置时使用默认值)
|
// 读取自定义属性值(无设置时使用默认值)
|
||||||
mTitleColor = typedArray.getColor(
|
mTitleColor = typedArray.getColor(
|
||||||
R.styleable.GlobalCrashActivity_colorTittle,
|
R.styleable.GlobalCrashActivity_colorTittle,
|
||||||
Color.WHITE
|
Color.BLACK
|
||||||
);
|
);
|
||||||
mTitleBackgroundColor = typedArray.getColor(
|
mTitleBackgroundColor = typedArray.getColor(
|
||||||
R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注:原拼写错误(Backgound→Background),保持与 attrs.xml 一致
|
R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注:原拼写错误(Backgound→Background),保持与 attrs.xml 一致
|
||||||
Color.BLACK
|
Color.BLACK
|
||||||
);
|
);
|
||||||
mTextColor = typedArray.getColor(
|
mTextColor = obtainDebugTextColor(mContext.getTheme());
|
||||||
R.styleable.GlobalCrashActivity_colorText,
|
|
||||||
Color.BLACK
|
|
||||||
);
|
|
||||||
mTextBackgroundColor = typedArray.getColor(
|
mTextBackgroundColor = typedArray.getColor(
|
||||||
R.styleable.GlobalCrashActivity_colorTextBackgound, // 注:原拼写错误,保持与 attrs.xml 一致
|
R.styleable.GlobalCrashActivity_colorTextBackgound, // 注:原拼写错误,保持与 attrs.xml 一致
|
||||||
Color.WHITE
|
Color.WHITE
|
||||||
@@ -241,12 +255,8 @@ public class GlobalCrashReportView extends LinearLayout {
|
|||||||
* 初始化控件样式(设置配色和基础属性)
|
* 初始化控件样式(设置配色和基础属性)
|
||||||
*/
|
*/
|
||||||
private void initWidgetStyle() {
|
private void initWidgetStyle() {
|
||||||
// 设置主布局背景颜色
|
|
||||||
setBackgroundColor(mTextBackgroundColor);
|
|
||||||
|
|
||||||
// 配置工具栏样式
|
// 配置工具栏样式
|
||||||
if (mToolbar != null) {
|
if (mToolbar != null) {
|
||||||
mToolbar.setBackgroundColor(mTitleBackgroundColor);
|
|
||||||
mToolbar.setTitleTextColor(mTitleColor);
|
mToolbar.setTitleTextColor(mTitleColor);
|
||||||
mToolbar.setSubtitleTextColor(mTitleColor);
|
mToolbar.setSubtitleTextColor(mTitleColor);
|
||||||
}
|
}
|
||||||
@@ -254,8 +264,6 @@ public class GlobalCrashReportView extends LinearLayout {
|
|||||||
// 配置日志文本控件样式
|
// 配置日志文本控件样式
|
||||||
if (mTvReport != null) {
|
if (mTvReport != null) {
|
||||||
mTvReport.setTextColor(mTextColor);
|
mTvReport.setTextColor(mTextColor);
|
||||||
mTvReport.setBackgroundColor(mTextBackgroundColor);
|
|
||||||
// 可选:设置日志文本换行方式(默认已换行,此处增强可读性)
|
|
||||||
mTvReport.setSingleLine(false);
|
mTvReport.setSingleLine(false);
|
||||||
mTvReport.setHorizontallyScrolling(false);
|
mTvReport.setHorizontallyScrolling(false);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -62,11 +62,11 @@ public class BackupUtils {
|
|||||||
|
|
||||||
// 核心修改:入参Map非空且非空集合时,使用入参初始化;否则内部new HashMap()
|
// 核心修改:入参Map非空且非空集合时,使用入参初始化;否则内部new HashMap()
|
||||||
this.mDataDirFileMap = (dataDirFileMap != null && !dataDirFileMap.isEmpty())
|
this.mDataDirFileMap = (dataDirFileMap != null && !dataDirFileMap.isEmpty())
|
||||||
? new HashMap<>(dataDirFileMap) // 新建Map避免外部篡改内部数据
|
? new HashMap<String, String>(dataDirFileMap)
|
||||||
: new HashMap<>();
|
: new HashMap<String, String>();
|
||||||
this.mSdcardFileMap = (sdcardFileMap != null && !sdcardFileMap.isEmpty())
|
this.mSdcardFileMap = (sdcardFileMap != null && !sdcardFileMap.isEmpty())
|
||||||
? new HashMap<>(sdcardFileMap) // 深拷贝,隔离外部引用
|
? new HashMap<String, String>(sdcardFileMap)
|
||||||
: new HashMap<>();
|
: new HashMap<String, String>();
|
||||||
|
|
||||||
LogUtils.d(TAG, "BackupUtils初始化完成 → SFTP服务器:" + ftpAuthModel.getFtpServer() + ":" + ftpAuthModel.getFtpPort() + " | 上传目录:" + mFtpTargetDir);
|
LogUtils.d(TAG, "BackupUtils初始化完成 → SFTP服务器:" + ftpAuthModel.getFtpServer() + ":" + ftpAuthModel.getFtpPort() + " | 上传目录:" + mFtpTargetDir);
|
||||||
LogUtils.d(TAG, "SDCard Map基础根目录:" + (mAppExternalFilesDir == null ? "获取失败" : mAppExternalFilesDir.getAbsolutePath()));
|
LogUtils.d(TAG, "SDCard Map基础根目录:" + (mAppExternalFilesDir == null ? "获取失败" : mAppExternalFilesDir.getAbsolutePath()));
|
||||||
|
|||||||
@@ -421,9 +421,10 @@ public class AboutView extends LinearLayout {
|
|||||||
*/
|
*/
|
||||||
private android.graphics.drawable.Drawable create_item_background() {
|
private android.graphics.drawable.Drawable create_item_background() {
|
||||||
android.graphics.drawable.GradientDrawable drawable = new android.graphics.drawable.GradientDrawable();
|
android.graphics.drawable.GradientDrawable drawable = new android.graphics.drawable.GradientDrawable();
|
||||||
drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_200));
|
drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_300));
|
||||||
drawable.setCornerRadius(4);
|
drawable.setCornerRadius(4);
|
||||||
drawable.setColor(mItemContext.getResources().getColor(android.R.color.white));
|
boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
|
||||||
|
drawable.setColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_800) : mItemContext.getResources().getColor(android.R.color.white));
|
||||||
return drawable;
|
return drawable;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -449,7 +450,8 @@ public class AboutView extends LinearLayout {
|
|||||||
TextView tvTitle = new TextView(mItemContext);
|
TextView tvTitle = new TextView(mItemContext);
|
||||||
tvTitle.setText(mTitle);
|
tvTitle.setText(mTitle);
|
||||||
tvTitle.setTextSize(16);
|
tvTitle.setTextSize(16);
|
||||||
tvTitle.setTextColor(mItemContext.getResources().getColor(R.color.gray_900));
|
boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
|
||||||
|
tvTitle.setTextColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_500) : mItemContext.getResources().getColor(R.color.gray_900));
|
||||||
llText.addView(tvTitle);
|
llText.addView(tvTitle);
|
||||||
// 内容
|
// 内容
|
||||||
TextView tvContent = new TextView(mItemContext);
|
TextView tvContent = new TextView(mItemContext);
|
||||||
|
|||||||
22
libappbase/src/main/res/layout-night/activity_about.xml
Normal file
22
libappbase/src/main/res/layout-night/activity_about.xml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
|
<android.widget.Toolbar
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/toolbarBackgroundColor"
|
||||||
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1.0"
|
||||||
|
android:id="@+id/aboutviewroot_ll"/>
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">>
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.GlobalCrashReportView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:id="@+id/activityglobalcrashGlobalCrashReportView1"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
15
libappbase/src/main/res/layout-night/activity_log.xml
Normal file
15
libappbase/src/main/res/layout-night/activity_log.xml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.LogView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:id="@+id/logview"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="24dp"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
|
<!-- NFC状态提示文本 -->
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_nfc_state"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="正在监听NFC卡片,请贴近设备检测密钥..."
|
||||||
|
android:textSize="17sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:gravity="center"
|
||||||
|
android:padding="12dp"
|
||||||
|
android:layout_marginBottom="30dp"/>
|
||||||
|
|
||||||
|
<!-- 私钥显示区域 -->
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_private_key"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="私钥内容:无"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:layout_marginBottom="12dp"
|
||||||
|
android:maxLines="5"
|
||||||
|
android:ellipsize="end"/>
|
||||||
|
|
||||||
|
<!-- 公钥显示区域 -->
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_public_key"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="公钥内容:无"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/activityTextColor"
|
||||||
|
android:layout_marginBottom="40dp"
|
||||||
|
android:maxLines="5"
|
||||||
|
android:ellipsize="end"/>
|
||||||
|
|
||||||
|
<!-- 核心功能按钮(复用:保存本地/初始化密钥) -->
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btn_create_write_key"
|
||||||
|
android:layout_width="300dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="功能按钮待激活"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/buttonTextColor"
|
||||||
|
android:backgroundTint="?attr/buttonBackgroundColor"
|
||||||
|
android:padding="14dp"
|
||||||
|
android:enabled="false"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
52
libappbase/src/main/res/layout-night/dialog_sign_get.xml
Normal file
52
libappbase/src/main/res/layout-night/dialog_sign_get.xml
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:background="?attr/dialogBackgroundColor">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="应用指纹校验"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/dialogTextColor"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_marginBottom="12dp"/>
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_sign_fingerprint"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@android:drawable/edit_text"
|
||||||
|
android:textSize="12sp"
|
||||||
|
android:gravity="top"
|
||||||
|
android:hint="签名获取中..."
|
||||||
|
android:singleLine="false"
|
||||||
|
android:scrollHorizontally="false"
|
||||||
|
android:scrollbars="vertical"
|
||||||
|
android:overScrollMode="always"
|
||||||
|
android:typeface="monospace"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:paddingRight="10dp"/>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_auth_result"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:textSize="11sp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:textColor="?attr/dialogTextColor"/>/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
62
libappbase/src/main/res/layout-night/dialog_winboll_host.xml
Normal file
62
libappbase/src/main/res/layout-night/dialog_winboll_host.xml
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp"
|
||||||
|
android:background="?attr/dialogBackgroundColor">
|
||||||
|
|
||||||
|
<!-- 标题 -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="设置服务器地址"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/dialogTextColor"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<!-- 地址输入框 -->
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_host_input"
|
||||||
|
android:layout_width="300dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="请输入服务器地址(如http://localhost:8080)"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/dialogTextColor"
|
||||||
|
android:inputType="textUri"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:background="@android:drawable/edit_text"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<!-- 按钮容器 -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="end">
|
||||||
|
|
||||||
|
<!-- 取消按钮 -->
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btn_cancel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="取消"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/dialogTextColor"
|
||||||
|
android:layout_marginRight="8dp"/>
|
||||||
|
|
||||||
|
<!-- 确认按钮 -->
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btn_confirm"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="确认"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:backgroundTint="?attr/buttonBackgroundColor"
|
||||||
|
android:textColor="?attr/buttonTextColor"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
24
libappbase/src/main/res/layout-night/item_logtag.xml
Normal file
24
libappbase/src/main/res/layout-night/item_logtag.xml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@drawable/bg_border_round">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="@dimen/log_button_height"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:id="@+id/viewlogtagTextView1"/>
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="@dimen/log_button_height"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:id="@+id/viewlogtagCheckBox1"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
93
libappbase/src/main/res/layout-night/layout_about_view.xml
Normal file
93
libappbase/src/main/res/layout-night/layout_about_view.xml
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<ScrollView
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/aboutViewBackgroundColor">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:paddingLeft="16dp"
|
||||||
|
android:paddingTop="16dp"
|
||||||
|
android:paddingRight="16dp"
|
||||||
|
android:paddingBottom="16dp">
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
|
||||||
|
android:id="@+id/iv_app_icon"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:scaleType="centerCrop"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_app_name_version"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:textColor="?attr/aboutViewTitleColor"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_app_desc"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/aboutViewTextColor"/>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1px"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:background="?attr/aboutViewDividerColor"/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/ll_function_container"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:spacing="20dp">
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:src="@drawable/ic_debug_step_over"
|
||||||
|
android:id="@+id/ib_debug_step_over"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:background="@null"/>
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:src="@drawable/ic_winboll"
|
||||||
|
android:id="@+id/ib_winbollhostdialog"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:background="@null"/>
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:src="@drawable/ic_key"
|
||||||
|
android:id="@+id/ib_signgetdialog"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:background="@null"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:theme="?attr/themeDebug"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorTextBackgound"
|
||||||
|
android:id="@+id/viewglobalcrashreportLinearLayout1">
|
||||||
|
|
||||||
|
<android.widget.Toolbar
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:titleTextColor="?attr/colorTittle"
|
||||||
|
android:id="@+id/viewglobalcrashreportToolbar1"/>
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1.0"
|
||||||
|
android:fillViewport="true">
|
||||||
|
|
||||||
|
<HorizontalScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="16dp"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
|
android:id="@+id/viewglobalcrashreportTextView1"/>
|
||||||
|
|
||||||
|
</HorizontalScrollView>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
151
libappbase/src/main/res/layout-night/view_log.xml
Normal file
151
libappbase/src/main/res/layout-night/view_log.xml
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<RelativeLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:theme="?attr/themeDebug"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorTextBackgound">
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="34dp"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:id="@+id/viewlogRelativeLayoutToolbar">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="@dimen/log_button_width"
|
||||||
|
android:layout_height="@dimen/log_button_height"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:text="Clean"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
|
android:backgroundTint="?attr/colorTittleBackgound"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:id="@+id/viewlogButtonClean"
|
||||||
|
android:layout_marginLeft="5dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:padding="@dimen/log_text_padding"
|
||||||
|
android:text="LV:"
|
||||||
|
android:layout_toRightOf="@+id/viewlogButtonClean"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:id="@+id/viewlogTextView1"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:textColor="?attr/colorText"/>
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.widget.LogTagSpinner
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_toRightOf="@+id/viewlogTextView1"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:id="@+id/viewlogSpinner1"
|
||||||
|
android:padding="@dimen/log_spinner_text_padding"/>
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
android:layout_width="@dimen/log_checkbox_width"
|
||||||
|
android:layout_height="@dimen/log_checkbox_height"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:layout_toLeftOf="@+id/viewlogButtonCopy"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:text="Selectable"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:id="@+id/viewlogCheckBoxSelectable"
|
||||||
|
android:padding="@dimen/log_text_padding"
|
||||||
|
android:textColor="?attr/colorText"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="@dimen/log_button_width"
|
||||||
|
android:layout_height="@dimen/log_button_height"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
|
android:backgroundTint="?attr/colorTittleBackgound"
|
||||||
|
android:text="Copy"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:id="@+id/viewlogButtonCopy"
|
||||||
|
android:layout_marginRight="5dp"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/log_button_height"
|
||||||
|
android:layout_below="@+id/viewlogRelativeLayoutToolbar"
|
||||||
|
android:id="@+id/viewlogLinearLayout1"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:background="?attr/colorTittleBackgound">
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="@dimen/log_button_height"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:text="ALL"
|
||||||
|
android:padding="2dp"
|
||||||
|
android:id="@+id/viewlogCheckBox1"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:ems="10"
|
||||||
|
android:layout_height="@dimen/log_button_height"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:id="@+id/tagsearch_et"/>
|
||||||
|
|
||||||
|
<HorizontalScrollView
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:scrollbars="none"
|
||||||
|
android:padding="2dp"
|
||||||
|
android:layout_weight="1.0"
|
||||||
|
android:id="@+id/viewlogHorizontalScrollView1">
|
||||||
|
|
||||||
|
<cc.winboll.studio.libappbase.views.HorizontalListView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:id="@+id/tags_listview"/>
|
||||||
|
|
||||||
|
</HorizontalScrollView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1.0"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_below="@+id/viewlogLinearLayout1">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorTextBackgound"
|
||||||
|
android:id="@+id/viewlogScrollViewLog">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:text="Text"
|
||||||
|
android:textColor="?attr/debugTextColor"
|
||||||
|
android:textIsSelectable="true"
|
||||||
|
android:id="@+id/viewlogTextViewLog"/>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
@@ -4,11 +4,13 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
<android.widget.Toolbar
|
<android.widget.Toolbar
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/toolbarBackgroundColor"
|
||||||
android:id="@+id/toolbar"/>
|
android:id="@+id/toolbar"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|||||||
@@ -2,9 +2,10 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
<cc.winboll.studio.libappbase.GlobalCrashReportView
|
<cc.winboll.studio.libappbase.GlobalCrashReportView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
<cc.winboll.studio.libappbase.LogView
|
<cc.winboll.studio.libappbase.LogView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="24dp"
|
android:padding="24dp"
|
||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
android:background="@android:color/white">
|
android:background="?attr/activityBackgroundColor">
|
||||||
|
|
||||||
<!-- NFC状态提示文本 -->
|
<!-- NFC状态提示文本 -->
|
||||||
<TextView
|
<TextView
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="正在监听NFC卡片,请贴近设备检测密钥..."
|
android:text="正在监听NFC卡片,请贴近设备检测密钥..."
|
||||||
android:textSize="17sp"
|
android:textSize="17sp"
|
||||||
android:textColor="@android:color/black"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:padding="12dp"
|
android:padding="12dp"
|
||||||
android:layout_marginBottom="30dp"/>
|
android:layout_marginBottom="30dp"/>
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="私钥内容:无"
|
android:text="私钥内容:无"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
android:textColor="@android:color/darker_gray"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:layout_marginBottom="12dp"
|
android:layout_marginBottom="12dp"
|
||||||
android:maxLines="5"
|
android:maxLines="5"
|
||||||
android:ellipsize="end"/>
|
android:ellipsize="end"/>
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="公钥内容:无"
|
android:text="公钥内容:无"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
android:textColor="@android:color/darker_gray"
|
android:textColor="?attr/activityTextColor"
|
||||||
android:layout_marginBottom="40dp"
|
android:layout_marginBottom="40dp"
|
||||||
android:maxLines="5"
|
android:maxLines="5"
|
||||||
android:ellipsize="end"/>
|
android:ellipsize="end"/>
|
||||||
@@ -50,10 +50,9 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="功能按钮待激活"
|
android:text="功能按钮待激活"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="?attr/buttonTextColor"
|
||||||
android:backgroundTint="@android:color/holo_blue_light"
|
android:backgroundTint="?attr/buttonBackgroundColor"
|
||||||
android:padding="14dp"
|
android:padding="14dp"
|
||||||
android:enabled="false"/>
|
android:enabled="false"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
@@ -6,14 +6,14 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="16dp"
|
android:padding="16dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:background="#FFDCDCDC">
|
android:background="?attr/dialogBackgroundColor">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="应用指纹校验"
|
android:text="应用指纹校验"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="@color/gray_900"
|
android:textColor="?attr/dialogTextColor"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:layout_marginBottom="12dp"/>
|
android:layout_marginBottom="12dp"/>
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
android:textSize="11sp"
|
android:textSize="11sp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:textColor="@color/gray_900"/>
|
android:textColor="?attr/dialogTextColor"/>/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="16dp"
|
android:padding="16dp"
|
||||||
android:background="#FFFFFF">
|
android:background="?attr/dialogBackgroundColor">
|
||||||
|
|
||||||
<!-- 标题 -->
|
<!-- 标题 -->
|
||||||
<TextView
|
<TextView
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="设置服务器地址"
|
android:text="设置服务器地址"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textColor="#212121"
|
android:textColor="?attr/dialogTextColor"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:layout_marginBottom="16dp"/>
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="请输入服务器地址(如http://localhost:8080)"
|
android:hint="请输入服务器地址(如http://localhost:8080)"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/dialogTextColor"
|
||||||
android:inputType="textUri"
|
android:inputType="textUri"
|
||||||
android:padding="8dp"
|
android:padding="8dp"
|
||||||
android:background="@android:drawable/edit_text"
|
android:background="@android:drawable/edit_text"
|
||||||
@@ -42,6 +43,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="取消"
|
android:text="取消"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/dialogTextColor"
|
||||||
android:layout_marginRight="8dp"/>
|
android:layout_marginRight="8dp"/>
|
||||||
|
|
||||||
<!-- 确认按钮 -->
|
<!-- 确认按钮 -->
|
||||||
@@ -51,8 +53,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="确认"
|
android:text="确认"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
android:backgroundTint="#2196F3"
|
android:backgroundTint="?attr/buttonBackgroundColor"
|
||||||
android:textColor="#FFFFFF"/>
|
android:textColor="?attr/buttonTextColor"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
<ScrollView
|
<ScrollView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/aboutViewBackgroundColor">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -26,7 +27,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textColor="@color/gray_900"/>
|
android:textColor="?attr/aboutViewTitleColor"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_app_desc"
|
android:id="@+id/tv_app_desc"
|
||||||
@@ -35,14 +36,14 @@
|
|||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
android:textColor="@color/gray_500"/>
|
android:textColor="?attr/aboutViewTextColor"/>
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1px"
|
android:layout_height="1px"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:background="@color/gray_200"/>
|
android:background="?attr/aboutViewDividerColor"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/ll_function_container"
|
android:id="@+id/ll_function_container"
|
||||||
|
|||||||
@@ -2,29 +2,35 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:theme="?attr/themeDebug"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorTextBackgound"
|
||||||
android:id="@+id/viewglobalcrashreportLinearLayout1">
|
android:id="@+id/viewglobalcrashreportLinearLayout1">
|
||||||
|
|
||||||
<android.widget.Toolbar
|
<android.widget.Toolbar
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:titleTextColor="?attr/colorTittle"
|
||||||
android:id="@+id/viewglobalcrashreportToolbar1"/>
|
android:id="@+id/viewglobalcrashreportToolbar1"/>
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_weight="1.0">
|
android:layout_weight="1.0"
|
||||||
|
android:fillViewport="true">
|
||||||
|
|
||||||
<HorizontalScrollView
|
<HorizontalScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="#FFFFFFFF"
|
android:padding="16dp"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
android:id="@+id/viewglobalcrashreportTextView1"/>
|
android:id="@+id/viewglobalcrashreportTextView1"/>
|
||||||
|
|
||||||
</HorizontalScrollView>
|
</HorizontalScrollView>
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:theme="?attr/themeDebug"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="#FF000000">
|
android:background="?attr/colorTextBackgound">
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="34dp"
|
android:layout_height="34dp"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:background="@drawable/bg_toolbar_log"
|
android:background="?attr/colorTittleBackgound"
|
||||||
android:id="@+id/viewlogRelativeLayoutToolbar">
|
android:id="@+id/viewlogRelativeLayoutToolbar">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
@@ -19,8 +20,8 @@
|
|||||||
android:layout_height="@dimen/log_button_height"
|
android:layout_height="@dimen/log_button_height"
|
||||||
android:textSize="@dimen/log_text_size"
|
android:textSize="@dimen/log_text_size"
|
||||||
android:text="Clean"
|
android:text="Clean"
|
||||||
android:textColor="@color/white"
|
android:textColor="?attr/colorText"
|
||||||
android:backgroundTint="@drawable/btn_gray_bg"
|
android:backgroundTint="?attr/colorTittleBackgound"
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:id="@+id/viewlogButtonClean"
|
android:id="@+id/viewlogButtonClean"
|
||||||
android:layout_marginLeft="5dp"/>
|
android:layout_marginLeft="5dp"/>
|
||||||
@@ -34,8 +35,8 @@
|
|||||||
android:layout_toRightOf="@+id/viewlogButtonClean"
|
android:layout_toRightOf="@+id/viewlogButtonClean"
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:id="@+id/viewlogTextView1"
|
android:id="@+id/viewlogTextView1"
|
||||||
android:background="@color/btn_gray_normal"
|
android:background="?attr/colorTittleBackgound"
|
||||||
android:textColor="@color/black"/>
|
android:textColor="?attr/colorText"/>
|
||||||
|
|
||||||
<cc.winboll.studio.libappbase.widget.LogTagSpinner
|
<cc.winboll.studio.libappbase.widget.LogTagSpinner
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@@ -52,17 +53,17 @@
|
|||||||
android:layout_toLeftOf="@+id/viewlogButtonCopy"
|
android:layout_toLeftOf="@+id/viewlogButtonCopy"
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:text="Selectable"
|
android:text="Selectable"
|
||||||
android:background="@color/btn_gray_normal"
|
android:background="?attr/colorTittleBackgound"
|
||||||
android:id="@+id/viewlogCheckBoxSelectable"
|
android:id="@+id/viewlogCheckBoxSelectable"
|
||||||
android:padding="@dimen/log_text_padding"
|
android:padding="@dimen/log_text_padding"
|
||||||
android:textColor="@color/white"/>
|
android:textColor="?attr/colorText"/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:layout_width="@dimen/log_button_width"
|
android:layout_width="@dimen/log_button_width"
|
||||||
android:layout_height="@dimen/log_button_height"
|
android:layout_height="@dimen/log_button_height"
|
||||||
android:textSize="@dimen/log_text_size"
|
android:textSize="@dimen/log_text_size"
|
||||||
android:textColor="@color/white"
|
android:textColor="?attr/colorText"
|
||||||
android:backgroundTint="@drawable/btn_gray_bg"
|
android:backgroundTint="?attr/colorTittleBackgound"
|
||||||
android:text="Copy"
|
android:text="Copy"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
@@ -78,7 +79,7 @@
|
|||||||
android:layout_below="@+id/viewlogRelativeLayoutToolbar"
|
android:layout_below="@+id/viewlogRelativeLayoutToolbar"
|
||||||
android:id="@+id/viewlogLinearLayout1"
|
android:id="@+id/viewlogLinearLayout1"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:background="@drawable/bg_toolbar_log">
|
android:background="?attr/colorTittleBackgound">
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@@ -87,7 +88,8 @@
|
|||||||
android:text="ALL"
|
android:text="ALL"
|
||||||
android:padding="2dp"
|
android:padding="2dp"
|
||||||
android:id="@+id/viewlogCheckBox1"
|
android:id="@+id/viewlogCheckBox1"
|
||||||
android:background="@drawable/bg_border_round"
|
android:background="?attr/colorTittleBackgound"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
android:layout_marginLeft="5dp"
|
android:layout_marginLeft="5dp"
|
||||||
android:layout_marginRight="5dp"/>
|
android:layout_marginRight="5dp"/>
|
||||||
|
|
||||||
@@ -96,13 +98,15 @@
|
|||||||
android:ems="10"
|
android:ems="10"
|
||||||
android:layout_height="@dimen/log_button_height"
|
android:layout_height="@dimen/log_button_height"
|
||||||
android:textSize="@dimen/log_text_size"
|
android:textSize="@dimen/log_text_size"
|
||||||
|
android:textColor="?attr/colorText"
|
||||||
|
android:background="?attr/colorTittleBackgound"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:id="@+id/tagsearch_et"/>
|
android:id="@+id/tagsearch_et"/>
|
||||||
|
|
||||||
<HorizontalScrollView
|
<HorizontalScrollView
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@drawable/bg_border"
|
android:background="?attr/colorTittleBackgound"
|
||||||
android:scrollbars="none"
|
android:scrollbars="none"
|
||||||
android:padding="2dp"
|
android:padding="2dp"
|
||||||
android:layout_weight="1.0"
|
android:layout_weight="1.0"
|
||||||
@@ -128,7 +132,7 @@
|
|||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="#FF000000"
|
android:background="?attr/colorTextBackgound"
|
||||||
android:id="@+id/viewlogScrollViewLog">
|
android:id="@+id/viewlogScrollViewLog">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@@ -136,7 +140,7 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:textSize="@dimen/log_text_size"
|
android:textSize="@dimen/log_text_size"
|
||||||
android:text="Text"
|
android:text="Text"
|
||||||
android:textColor="#FF00FF00"
|
android:textColor="?attr/debugTextColor"
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
android:id="@+id/viewlogTextViewLog"/>
|
android:id="@+id/viewlogTextViewLog"/>
|
||||||
|
|
||||||
@@ -144,5 +148,4 @@
|
|||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
61
libappbase/src/main/res/values-night/attrs.xml
Normal file
61
libappbase/src/main/res/values-night/attrs.xml
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<!-- 全局主题属性 -->
|
||||||
|
<attr name="themeDebug" format="reference"/>
|
||||||
|
|
||||||
|
<!-- GlobalCrashActivity 样式属性 -->
|
||||||
|
<declare-styleable name="GlobalCrashActivity">
|
||||||
|
<attr name="colorTittle" format="color" />
|
||||||
|
<attr name="colorTittleBackgound" format="color" />
|
||||||
|
<attr name="colorText" format="color" />
|
||||||
|
<attr name="colorTextBackgound" format="color" />
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<!-- AboutView 样式属性 -->
|
||||||
|
<declare-styleable name="AboutViewStyle">
|
||||||
|
<attr name="aboutViewBackgroundColor" format="color" />
|
||||||
|
<attr name="aboutViewTextColor" format="color" />
|
||||||
|
<attr name="aboutViewTitleColor" format="color" />
|
||||||
|
<attr name="aboutViewDividerColor" format="color" />
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<!-- ButtonStyle 样式属性 -->
|
||||||
|
<declare-styleable name="ButtonStyle">
|
||||||
|
<attr name="buttonBackgroundColor" format="color" />
|
||||||
|
<attr name="buttonTextColor" format="color" />
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<!-- DialogStyle 样式属性 -->
|
||||||
|
<declare-styleable name="DialogStyle">
|
||||||
|
<attr name="dialogBackgroundColor" format="color" />
|
||||||
|
<attr name="dialogTextColor" format="color" />
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<!-- 窗体/控件通用背景色属性 -->
|
||||||
|
<attr name="toolbarBackgroundColor" format="color"/>
|
||||||
|
<attr name="textViewBackgroundColor" format="color"/>
|
||||||
|
<attr name="editTextBackgroundColor" format="color"/>
|
||||||
|
<attr name="scrollViewBackgroundColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- 窗体/控件通用文字色属性 -->
|
||||||
|
<attr name="toolbarTextColor" format="color"/>
|
||||||
|
<attr name="textViewTextColor" format="color"/>
|
||||||
|
<attr name="editTextTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- ActivityStyle 样式属性 -->
|
||||||
|
<attr name="activityBackgroundColor" format="color"/>
|
||||||
|
<attr name="activityTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- MainWindowStyle 主窗口样式属性 -->
|
||||||
|
<attr name="mainWindowBackgroundColor" format="color"/>
|
||||||
|
<attr name="mainWindowTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- MainWindowDarkStyle 深色模式主窗口样式属性 -->
|
||||||
|
<attr name="mainWindowDarkBackgroundColor" format="color"/>
|
||||||
|
<attr name="mainWindowDarkTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- DebugLogStyle 应用调试日志样式属性 -->
|
||||||
|
<attr name="debugTextColor" format="color"/>
|
||||||
|
|
||||||
|
</resources>
|
||||||
69
libappbase/src/main/res/values-night/colors.xml
Normal file
69
libappbase/src/main/res/values-night/colors.xml
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#FF1E3A5F</color>
|
||||||
|
<color name="colorPrimaryDark">#FF15253D</color>
|
||||||
|
<color name="colorAccent">#FF4DA6FF</color>
|
||||||
|
<color name="colorText">#FFE0E0E0</color>
|
||||||
|
<color name="colorTextBackgound">#FF0D1B2A</color>
|
||||||
|
|
||||||
|
<!-- ============== 基础黑白(必含,适配文字/背景) ============== -->
|
||||||
|
<color name="white">#FFFFFF</color>
|
||||||
|
<color name="black">#000000</color>
|
||||||
|
|
||||||
|
<!-- ============== 基础色系(按钮/强调色常用) ============== -->
|
||||||
|
<color name="blue_light">#4A90E2</color>
|
||||||
|
<color name="blue_normal">#2196F3</color>
|
||||||
|
<color name="blue_dark">#1976D2</color>
|
||||||
|
<color name="green_light">#66BB6A</color>
|
||||||
|
<color name="green_normal">#4CAF50</color>
|
||||||
|
<color name="green_dark">#388E3C</color>
|
||||||
|
<color name="red_light">#EF5350</color>
|
||||||
|
<color name="red_normal">#F44336</color>
|
||||||
|
<color name="red_dark">#D32F2F</color>
|
||||||
|
<color name="yellow_light">#FFF59D</color>
|
||||||
|
<color name="yellow_normal">#FFC107</color>
|
||||||
|
<color name="yellow_dark">#FFA000</color>
|
||||||
|
<color name="orange_normal">#FF9800</color>
|
||||||
|
<color name="purple_normal">#9C27B0</color>
|
||||||
|
|
||||||
|
<!-- ============== 透明色(遮罩/背景叠加) ============== -->
|
||||||
|
<color name="transparent">#00000000</color>
|
||||||
|
<color name="black_transparent_50">#80000000</color>
|
||||||
|
|
||||||
|
<!-- ============== 不透明灰色(常用深浅梯度) ============== -->
|
||||||
|
<color name="gray_100">#1A1A1A</color>
|
||||||
|
<color name="gray_200">#262626</color>
|
||||||
|
<color name="gray_300">#333333</color>
|
||||||
|
<color name="gray_400">#4D4D4D</color>
|
||||||
|
<color name="gray_500">#666666</color>
|
||||||
|
<color name="gray_600">#808080</color>
|
||||||
|
<color name="gray_700">#999999</color>
|
||||||
|
<color name="gray_800">#B3B3B3</color>
|
||||||
|
<color name="gray_900">#CCCCCC</color>
|
||||||
|
|
||||||
|
<!-- ============== 半透明灰色 ============== -->
|
||||||
|
<color name="gray_transparent_30">#4D333333</color>
|
||||||
|
<color name="gray_transparent_50">#80333333</color>
|
||||||
|
<color name="gray_transparent_70">#B3333333</color>
|
||||||
|
|
||||||
|
<color name="gray_light">#333333</color>
|
||||||
|
<color name="gray_mid">#666666</color>
|
||||||
|
<color name="gray_dark">#999999</color>
|
||||||
|
<color name="gray_black">#CCCCCC</color>
|
||||||
|
|
||||||
|
<!-- ============== 遮罩/蒙层 ============== -->
|
||||||
|
<color name="mask_gray">#804D4D4D</color>
|
||||||
|
<color name="bg_overlay_gray">#4D1A1A1A</color>
|
||||||
|
|
||||||
|
<!-- ============== 按钮灰色 ============== -->
|
||||||
|
<color name="btn_gray_normal">#666666</color>
|
||||||
|
<color name="btn_gray_pressed">#4D4D4D</color>
|
||||||
|
<color name="btn_gray_disabled">#333333</color>
|
||||||
|
|
||||||
|
<!-- ============== 主题颜色 ============== -->
|
||||||
|
<color name="mainWindowBackgroundColor">#FF0D1B2A</color>
|
||||||
|
<color name="mainWindowTextColor">#FFE0E0E0</color>
|
||||||
|
<color name="buttonBackgroundColor">#FF1E3A5F</color>
|
||||||
|
<color name="debugTextColor">#FF00FF00</color>
|
||||||
|
|
||||||
|
</resources>
|
||||||
46
libappbase/src/main/res/values-night/styles.xml
Normal file
46
libappbase/src/main/res/values-night/styles.xml
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<!-- APPBaseTheme 深色模式主题 -->
|
||||||
|
<style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
|
||||||
|
<item name="themeDebug">@style/DebugActivityTheme</item>
|
||||||
|
<item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
<item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="aboutViewTitleColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="aboutViewDividerColor">?attr/mainWindowTextColor</item>
|
||||||
|
<item name="buttonBackgroundColor">@color/buttonBackgroundColor</item>
|
||||||
|
<item name="buttonTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
<item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="toolbarBackgroundColor">?attr/buttonBackgroundColor</item>
|
||||||
|
<item name="toolbarTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
<item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="editTextBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
<item name="editTextTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="scrollViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
<item name="activityBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
<item name="activityTextColor">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||||
|
<item name="mainWindowTextColor">@color/mainWindowTextColor</item>
|
||||||
|
<item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||||
|
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<!-- DebugActivityTheme 深色模式样式 -->
|
||||||
|
<style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
|
||||||
|
<item name="android:statusBarColor">@color/mainWindowBackgroundColor</item>
|
||||||
|
<item name="colorTittle">?attr/mainWindowDarkTextColor</item>
|
||||||
|
<item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
|
||||||
|
<item name="colorText">?attr/debugTextColor</item>
|
||||||
|
<item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
|
||||||
|
<item name="debugTextColor">@color/debugTextColor</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<!-- DialogStyle 对话框样式 -->
|
||||||
|
<style name="DialogStyle" parent="@android:style/Theme.Dialog">
|
||||||
|
<item name="android:windowBackground">@android:color/transparent</item>
|
||||||
|
<item name="android:windowNoTitle">true</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@@ -1,13 +1,67 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<attr name="themeGlobalCrashActivity" format="reference"/>
|
<!-- 全局主题属性 -->
|
||||||
|
<attr name="themeDebug" format="reference"/>
|
||||||
|
|
||||||
<declare-styleable name="GlobalCrashActivity">
|
<!-- AboutView 样式属性 -->
|
||||||
<attr name="colorTittle" format="color" />
|
<declare-styleable name="AboutView">
|
||||||
<attr name="colorTittleBackgound" format="color" />
|
<attr name="app_name" format="string" />
|
||||||
<attr name="colorText" format="color" />
|
<attr name="app_apkfoldername" format="string" />
|
||||||
<attr name="colorTextBackgound" format="color" />
|
<attr name="app_apkname" format="string" />
|
||||||
|
<attr name="app_gitname" format="string" />
|
||||||
|
<attr name="app_gitowner" format="string" />
|
||||||
|
<attr name="app_gitappbranch" format="string" />
|
||||||
|
<attr name="app_gitappsubprojectfolder" format="string" />
|
||||||
|
<attr name="appdescription" format="string" />
|
||||||
|
<attr name="appicon" format="reference" />
|
||||||
|
<attr name="is_adddebugtools" format="boolean" />
|
||||||
</declare-styleable>
|
</declare-styleable>
|
||||||
|
|
||||||
</resources>
|
<!-- AboutViewStyle 样式属性 -->
|
||||||
|
<declare-styleable name="AboutViewStyle">
|
||||||
|
<attr name="aboutViewBackgroundColor" format="color" />
|
||||||
|
<attr name="aboutViewTextColor" format="color" />
|
||||||
|
<attr name="aboutViewTitleColor" format="color" />
|
||||||
|
<attr name="aboutViewDividerColor" format="color" />
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<!-- ButtonStyle 样式属性 -->
|
||||||
|
<declare-styleable name="ButtonStyle">
|
||||||
|
<attr name="buttonBackgroundColor" format="color" />
|
||||||
|
<attr name="buttonTextColor" format="color" />
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<!-- DialogStyle 样式属性 -->
|
||||||
|
<declare-styleable name="DialogStyle">
|
||||||
|
<attr name="dialogBackgroundColor" format="color" />
|
||||||
|
<attr name="dialogTextColor" format="color" />
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<!-- 窗体/控件通用背景色属性 -->
|
||||||
|
<attr name="toolbarBackgroundColor" format="color"/>
|
||||||
|
<attr name="textViewBackgroundColor" format="color"/>
|
||||||
|
<attr name="editTextBackgroundColor" format="color"/>
|
||||||
|
<attr name="scrollViewBackgroundColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- 窗体/控件通用文字色属性 -->
|
||||||
|
<attr name="toolbarTextColor" format="color"/>
|
||||||
|
<attr name="textViewTextColor" format="color"/>
|
||||||
|
<attr name="editTextTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- ActivityStyle 样式属性 -->
|
||||||
|
<attr name="activityBackgroundColor" format="color"/>
|
||||||
|
<attr name="activityTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- MainWindowStyle 主窗口样式属性 -->
|
||||||
|
<attr name="mainWindowBackgroundColor" format="color"/>
|
||||||
|
<attr name="mainWindowTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- MainWindowDarkStyle 深色模式主窗口样式属性 -->
|
||||||
|
<attr name="mainWindowDarkBackgroundColor" format="color"/>
|
||||||
|
<attr name="mainWindowDarkTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- DebugLogStyle 应用调试日志样式属性 -->
|
||||||
|
<attr name="debugTextColor" format="color"/>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@@ -1,74 +1,69 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<color name="colorPrimary">#FF00B322</color>
|
<color name="colorPrimary">#FF00B322</color>
|
||||||
<color name="colorPrimaryDark">#FF005C12</color>
|
<color name="colorPrimaryDark">#FF008F1A</color>
|
||||||
<color name="colorAccent">#FF8DFFA2</color>
|
<color name="colorAccent">#FF8DFFA2</color>
|
||||||
<color name="colorText">#FFFFFB8D</color>
|
<color name="colorText">#FF000000</color>
|
||||||
<color name="colorTextBackgound">#FF000000</color>
|
<color name="colorTextBackgound">#FFF5F5F5</color>
|
||||||
|
|
||||||
<!-- ============== 基础黑白(必含,适配文字/背景) ============== -->
|
<!-- ============== 基础黑白(必含,适配文字/背景) ============== -->
|
||||||
<color name="white">#FFFFFF</color> <!-- 纯白色(文字/背景) -->
|
<color name="white">#FFFFFF</color>
|
||||||
<color name="black">#000000</color> <!-- 近黑色(重要文字) -->
|
<color name="black">#000000</color>
|
||||||
|
|
||||||
<!-- ============== 基础色系(按钮/强调色常用) ============== -->
|
<!-- ============== 基础色系(按钮/强调色常用) ============== -->
|
||||||
<!-- 蓝色系(常用:确认/链接/主题色) -->
|
<color name="blue_light">#4A90E2</color>
|
||||||
<color name="blue_light">#4A90E2</color> <!-- 浅蓝(次要按钮) -->
|
<color name="blue_normal">#2196F3</color>
|
||||||
<color name="blue_normal">#2196F3</color> <!-- 标准蓝(主题/确认按钮) -->
|
<color name="blue_dark">#1976D2</color>
|
||||||
<color name="blue_dark">#1976D2</color> <!-- 深蓝(按压态/重要强调) -->
|
<color name="green_light">#66BB6A</color>
|
||||||
<!-- 绿色系(常用:成功/完成/安全提示) -->
|
<color name="green_normal">#4CAF50</color>
|
||||||
<color name="green_light">#66BB6A</color> <!-- 浅绿(次要成功态) -->
|
<color name="green_dark">#388E3C</color>
|
||||||
<color name="green_normal">#4CAF50</color> <!-- 标准绿(成功按钮/提示) -->
|
<color name="red_light">#EF5350</color>
|
||||||
<color name="green_dark">#388E3C</color> <!-- 深绿(按压态/重要成功) -->
|
<color name="red_normal">#F44336</color>
|
||||||
<!-- 红色系(常用:错误/警告/删除按钮) -->
|
<color name="red_dark">#D32F2F</color>
|
||||||
<color name="red_light">#EF5350</color> <!-- 浅红(次要错误提示) -->
|
<color name="yellow_light">#FFF59D</color>
|
||||||
<color name="red_normal">#F44336</color> <!-- 标准红(删除/错误按钮) -->
|
<color name="yellow_normal">#FFC107</color>
|
||||||
<color name="red_dark">#D32F2F</color> <!-- 深红(按压态/重要错误) -->
|
<color name="yellow_dark">#FFA000</color>
|
||||||
<!-- 黄色系(常用:警告/提醒/高亮) -->
|
<color name="orange_normal">#FF9800</color>
|
||||||
<color name="yellow_light">#FFF59D</color> <!-- 浅黄(次要提醒) -->
|
<color name="purple_normal">#9C27B0</color>
|
||||||
<color name="yellow_normal">#FFC107</color> <!-- 标准黄(警告提示/高亮) -->
|
|
||||||
<color name="yellow_dark">#FFA000</color> <!-- 深黄(重要警告) -->
|
|
||||||
<!-- 橙色系(常用:提醒/进度/活力色) -->
|
|
||||||
<color name="orange_normal">#FF9800</color> <!-- 标准橙(提醒按钮/进度) -->
|
|
||||||
<!-- 紫色系(常用:特殊强调/个性按钮) -->
|
|
||||||
<color name="purple_normal">#9C27B0</color> <!-- 标准紫(特殊功能按钮) -->
|
|
||||||
|
|
||||||
<!-- ============== 透明色(遮罩/背景叠加) ============== -->
|
<!-- ============== 透明色(遮罩/背景叠加) ============== -->
|
||||||
<color name="transparent">#00000000</color> <!-- 全透明 -->
|
<color name="transparent">#00000000</color>
|
||||||
<color name="black_transparent_50">#80000000</color> <!-- 50%透明黑(遮罩) -->
|
<color name="black_transparent_50">#80000000</color>
|
||||||
|
|
||||||
|
<!-- ============== 不透明灰色(常用深浅梯度) ============== -->
|
||||||
|
<color name="gray_100">#F5F5F5</color>
|
||||||
|
<color name="gray_200">#EEEEEE</color>
|
||||||
|
<color name="gray_300">#E0E0E0</color>
|
||||||
|
<color name="gray_400">#BDBDBD</color>
|
||||||
|
<color name="gray_500">#9E9E9E</color>
|
||||||
|
<color name="gray_600">#757575</color>
|
||||||
|
<color name="gray_700">#616161</color>
|
||||||
|
<color name="gray_800">#424242</color>
|
||||||
|
<color name="gray_900">#212121</color>
|
||||||
|
|
||||||
|
<!-- ============== 半透明灰色 ============== -->
|
||||||
|
<color name="gray_transparent_30">#4D9E9E9E</color>
|
||||||
|
<color name="gray_transparent_50">#809E9E9E</color>
|
||||||
|
<color name="gray_transparent_70">#B39E9E9E</color>
|
||||||
|
|
||||||
<!-- 1. 不透明灰色(常用深浅梯度,直接用) -->
|
<color name="gray_light">#EEE</color>
|
||||||
<color name="gray_100">#F5F5F5</color> <!-- 极浅灰(接近白色,背景用) -->
|
<color name="gray_mid">#999</color>
|
||||||
<color name="gray_200">#EEEEEE</color> <!-- 浅灰(卡片/分割线背景) -->
|
<color name="gray_dark">#666</color>
|
||||||
<color name="gray_300">#E0E0E0</color> <!-- 中浅灰(边框/次要背景) -->
|
<color name="gray_black">#333</color>
|
||||||
<color name="gray_400">#BDBDBD</color> <!-- 中灰(次要文字/图标) -->
|
|
||||||
<color name="gray_500">#9E9E9E</color> <!-- 标准中灰(常用辅助文字) -->
|
|
||||||
<color name="gray_600">#757575</color> <!-- 中深灰(常规辅助文字) -->
|
|
||||||
<color name="gray_700">#616161</color> <!-- 深灰(重要辅助文字) -->
|
|
||||||
<color name="gray_800">#424242</color> <!-- 极深灰(接近黑色,标题副文本) -->
|
|
||||||
<color name="gray_900">#212121</color> <!-- 近黑色(特殊场景用) -->
|
|
||||||
|
|
||||||
<!-- 2. 半透明灰色(带透明度,遮罩/蒙层用) -->
|
<!-- ============== 遮罩/蒙层 ============== -->
|
||||||
<color name="gray_transparent_30">#4D9E9E9E</color> <!-- 30%透明中灰(A=4D) -->
|
|
||||||
<color name="gray_transparent_50">#809E9E9E</color> <!-- 50%透明中灰(A=80) -->
|
|
||||||
<color name="gray_transparent_70">#B39E9E9E</color> <!-- 70%透明中灰(A=B3) -->
|
|
||||||
|
|
||||||
<color name="gray_light">#EEE</color> <!-- 等价 #EEEEEE(浅灰) -->
|
|
||||||
<color name="gray_mid">#999</color> <!-- 等价 #999999(中灰) -->
|
|
||||||
<color name="gray_dark">#666</color> <!-- 等价 #666666(深灰) -->
|
|
||||||
<color name="gray_black">#333</color> <!-- 等价 #333333(极深灰) -->
|
|
||||||
|
|
||||||
<!-- 50% 透明中灰(弹窗遮罩常用) -->
|
|
||||||
<color name="mask_gray">#809E9E9E</color>
|
<color name="mask_gray">#809E9E9E</color>
|
||||||
<!-- 30% 透明深灰(背景叠加) -->
|
|
||||||
<color name="bg_overlay_gray">#4D424242</color>
|
<color name="bg_overlay_gray">#4D424242</color>
|
||||||
|
|
||||||
<!-- 1. 常规灰色(按钮默认态,常用中灰) -->
|
<!-- ============== 按钮灰色 ============== -->
|
||||||
<color name="btn_gray_normal">#9E9E9E</color>
|
<color name="btn_gray_normal">#9E9E9E</color>
|
||||||
<!-- 2. 按压深色(按钮点击态,加深一级,提升交互感) -->
|
|
||||||
<color name="btn_gray_pressed">#757575</color>
|
<color name="btn_gray_pressed">#757575</color>
|
||||||
<!-- 3. 禁用灰色(按钮不可点击态,浅灰) -->
|
|
||||||
<color name="btn_gray_disabled">#E0E0E0</color>
|
<color name="btn_gray_disabled">#E0E0E0</color>
|
||||||
|
|
||||||
</resources>
|
<!-- ============== 主题颜色 ============== -->
|
||||||
|
<color name="mainWindowBackgroundColor">#FFF5F5F5</color>
|
||||||
|
<color name="mainWindowTextColor">#FF000000</color>
|
||||||
|
<color name="buttonBackgroundColor">#FF00B322</color>
|
||||||
|
<color name="debugTextColor">#FF808080</color>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@@ -3,4 +3,6 @@
|
|||||||
|
|
||||||
<string name="lib_name">libappbase</string>
|
<string name="lib_name">libappbase</string>
|
||||||
<string name="hello_world">Hello, world!</string>
|
<string name="hello_world">Hello, world!</string>
|
||||||
|
<string name="shared_user_id">cc.winboll.studio</string>
|
||||||
|
<string name="shared_user_label">studio@winboll.cc</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1,20 +1,46 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
|
<!-- APPBaseTheme 普通模式主题 -->
|
||||||
<style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
<style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
||||||
<item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
|
<item name="themeDebug">@style/DebugActivityTheme</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>
|
||||||
|
<item name="buttonBackgroundColor">@color/buttonBackgroundColor</item>
|
||||||
|
<item name="buttonTextColor">?attr/mainWindowTextColor</item>
|
||||||
|
<item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||||
|
<item name="dialogTextColor">?attr/mainWindowTextColor</item>
|
||||||
|
<item name="toolbarBackgroundColor">?attr/buttonBackgroundColor</item>
|
||||||
|
<item name="toolbarTextColor">?attr/mainWindowTextColor</item>
|
||||||
|
<item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||||
|
<item name="textViewTextColor">?attr/mainWindowTextColor</item>
|
||||||
|
<item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||||
|
<item name="editTextTextColor">?attr/mainWindowTextColor</item>
|
||||||
|
<item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||||
|
<item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||||
|
<item name="activityTextColor">?attr/mainWindowTextColor</item>
|
||||||
|
<item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||||
|
<item name="mainWindowTextColor">@color/mainWindowTextColor</item>
|
||||||
|
<item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||||
|
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
<!-- DebugActivityTheme 普通模式样式 -->
|
||||||
<item name="colorTittle">#FFFFF600</item>
|
<style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
||||||
<item name="colorTittleBackgound">#FF00B322</item>
|
<item name="android:statusBarColor">@color/buttonBackgroundColor</item>
|
||||||
<item name="colorText">#FF00B322</item>
|
<item name="colorTittle">?attr/mainWindowTextColor</item>
|
||||||
<item name="colorTextBackgound">#FF000000</item>
|
<item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
|
||||||
|
<item name="colorText">?attr/debugTextColor</item>
|
||||||
|
<item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
|
||||||
|
<item name="debugTextColor">@color/debugTextColor</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<!-- DialogStyle 对话框样式 -->
|
||||||
<style name="DialogStyle" parent="@android:style/Theme.Dialog">
|
<style name="DialogStyle" parent="@android:style/Theme.Dialog">
|
||||||
<item name="android:windowBackground">@android:color/transparent</item>
|
<item name="android:windowBackground">@android:color/transparent</item>
|
||||||
<item name="android:windowNoTitle">true</item>
|
<item name="android:windowNoTitle">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
Reference in New Issue
Block a user