mirror of
http://gitea.winboll.cc/Studio/WinBoLL.git
synced 2026-06-29 20:12:23 +08:00
Compare commits
67 Commits
aes-v15.20
...
aes-v15.20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ed6dbe6c2 | ||
| 77c6776cf8 | |||
|
|
f134b7c746 | ||
|
|
795593b3bf | ||
|
|
cda173fa9e | ||
|
|
fe57aee469 | ||
| 3fc0883e0e | |||
| b162eb1a4e | |||
|
|
fdd8b64718 | ||
|
|
8d4fd95ff2 | ||
| 3b31a6a155 | |||
|
|
9eb873332c | ||
|
|
1b07a72236 | ||
| 8328e44b86 | |||
| 981a8dd8cd | |||
| 6bc3cbe446 | |||
| 79e42e72af | |||
| b59076d470 | |||
|
|
9e9486b488 | ||
|
|
4b8967b253 | ||
| 30fbf4f97e | |||
|
|
b1059c3f46 | ||
| bc882c5f80 | |||
| 8ae36effdd | |||
| 0cc9b0871e | |||
| d13c44c666 | |||
| f786d06682 | |||
| 168d2e2d60 | |||
| f303a77e28 | |||
|
|
f3d723fbee | ||
| 04b5d062aa | |||
| fce2bf2fb1 | |||
|
|
e3c30ea9a3 | ||
| 48a592cbd2 | |||
| 5fcf0de951 | |||
| f027158d07 | |||
|
|
ab4cef21f0 | ||
| 2754a2ad7c | |||
| 852f3d6cd8 | |||
| c2cff1a2bb | |||
| 98dd2a60b8 | |||
| 25e966099f | |||
| 8876896cbc | |||
| 28e6a8ee78 | |||
| 0a69b54dd0 | |||
| e87513b179 | |||
| 186b1656a7 | |||
| 7d872fd14c | |||
| 4ce22e8750 | |||
| d6fab2133f | |||
| 45821b8daa | |||
| 5c8505dcbd | |||
| 9c3963822e | |||
| 30532f8e8d | |||
| 2b98149e0f | |||
| 80d9b764ee | |||
| d4f24a9b0c | |||
| f357e353ee | |||
| edd312a525 | |||
| aec680e36e | |||
| 937f90aa07 | |||
| 643e91bd71 | |||
| 1c6f7783e5 | |||
| f4c6cea623 | |||
| a0309ce98a | |||
|
|
193011a80d | ||
| 931671d85a |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -97,5 +97,5 @@ lint-results.html
|
||||
## WinBoLL 基础应用(避免上传敏感配置)
|
||||
/winboll.properties
|
||||
/local.properties
|
||||
/settings.gradle
|
||||
/gradle.properties
|
||||
#/settings.gradle
|
||||
#/gradle.properties
|
||||
|
||||
@@ -20,7 +20,7 @@ WinBoLL AndroidX 可视化元素类库。
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
|
||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
|
||||
@@ -26,7 +26,10 @@ android {
|
||||
applicationId "cc.winboll.studio.aes"
|
||||
minSdkVersion 26
|
||||
targetSdkVersion 30
|
||||
versionCode 1
|
||||
//1. Android 官方规则
|
||||
//- versionCode 类型:int 整型
|
||||
//- Java int 最大值:2147483647
|
||||
versionCode 1520000
|
||||
// versionName 更新后需要手动设置
|
||||
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sun May 17 20:53:39 HKT 2026
|
||||
stageCount=5
|
||||
#Wed Jun 03 20:29:39 HKT 2026
|
||||
stageCount=16
|
||||
libraryProject=libaes
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.4
|
||||
publishVersion=15.20.15
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.5
|
||||
baseBetaVersion=15.20.16
|
||||
|
||||
@@ -5,10 +5,14 @@ package cc.winboll.studio.aes;
|
||||
* @Date 2024/06/13 19:03:58
|
||||
* @Describe AES应用类
|
||||
*/
|
||||
import android.view.Gravity;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||
import cc.winboll.studio.libappbase.CrashActivity;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
import cc.winboll.studio.libappbase.ToastUtils;
|
||||
import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
|
||||
|
||||
public class App extends GlobalApplication {
|
||||
@@ -17,13 +21,25 @@ public class App extends GlobalApplication {
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
setIsDebugging(BuildConfig.DEBUG);
|
||||
//setIsDebugging(false);
|
||||
WinBoLLActivityManager.init(this);
|
||||
try {
|
||||
super.onCreate();
|
||||
ToastUtils.init(this);
|
||||
WinBoLLActivityManager.init(this);
|
||||
AESThemeUtil.init(null);
|
||||
} catch (Throwable e) {
|
||||
StringWriter sw = new StringWriter();
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
e.printStackTrace(pw);
|
||||
pw.close();
|
||||
String stackTraceStr = sw.toString();
|
||||
CrashHandleNotifyUtils.handleUncaughtException(
|
||||
this,
|
||||
getPackageName(),
|
||||
stackTraceStr,
|
||||
CrashActivity.class
|
||||
);
|
||||
}
|
||||
|
||||
// 初始化 Toast 框架
|
||||
ToastUtils.init(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -84,11 +84,12 @@ public class MainActivity extends DrawerFragmentActivity {
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
super.onCreateOptionsMenu(menu);
|
||||
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
||||
// if(App.isDebugging()) {
|
||||
// getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu);
|
||||
// }
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -20,7 +20,7 @@ WinBoLL 安卓手机端安卓应用开发基础类库。
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
|
||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
|
||||
@@ -26,7 +26,10 @@ android {
|
||||
applicationId "cc.winboll.studio.appbase"
|
||||
minSdkVersion 26
|
||||
targetSdkVersion 30
|
||||
versionCode 1
|
||||
//1. Android 官方规则
|
||||
//- versionCode 类型:int 整型
|
||||
//- Java int 最大值:2147483647
|
||||
versionCode 1520000
|
||||
// versionName 更新后需要手动设置
|
||||
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sun May 17 16:16:36 HKT 2026
|
||||
stageCount=16
|
||||
#Wed May 27 14:51:29 HKT 2026
|
||||
stageCount=23
|
||||
libraryProject=libappbase
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.15
|
||||
publishVersion=15.20.22
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.16
|
||||
baseBetaVersion=15.20.23
|
||||
|
||||
@@ -37,7 +37,7 @@ public class AboutActivity extends Activity {
|
||||
appInfo.setAppName("APPBase");
|
||||
appInfo.setAppIcon(R.drawable.ic_winboll);
|
||||
appInfo.setAppDescription(getString(R.string.app_description));
|
||||
appInfo.setAppGitName("WinBoLL");
|
||||
appInfo.setAppGitName("APPBase");
|
||||
appInfo.setAppGitOwner("Studio");
|
||||
appInfo.setAppGitAPPBranch(branchName);
|
||||
appInfo.setAppGitAPPSubProjectFolder(branchName);
|
||||
|
||||
@@ -22,12 +22,6 @@ public class App extends GlobalApplication {
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
// 如果应用不在调试状态,就根据编译类型设置调试状态
|
||||
if (isDebugging() != true) {
|
||||
setIsDebugging(BuildConfig.DEBUG);
|
||||
}
|
||||
// release 版调试码
|
||||
//setIsDebugging(!BuildConfig.DEBUG);
|
||||
|
||||
// 初始化 Toast 工具类(传入应用全局上下文,确保 Toast 可在任意地方调用)
|
||||
ToastUtils.init(getApplicationContext());
|
||||
|
||||
@@ -2,8 +2,8 @@ package cc.winboll.studio.appbase.model;
|
||||
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
|
||||
21
gradle.properties
Normal file
21
gradle.properties
Normal file
@@ -0,0 +1,21 @@
|
||||
# Project-wide Gradle settings.
|
||||
# IDE (e.g. Android Studio) users:
|
||||
# Gradle settings configured through the IDE *will override*
|
||||
# any settings specified in this file.
|
||||
# For more details on how to configure your build environment visit
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
org.gradle.jvmargs=-Xmx2048m
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
# org.gradle.parallel=true
|
||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||
# Android operating system, and which are packaged with your app"s APK
|
||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||
android.useAndroidX=true
|
||||
# Automatically convert third-party libraries to use AndroidX
|
||||
android.enableJetifier=true
|
||||
# 保持与旧版Gradle插件的兼容
|
||||
android.disableAutomaticComponentCreation=true
|
||||
@@ -66,9 +66,9 @@ dependencies {
|
||||
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||
|
||||
// WinBoLL库 nexus.winboll.cc 地址
|
||||
api 'cc.winboll.studio:libappbase:15.20.9'
|
||||
api 'cc.winboll.studio:libappbase:15.20.26'
|
||||
// 备用库 jitpack.io 地址
|
||||
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
|
||||
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.26'
|
||||
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sun May 17 20:53:39 HKT 2026
|
||||
stageCount=5
|
||||
#Wed Jun 03 20:29:39 HKT 2026
|
||||
stageCount=16
|
||||
libraryProject=libaes
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.4
|
||||
publishVersion=15.20.15
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.5
|
||||
baseBetaVersion=15.20.16
|
||||
|
||||
@@ -15,6 +15,7 @@ import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
|
||||
import androidx.appcompat.app.ActionBarDrawerToggle;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
@@ -22,8 +23,10 @@ import androidx.drawerlayout.widget.DrawerLayout;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
|
||||
import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||
import cc.winboll.studio.libaes.models.AESThemeBean;
|
||||
import cc.winboll.studio.libaes.models.DrawerMenuBean;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
@@ -34,8 +37,8 @@ import cc.winboll.studio.libaes.views.ADsBannerView;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import com.baoyz.widget.PullRefreshLayout;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||
|
||||
public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
|
||||
|
||||
@@ -44,7 +47,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
|
||||
static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
|
||||
|
||||
//protected Context mContext;
|
||||
ActivityType mActivityType;
|
||||
ActionBarDrawerToggle mActionBarDrawerToggle;
|
||||
DrawerLayout mDrawerLayout;
|
||||
@@ -59,13 +61,14 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
public enum ActivityType { Main, Secondary }
|
||||
protected volatile AESThemeBean.ThemeType mThemeType;
|
||||
protected ArrayList<DrawerMenuBean> malDrawerMenuItem;
|
||||
|
||||
abstract protected ActivityType initActivityType();
|
||||
//abstract protected View initContentView(LayoutInflater inflater, ViewGroup rootView);
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
// 替换:使用工具类统一应用主题
|
||||
AESThemeUtil.applyAppCompatTheme(this);
|
||||
mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
super.onCreate(savedInstanceState);
|
||||
WinBoLLActivityManager.getInstance().add(this);
|
||||
mActivityType = initActivityType();
|
||||
@@ -78,53 +81,32 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTag() {
|
||||
return TAG;
|
||||
}
|
||||
@Override
|
||||
public String getTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
WinBoLLActivityManager.getInstance().registeRemove(this);
|
||||
WinBoLLActivityManager.getInstance().registeRemove(this);
|
||||
super.onDestroy();
|
||||
// 修复:释放广告资源,避免内存泄漏
|
||||
ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
if (adsBannerView != null) {
|
||||
adsBannerView.releaseAdResources();
|
||||
}
|
||||
// 修复:释放广告资源,避免内存泄漏
|
||||
ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
if (adsBannerView != null) {
|
||||
adsBannerView.releaseAdResources();
|
||||
}
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public Intent getIntent() {
|
||||
// TODO: Implement this method
|
||||
return super.getIntent();
|
||||
}
|
||||
|
||||
public Context getContext() {
|
||||
return this.mContext;
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public MenuInflater getMenuInflater() {
|
||||
// TODO: Implement this method
|
||||
return super.getMenuInflater();
|
||||
}
|
||||
|
||||
/*public void setSubtitle(CharSequence context) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setSubtitle(context);
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void recreate() {
|
||||
super.recreate();
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public boolean moveTaskToBack(boolean nonRoot) {
|
||||
return super.moveTaskToBack(nonRoot);
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void startActivity(Intent intent) {
|
||||
super.startActivity(intent);
|
||||
@@ -135,26 +117,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
super.startActivityForResult(intent, requestCode, options);
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public FragmentManager getSupportFragmentManager() {
|
||||
return super.getSupportFragmentManager();
|
||||
}
|
||||
|
||||
public void setSubtitle(int resId) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setSubtitle(resId);
|
||||
}
|
||||
|
||||
public void setTitle(CharSequence context) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setTitle(context);
|
||||
}
|
||||
|
||||
public void setTitle(int resId) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setTitle(resId);
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public SharedPreferences getSharedPreferences(String name, int mode) {
|
||||
return super.getSharedPreferences(name, mode);
|
||||
@@ -162,7 +124,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
|
||||
@Override
|
||||
public Context getApplicationContext() {
|
||||
// TODO: Implement this method
|
||||
return super.getApplicationContext();
|
||||
}
|
||||
|
||||
@@ -173,25 +134,27 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
if (AESThemeUtil.onAppThemeItemSelected(this, item)) {
|
||||
// 替换为 DrawerFragmentActivity 专属点击处理方法
|
||||
if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
|
||||
recreate();
|
||||
} if (DevelopUtils.onDevelopItemSelected(this, item)) {
|
||||
LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
|
||||
} else {
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
if (DevelopUtils.onDevelopItemSelected(this, item)) {
|
||||
LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
|
||||
} else {
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
||||
ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
if (adsBannerView != null) {
|
||||
adsBannerView.resumeADs(DrawerFragmentActivity.this);
|
||||
}
|
||||
ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
if (adsBannerView != null) {
|
||||
adsBannerView.resumeADs(DrawerFragmentActivity.this);
|
||||
}
|
||||
}
|
||||
|
||||
void initRootView() {
|
||||
@@ -213,14 +176,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
mPullRefreshLayout = findViewById(R.id.activitydrawerfragmentPullRefreshLayout1);
|
||||
|
||||
mPullRefreshLayout.setOnRefreshListener(new PullRefreshLayout.OnRefreshListener() {
|
||||
@Override
|
||||
public void onRefresh() {
|
||||
//LogUtils.d(TAG, "onRefresh");
|
||||
reinitDrawerMenuItemList(malDrawerMenuItem);
|
||||
mDrawerMenuDataAdapter.notifyDataSetChanged();
|
||||
mPullRefreshLayout.setRefreshing(false);
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void onRefresh() {
|
||||
reinitDrawerMenuItemList(malDrawerMenuItem);
|
||||
mDrawerMenuDataAdapter.notifyDataSetChanged();
|
||||
mPullRefreshLayout.setRefreshing(false);
|
||||
}
|
||||
});
|
||||
|
||||
malDrawerMenuItem = new ArrayList<DrawerMenuBean>();
|
||||
|
||||
@@ -236,68 +198,51 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
|
||||
mActionBarDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.lib_name, R.string.lib_name) {
|
||||
@Override
|
||||
public void onDrawerOpened(View drawerView) {//完全打开时触发
|
||||
public void onDrawerOpened(View drawerView) {
|
||||
super.onDrawerOpened(drawerView);
|
||||
mIsDrawerOpened = true;
|
||||
mIsDrawerOpening = false;
|
||||
//Toast.makeText(MainActivity.this,"onDrawerOpened",Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDrawerClosed(View drawerView) {//完全关闭时触发
|
||||
public void onDrawerClosed(View drawerView) {
|
||||
super.onDrawerClosed(drawerView);
|
||||
mIsDrawerOpened = false;
|
||||
mIsDrawerClosing = false;
|
||||
//Toast.makeText(MainActivity.this,"onDrawerClosed",Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
/**
|
||||
* 当抽屉被滑动的时候调用此方法
|
||||
* slideOffset表示 滑动的幅度(0-1)
|
||||
*/
|
||||
@Override
|
||||
public void onDrawerSlide(View drawerView, float slideOffset) {
|
||||
super.onDrawerSlide(drawerView, slideOffset);
|
||||
}
|
||||
|
||||
/**
|
||||
* 当抽屉滑动状态改变的时候被调用
|
||||
* 状态值是STATE_IDLE(闲置--0), STATE_DRAGGING(拖拽的--1), STATE_SETTLING(固定--2)中之一。
|
||||
*具体状态可以慢慢调试
|
||||
*/
|
||||
@Override
|
||||
public void onDrawerStateChanged(int newState) {
|
||||
super.onDrawerStateChanged(newState);
|
||||
}
|
||||
};
|
||||
|
||||
//设置显示旋转菜单
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
//通过下面这句实现toolbar和Drawer的联动:如果没有这行代码,箭头是不会随着侧滑菜单的开关而变换的(或者没有箭头),
|
||||
// 可以尝试一下,不影响正常侧滑
|
||||
mActionBarDrawerToggle.syncState();
|
||||
mDrawerLayout.setDrawerListener(mActionBarDrawerToggle);
|
||||
|
||||
//去掉侧滑的默认图标(动画箭头图标),也可以选择不去,
|
||||
//不去的话把这一行注释掉或者改成true,然后把toolbar.setNavigationIcon注释掉就行了
|
||||
//mActionBarDrawerToggle.setDrawerIndicatorEnabled(false);
|
||||
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (mIsDrawerOpened || mIsDrawerOpening) {
|
||||
mIsDrawerClosing = true;
|
||||
mIsDrawerOpening = false;
|
||||
mDrawerLayout.closeDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
if (!mIsDrawerOpened || mIsDrawerClosing) {
|
||||
mIsDrawerOpening = true;
|
||||
mIsDrawerClosing = false;
|
||||
mDrawerLayout.openDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (mIsDrawerOpened || mIsDrawerOpening) {
|
||||
mIsDrawerClosing = true;
|
||||
mIsDrawerOpening = false;
|
||||
mDrawerLayout.closeDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
if (!mIsDrawerOpened || mIsDrawerClosing) {
|
||||
mIsDrawerOpening = true;
|
||||
mIsDrawerClosing = false;
|
||||
mDrawerLayout.openDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
initDrawerMenuItemList(malDrawerMenuItem);
|
||||
}
|
||||
@@ -305,12 +250,11 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
void initSecondaryRootView() {
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
//LogUtils.d(TAG, "onClick " + Integer.toString(v.getId()));
|
||||
finish();
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public <T extends Fragment> int removeFragment(T fragment) {
|
||||
@@ -375,13 +319,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
if (mActivityType == ActivityType.Main) {
|
||||
// 主题菜单
|
||||
AESThemeUtil.inflateMenu(this, menu);
|
||||
// 调试工具菜单
|
||||
if (GlobalApplication.isDebugging()) {
|
||||
DevelopUtils.inflateMenu(this, menu);
|
||||
}
|
||||
// 应用信息菜单
|
||||
// 替换为兼容版菜单加载方法
|
||||
AESThemeUtil.inflateCompatThemeMenu(this, menu);
|
||||
// 调试工具菜单
|
||||
if (GlobalApplication.isDebugging()) {
|
||||
DevelopUtils.inflateMenu(this, menu);
|
||||
}
|
||||
// 应用信息菜单
|
||||
getMenuInflater().inflate(R.menu.toolbar_drawerbase, menu);
|
||||
}
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
@@ -392,3 +336,4 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
super.onActivityResult(who, targetFragment, requestCode);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,9 @@ package cc.winboll.studio.libaes.models;
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class AESThemeBean extends BaseBean {
|
||||
|
||||
@@ -41,13 +42,28 @@ public class AESThemeBean extends BaseBean {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void fillThemeStyleIDList(ArrayList<Integer> themeStyleIDList) {
|
||||
if (themeStyleIDList == null) {
|
||||
themeStyleIDList = new ArrayList<Integer>();
|
||||
|
||||
}
|
||||
themeStyleIDList.clear();
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.AESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.DepthAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.SkyAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.GoldenAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.BearingAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.MemorAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.TaoAESTheme);
|
||||
}
|
||||
|
||||
// 保存当前主题
|
||||
int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
|
||||
|
||||
|
||||
public AESThemeBean() {
|
||||
}
|
||||
|
||||
|
||||
public AESThemeBean(int currentThemeStyleID) {
|
||||
this.currentThemeStyleID = currentThemeStyleID;
|
||||
}
|
||||
@@ -59,7 +75,7 @@ public class AESThemeBean extends BaseBean {
|
||||
public int getCurrentThemeTypeID() {
|
||||
return this.currentThemeStyleID;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return AESThemeBean.class.getName();
|
||||
@@ -74,8 +90,7 @@ public class AESThemeBean extends BaseBean {
|
||||
|
||||
@Override
|
||||
public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
|
||||
if(super.initObjectsFromJsonReader(jsonReader, name)) { return true; }
|
||||
else{
|
||||
if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
|
||||
if (name.equals("currentThemeTypeID")) {
|
||||
setCurrentThemeTypeID(jsonReader.nextInt());
|
||||
} else {
|
||||
@@ -90,7 +105,7 @@ public class AESThemeBean extends BaseBean {
|
||||
jsonReader.beginObject();
|
||||
while (jsonReader.hasNext()) {
|
||||
String name = jsonReader.nextName();
|
||||
if(!initObjectsFromJsonReader(jsonReader, name)) {
|
||||
if (!initObjectsFromJsonReader(jsonReader, name)) {
|
||||
jsonReader.skipValue();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.libaes.models;
|
||||
import android.content.Context;
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
public class WinBoLLClientServiceBean extends BaseBean {
|
||||
|
||||
@@ -12,7 +12,6 @@ import androidx.appcompat.widget.Toolbar;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.views.ASupportToolbar;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
|
||||
public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity {
|
||||
@@ -28,11 +27,12 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
|
||||
public String getTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
LogUtils.d(TAG, "onCreate() start");
|
||||
AESThemeUtil.applyAppTheme(this);
|
||||
// 替换此处:原 applyAppTheme -> 新方法 applyAppCompatTheme
|
||||
AESThemeUtil.applyAppCompatTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_testasupporttoolbar);
|
||||
LogUtils.d(TAG, "setContentView() done");
|
||||
@@ -45,3 +45,4 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
|
||||
LogUtils.d(TAG, "onCreate() end");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,10 +14,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
public class TestAToolbarActivity extends Activity {
|
||||
|
||||
public static final String TAG = "TestAToolbarActivity";
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
AESThemeUtil.applyAppTheme(this);
|
||||
// 原生Activity 使用 applyTheme
|
||||
AESThemeUtil.applyTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_testatoolbar);
|
||||
Toolbar toolbar = findViewById(R.id.activitytestatoolbarAToolbar1);
|
||||
@@ -26,3 +27,4 @@ public class TestAToolbarActivity extends Activity {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -13,199 +13,159 @@ import androidx.appcompat.app.AppCompatActivity;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
|
||||
import cc.winboll.studio.libaes.models.AESThemeBean;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class AESThemeUtil {
|
||||
|
||||
public static final String TAG = "AESThemeUtil";
|
||||
private static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
|
||||
private static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
|
||||
|
||||
static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
|
||||
static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
|
||||
// 私有静态集合,外部不可直接修改
|
||||
private static ArrayList<Integer> themeStyleIDList = new ArrayList<>();
|
||||
|
||||
protected volatile AESThemeBean.ThemeType mThemeType;
|
||||
// 移除无用实例成员 mThemeType,工具类不保留实例字段
|
||||
|
||||
public static <T extends Context> int getThemeTypeID(T context) {
|
||||
AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
|
||||
return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
|
||||
/**
|
||||
* 初始化主题样式ID集合
|
||||
*/
|
||||
public static void init(ArrayList<Integer> themeStyleIDList) {
|
||||
|
||||
if (themeStyleIDList == null) {
|
||||
themeStyleIDList = new ArrayList<Integer>();
|
||||
AESThemeBean.fillThemeStyleIDList(themeStyleIDList);
|
||||
}
|
||||
AESThemeUtil.themeStyleIDList.clear();
|
||||
AESThemeUtil.themeStyleIDList.addAll(themeStyleIDList);
|
||||
}
|
||||
|
||||
public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
|
||||
AESThemeBean bean = new AESThemeBean(nThemeTypeID);
|
||||
/**
|
||||
* 获取当前主题样式ID
|
||||
*/
|
||||
public static int getThemeTypeID(Context context) {
|
||||
AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
|
||||
return bean == null ? getThemeStyleID(AESThemeBean.ThemeType.AES) : bean.getCurrentThemeTypeID();
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存主题样式ID
|
||||
*/
|
||||
public static void saveThemeStyleID(Context context, int themeTypeID) {
|
||||
AESThemeBean bean = new AESThemeBean(themeTypeID);
|
||||
AESThemeBean.saveBean(context, bean);
|
||||
}
|
||||
|
||||
public static <T extends Activity> void applyAppTheme(T activity) {
|
||||
// ====================== 应用主题 - 规范重载 ======================
|
||||
/**
|
||||
* 应用当前持久化主题(通用 Activity)
|
||||
*/
|
||||
public static void applyTheme(Activity activity) {
|
||||
activity.setTheme(getThemeTypeID(activity));
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> void applyAppCompatTheme(T activity) {
|
||||
/**
|
||||
* 应用指定主题(通用 Activity)
|
||||
*/
|
||||
public static void applyTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(getThemeStyleID(themeType));
|
||||
}
|
||||
|
||||
/**
|
||||
* 应用当前持久化主题(AppCompat 兼容 Activity)
|
||||
*/
|
||||
public static void applyAppCompatTheme(AppCompatActivity activity) {
|
||||
activity.setTheme(getThemeTypeID(activity));
|
||||
}
|
||||
|
||||
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(T activity) {
|
||||
activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
|
||||
}*/
|
||||
|
||||
public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
|
||||
/**
|
||||
* 应用指定主题(AppCompat 兼容 Activity)
|
||||
*/
|
||||
public static void applyAppCompatTheme(AppCompatActivity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(getThemeStyleID(themeType));
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> void applyAppCompatTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
|
||||
}
|
||||
|
||||
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
|
||||
}*/
|
||||
|
||||
public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
|
||||
// ====================== 加载菜单 ======================
|
||||
/**
|
||||
* 加载主题菜单(通用 Activity)
|
||||
*/
|
||||
public static void inflateThemeMenu(Activity activity, Menu menu) {
|
||||
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> void inflateCompatMenu(T activity, Menu menu) {
|
||||
/**
|
||||
* 加载主题菜单(AppCompat Activity)
|
||||
*/
|
||||
public static void inflateCompatThemeMenu(AppCompatActivity activity, Menu menu) {
|
||||
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
|
||||
}
|
||||
|
||||
/*public static <T extends WinBoLLActivity> void inflateWinBoLLMenu(T activity, Menu menu) {
|
||||
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
|
||||
}*/
|
||||
|
||||
public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
// ====================== 菜单点击统一核心逻辑(消除重复代码) ======================
|
||||
/**
|
||||
* 主题菜单项点击统一处理
|
||||
* @param context 上下文(用于持久化)
|
||||
* @param item 点击的菜单项
|
||||
* @return 是否消费点击事件
|
||||
*/
|
||||
public static boolean handleThemeMenuClick(Context context, MenuItem item) {
|
||||
int themeStyleId;
|
||||
int itemId = item.getItemId();
|
||||
if (R.id.item_depththeme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
} else if (R.id.item_skytheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
} else if (R.id.item_goldentheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
} else if (R.id.item_bearingtheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
} else if (R.id.item_memortheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
} else if (R.id.item_taotheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
} else if (R.id.item_defaulttheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
saveThemeStyleID(context, themeStyleId);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> boolean onAppCompatThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
// 对外暴露不同 Activity 类型的入口,内部调用统一核心方法
|
||||
public static boolean onThemeItemSelected(Activity activity, MenuItem item) {
|
||||
return handleThemeMenuClick(activity, item);
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
public static boolean onAppCompatThemeItemSelected(AppCompatActivity activity, MenuItem item) {
|
||||
return handleThemeMenuClick(activity, item);
|
||||
}
|
||||
|
||||
public static <T extends DrawerFragmentActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
}
|
||||
public static boolean onWinBoLLThemeItemSelected(AppCompatActivity activity, MenuItem item) {
|
||||
// 使用 Application 上下文保存,避免 Activity 泄漏
|
||||
return handleThemeMenuClick(activity.getApplicationContext(), item);
|
||||
}
|
||||
|
||||
return false;
|
||||
public static boolean onWinBoLLThemeItemSelected(DrawerFragmentActivity activity, MenuItem item) {
|
||||
return handleThemeMenuClick(activity.getApplicationContext(), item);
|
||||
}
|
||||
|
||||
// ====================== 主题类型转换工具 ======================
|
||||
/**
|
||||
* 根据枚举获取对应样式ID
|
||||
*/
|
||||
public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
|
||||
return themeStyleIDList.get(themeType.ordinal());
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据样式ID反向获取主题枚举
|
||||
*/
|
||||
public static AESThemeBean.ThemeType getThemeStyleType(int themeStyleID) {
|
||||
for (int i = 0; i < themeStyleIDList.size(); i++) {
|
||||
if (themeStyleIDList.get(i) == themeStyleID) {
|
||||
return AESThemeBean.ThemeType.values()[i];
|
||||
}
|
||||
}
|
||||
return AESThemeBean.ThemeType.values()[0];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
|
||||
<color name="colorTextColor">#FFFFFFFF</color>
|
||||
<color name="colorPrimary">#FF03AB4E</color>
|
||||
<color name="colorPrimaryDark">#FF027C39</color>
|
||||
<color name="colorAccent">#FF3DDC84</color>
|
||||
<color name="colorPrimaryDark">#FF3DDC84</color>
|
||||
<color name="colorAccent">#FF027C39</color>
|
||||
<color name="colorText">#FFFFFB8D</color>
|
||||
<color name="colorToastFrame">#FFA9A9A9</color>
|
||||
<color name="colorToastFrame">#FF555555</color>
|
||||
<color name="colorToastShadow">#FF000000</color>
|
||||
<color name="colorToastBackgroung">#FFFFFFFF</color>
|
||||
<color name="colorAToolbarStartColor">#FF7D3F12</color>
|
||||
<color name="colorAToolbarCenterColor">#FFCC6E2B</color>
|
||||
<color name="colorAToolbarEndColor">#FFF4B98F</color>
|
||||
<color name="colorToastBackgroung">#FF3A3A3A</color>
|
||||
<color name="colorAToolbarStartColor">#FF5A3A1A</color>
|
||||
<color name="colorAToolbarCenterColor">#FFA05A2A</color>
|
||||
<color name="colorAToolbarEndColor">#FFD4A07A</color>
|
||||
|
||||
<color name="colorACardShadow">@color/colorPrimaryDark</color>
|
||||
<color name="colorACardFrame">@color/colorPrimary</color>
|
||||
@@ -24,7 +24,7 @@
|
||||
<color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
|
||||
<color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
|
||||
|
||||
<color name="toolbarBackgroundColor">#FF03AB4E</color>
|
||||
<color name="toolbarBackgroundColor">#FF3DDC84</color>
|
||||
<color name="toolbarTextColor">#FFFFFFFF</color>
|
||||
<color name="mainWindowBackgroundColor">#FF2C2C2C</color>
|
||||
<color name="mainWindowTextColor">#FFFFFFFF</color>
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
<resources>
|
||||
|
||||
<style name="AESTheme" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="colorPrimary">#FF03AB4E</item>
|
||||
<item name="colorPrimaryDark">#FF3DDC84</item>
|
||||
<item name="colorAccent">#FF027C39</item>
|
||||
<item name="themeDebug">@style/DebugActivityTheme</item>
|
||||
<item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="aboutViewTextColor">@color/mainWindowTextColor</item>
|
||||
@@ -40,52 +43,52 @@
|
||||
|
||||
<style name="AESAToolbar">
|
||||
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="AESASupportToolbar">
|
||||
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="DepthAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FF0065EC</item>
|
||||
<item name="colorPrimaryDark">#FF004DB4</item>
|
||||
<item name="colorAccent">#FF4A97FF</item>
|
||||
<item name="colorPrimaryDark">#FF4A97FF</item>
|
||||
<item name="colorAccent">#FF004DB4</item>
|
||||
</style>
|
||||
|
||||
<style name="SkyAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FF00A6FF</item>
|
||||
<item name="colorPrimaryDark">#FF007ABB</item>
|
||||
<item name="colorAccent">#FF84D4FF</item>
|
||||
<item name="colorPrimaryDark">#FF84D4FF</item>
|
||||
<item name="colorAccent">#FF007ABB</item>
|
||||
</style>
|
||||
|
||||
<style name="GoldenAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFF0CA11</item>
|
||||
<item name="colorPrimaryDark">#FFD3AF00</item>
|
||||
<item name="colorAccent">#FFFFE35C</item>
|
||||
<item name="colorPrimaryDark">#FFFFE35C</item>
|
||||
<item name="colorAccent">#FFD3AF00</item>
|
||||
</style>
|
||||
|
||||
<style name="BearingAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FF840FFF</item>
|
||||
<item name="colorPrimaryDark">#FF6900D7</item>
|
||||
<item name="colorAccent">#FFBA78FF</item>
|
||||
<item name="colorPrimaryDark">#FFBA78FF</item>
|
||||
<item name="colorAccent">#FF6900D7</item>
|
||||
</style>
|
||||
|
||||
<style name="MemorAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFFF00F5</item>
|
||||
<item name="colorPrimaryDark">#FFE500DC</item>
|
||||
<item name="colorAccent">#FFFF76FA</item>
|
||||
<item name="colorPrimaryDark">#FFFF76FA</item>
|
||||
<item name="colorAccent">#FFE500DC</item>
|
||||
</style>
|
||||
|
||||
<style name="TaoAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFACACAC</item>
|
||||
<item name="colorPrimaryDark">#FF898989</item>
|
||||
<item name="colorAccent">#FFD8D8D8</item>
|
||||
<item name="colorPrimary">#FF7E7E7E</item>
|
||||
<item name="colorPrimaryDark">#FFE2E2E2</item>
|
||||
<item name="colorAccent">#FF000000</item>
|
||||
</style>
|
||||
|
||||
<style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
<resources>
|
||||
|
||||
<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="colorPrimary">#FF03AB4E</item>
|
||||
<item name="colorPrimaryDark">#FF027C39</item>
|
||||
<item name="colorAccent">#FF3DDC84</item>
|
||||
<item name="themeDebug">@style/DebugActivityTheme</item>
|
||||
<item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="aboutViewTextColor">@color/mainWindowTextColor</item>
|
||||
@@ -40,16 +43,16 @@
|
||||
|
||||
<style name="AESAToolbar">
|
||||
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="AESASupportToolbar">
|
||||
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="DepthAESTheme" parent="AESTheme">
|
||||
@@ -83,9 +86,9 @@
|
||||
</style>
|
||||
|
||||
<style name="TaoAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFACACAC</item>
|
||||
<item name="colorPrimaryDark">#FF898989</item>
|
||||
<item name="colorAccent">#FFD8D8D8</item>
|
||||
<item name="colorPrimary">#FF7E7E7E</item>
|
||||
<item name="colorPrimaryDark">#FF000000</item>
|
||||
<item name="colorAccent">#FFE2E2E2</item>
|
||||
</style>
|
||||
|
||||
<style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
|
||||
@@ -109,4 +112,4 @@
|
||||
<item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
</resources>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sun May 17 16:16:36 HKT 2026
|
||||
stageCount=16
|
||||
#Wed May 27 14:51:29 HKT 2026
|
||||
stageCount=23
|
||||
libraryProject=libappbase
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.15
|
||||
publishVersion=15.20.22
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.16
|
||||
baseBetaVersion=15.20.23
|
||||
|
||||
@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
|
||||
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
|
||||
@@ -129,11 +129,10 @@ public class GlobalApplication extends Application {
|
||||
// 初始化单例实例(确保在所有初始化操作前完成)
|
||||
sInstance = this;
|
||||
|
||||
restoreDebugStatus();
|
||||
// 初始化基础组件(日志、崩溃处理、Toast)
|
||||
initCoreComponents();
|
||||
// 恢复/初始化调试模式状态(从本地文件读取,无文件则默认关闭调试)
|
||||
restoreDebugStatus();
|
||||
// 新增:初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
|
||||
// 初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
|
||||
initWinbollHost();
|
||||
|
||||
LogUtils.d(TAG, "GlobalApplication 初始化完成,单例实例已创建");
|
||||
@@ -144,7 +143,11 @@ public class GlobalApplication extends Application {
|
||||
*/
|
||||
private void initCoreComponents() {
|
||||
// 初始化日志工具(传入 Application 上下文)
|
||||
LogUtils.init(this);
|
||||
|
||||
// 调试状态下初始化日志工具
|
||||
if (GlobalApplication.isDebugging()) {
|
||||
LogUtils.init(this);
|
||||
}
|
||||
// 初始化全局异常处理器(捕获应用崩溃信息,用于调试或上报)
|
||||
CrashHandler.init(this);
|
||||
// 初始化 Toast 工具(统一 Toast 样式、避免内存泄漏等)
|
||||
|
||||
@@ -27,6 +27,11 @@ public class LogActivity extends Activity {
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if(!GlobalApplication.isDebugging()) {
|
||||
ToastUtils.show("非调试状态日志功能不可用");
|
||||
finish();
|
||||
}
|
||||
|
||||
// 设置布局文件(包含 LogView 控件)
|
||||
setContentView(R.layout.activity_log);
|
||||
|
||||
|
||||
@@ -67,45 +67,29 @@ public class LogUtils {
|
||||
|
||||
// ====================== 初始化入口 ======================
|
||||
public static void init(final Context context) {
|
||||
init(context, LOG_LEVEL.Off);
|
||||
init(context, LOG_LEVEL.Off);
|
||||
}
|
||||
|
||||
public static void init(final Context context, final LOG_LEVEL logLevel) {
|
||||
Log.d(TAG, "init 执行日志工具初始化");
|
||||
_mContext = context;
|
||||
if (!GlobalApplication.isDebugging()) {
|
||||
return;
|
||||
}
|
||||
Log.d(TAG, "init 执行日志工具初始化");
|
||||
_mContext = context;
|
||||
|
||||
if (GlobalApplication.isDebugging()) {
|
||||
initDebugDir();
|
||||
} else {
|
||||
initReleaseDir();
|
||||
}
|
||||
initLogUtilsDir();
|
||||
|
||||
initLogConfigBean();
|
||||
addClassTAGList();
|
||||
loadTAGBeanSettings();
|
||||
checkAndTrimLogFileSize();
|
||||
initLogConfigBean();
|
||||
addClassTAGList();
|
||||
loadTAGBeanSettings();
|
||||
checkAndTrimLogFileSize();
|
||||
|
||||
_IsInited = true;
|
||||
Log.d(TAG, "init 日志工具初始化完成");
|
||||
_IsInited = true;
|
||||
Log.d(TAG, "init 执行日志工具初始化完成");
|
||||
}
|
||||
|
||||
// ====================== 目录初始化 ======================
|
||||
private static void initDebugDir() {
|
||||
final Context appContext = _mContext.getApplicationContext();
|
||||
_mfLogCacheDir = new File(appContext.getExternalCacheDir(), TAG);
|
||||
if (!_mfLogCacheDir.exists()) {
|
||||
_mfLogCacheDir.mkdirs();
|
||||
}
|
||||
_mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
|
||||
|
||||
_mfLogDataDir = appContext.getExternalFilesDir(TAG);
|
||||
if (!_mfLogDataDir.exists()) {
|
||||
_mfLogDataDir.mkdirs();
|
||||
}
|
||||
_mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
|
||||
}
|
||||
|
||||
private static void initReleaseDir() {
|
||||
private static void initLogUtilsDir() {
|
||||
final Context appContext = _mContext.getApplicationContext();
|
||||
_mfLogCacheDir = new File(appContext.getCacheDir(), TAG);
|
||||
if (!_mfLogCacheDir.exists()) {
|
||||
@@ -113,7 +97,7 @@ public class LogUtils {
|
||||
}
|
||||
_mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
|
||||
|
||||
_mfLogDataDir = new File(appContext.getFilesDir(), TAG);
|
||||
_mfLogDataDir = appContext.getExternalFilesDir(TAG);
|
||||
if (!_mfLogDataDir.exists()) {
|
||||
_mfLogDataDir.mkdirs();
|
||||
}
|
||||
@@ -136,7 +120,7 @@ public class LogUtils {
|
||||
}
|
||||
|
||||
final long KEEP_FILE_SIZE = 25000L; // ~25KB 确保剪贴板可完整复制
|
||||
final long MAX_FILE_SIZE = 2*KEEP_FILE_SIZE;
|
||||
final long MAX_FILE_SIZE = 2 * KEEP_FILE_SIZE;
|
||||
final long fileSize = _mfLogCatchFile.length();
|
||||
|
||||
if (fileSize <= MAX_FILE_SIZE) {
|
||||
@@ -266,6 +250,9 @@ public class LogUtils {
|
||||
}
|
||||
|
||||
public static void setTAGListEnable(final String tag, final boolean isEnable) {
|
||||
if (!_IsInited) {
|
||||
return;
|
||||
}
|
||||
final Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
|
||||
while (iterator.hasNext()) {
|
||||
final Map.Entry<String, Boolean> entry = iterator.next();
|
||||
@@ -279,6 +266,9 @@ public class LogUtils {
|
||||
}
|
||||
|
||||
public static void setALlTAGListEnable(final boolean isEnable) {
|
||||
if (!_IsInited) {
|
||||
return;
|
||||
}
|
||||
for (final Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
|
||||
entry.setValue(isEnable);
|
||||
}
|
||||
@@ -288,15 +278,22 @@ public class LogUtils {
|
||||
|
||||
// ====================== 日志级别控制 ======================
|
||||
public static void setLogLevel(final LOG_LEVEL logLevel) {
|
||||
if (_mLogUtilsBean == null) {
|
||||
Log.d(TAG, "setLogLevel LogUtils未初始化,忽略设置日志级别");
|
||||
return;
|
||||
}
|
||||
_mLogUtilsBean.setLogLevel(logLevel);
|
||||
_mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
|
||||
}
|
||||
|
||||
public static LOG_LEVEL getLogLevel() {
|
||||
return _mLogUtilsBean.getLogLevel();
|
||||
return _mLogUtilsBean == null ?LOG_LEVEL.Off: _mLogUtilsBean.getLogLevel();
|
||||
}
|
||||
|
||||
private static boolean isLoggable(final String tag, final LOG_LEVEL logLevel) {
|
||||
if (!GlobalApplication.isDebugging()) {
|
||||
return false;
|
||||
}
|
||||
if (!_IsInited) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
|
||||
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
|
||||
@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
|
||||
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package cc.winboll.studio.libappbase;
|
||||
|
||||
import android.os.FileObserver;
|
||||
import java.io.File;
|
||||
import java.lang.ref.WeakReference;
|
||||
|
||||
/**
|
||||
@@ -51,30 +52,38 @@ public class LogViewThread extends Thread {
|
||||
*/
|
||||
@Override
|
||||
public void run() {
|
||||
// 获取日志缓存目录路径(从 LogUtils 统一获取,确保路径一致性)
|
||||
String logDirPath = LogUtils.getLogCacheDir().getPath();
|
||||
LogUtils.d(TAG, "启动日志文件监听,监听目录:" + logDirPath);
|
||||
// 调试状态进行日志输出任务
|
||||
if (GlobalApplication.isDebugging()) {
|
||||
// 获取日志缓存目录路径(从 LogUtils 统一获取,确保路径一致性)
|
||||
File logDir = LogUtils.getLogCacheDir();
|
||||
if (logDir == null) {
|
||||
LogUtils.d(TAG, "日志缓存目录未初始化,线程退出");
|
||||
return;
|
||||
}
|
||||
String logDirPath = logDir.getPath();
|
||||
LogUtils.d(TAG, "启动日志文件监听,监听目录:" + logDirPath);
|
||||
|
||||
// 初始化日志文件监听器(监听目标目录的文件事件)
|
||||
mLogListener = new LogListener(logDirPath);
|
||||
// 开始监听文件事件(非阻塞,内部通过 Native 层实现)
|
||||
mLogListener.startWatching();
|
||||
// 初始化日志文件监听器(监听目标目录的文件事件)
|
||||
mLogListener = new LogListener(logDirPath);
|
||||
// 开始监听文件事件(非阻塞,内部通过 Native 层实现)
|
||||
mLogListener.startWatching();
|
||||
|
||||
// 循环等待退出标志(每 1 秒检查一次,降低 CPU 占用)
|
||||
while (!isExit()) {
|
||||
try {
|
||||
Thread.sleep(1000); // 休眠 1 秒,避免忙等
|
||||
} catch (InterruptedException e) {
|
||||
// 线程被中断时,恢复中断标志并退出循环(避免无限阻塞)
|
||||
Thread.currentThread().interrupt();
|
||||
LogUtils.d(TAG, "日志监听线程被中断,准备退出。" + e);
|
||||
break;
|
||||
}
|
||||
}
|
||||
// 循环等待退出标志(每 1 秒检查一次,降低 CPU 占用)
|
||||
while (!isExit()) {
|
||||
try {
|
||||
Thread.sleep(1000); // 休眠 1 秒,避免忙等
|
||||
} catch (InterruptedException e) {
|
||||
// 线程被中断时,恢复中断标志并退出循环(避免无限阻塞)
|
||||
Thread.currentThread().interrupt();
|
||||
LogUtils.d(TAG, "日志监听线程被中断,准备退出。" + e);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// 收到退出标志,停止监听并释放资源
|
||||
mLogListener.stopWatching();
|
||||
LogUtils.d(TAG, "日志文件监听已停止,线程退出");
|
||||
// 收到退出标志,停止监听并释放资源
|
||||
mLogListener.stopWatching();
|
||||
LogUtils.d(TAG, "日志文件监听已停止,线程退出");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,415 @@
|
||||
package cc.winboll.studio.libappbase.models.libs1520000;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.UTF8FileUtils;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.io.StringWriter;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* WinBoLL JSON 数据模型基类(抽象类)
|
||||
* 定义 Json Bean 的核心规范:序列化/反序列化、文件持久化、列表处理等通用逻辑,
|
||||
* 子类需实现抽象方法,完成自身字段JSON读写业务逻辑
|
||||
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||
* @CreateTime 2026/05/19 22:33:00
|
||||
* @EditTime 2026/05/19 23:15:48
|
||||
* @param <T> 泛型约束,限定子类必须继承自BaseBean
|
||||
*/
|
||||
public abstract class BaseBean<T extends BaseBean> {
|
||||
|
||||
// ====================== 静态常量 ======================
|
||||
/** 日志输出标识TAG */
|
||||
public static final String TAG = "BaseBean";
|
||||
/** JSON存储Bean类名字段Key,用于类型校验 */
|
||||
static final String BEAN_NAME = "BeanName";
|
||||
|
||||
// ====================== 构造方法 ======================
|
||||
/**
|
||||
* 无参空构造,满足反射实例化要求
|
||||
*/
|
||||
public BaseBean() {
|
||||
|
||||
}
|
||||
|
||||
// ====================== 抽象方法 ======================
|
||||
/**
|
||||
* 获取当前实体类全类名
|
||||
* @return 全限定类名字符串
|
||||
*/
|
||||
public abstract String getName();
|
||||
|
||||
/**
|
||||
* 从JSON读取器解析构建实体对象
|
||||
* @param jsonReader JSON读取流
|
||||
* @return 解析完成实体对象
|
||||
* @throws IOException IO读写异常
|
||||
*/
|
||||
public abstract T readBeanFromJsonReader(final JsonReader jsonReader) throws IOException;
|
||||
|
||||
// ====================== 路径获取相关 ======================
|
||||
/**
|
||||
* 获取单个实体默认存储JSON文件路径
|
||||
* @param context 应用上下文
|
||||
* @return 文件绝对路径
|
||||
*/
|
||||
public String getBeanJsonFilePath(final Context context) {
|
||||
return context.getExternalFilesDir(TAG) + "/" + getName() + ".json";
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取实体列表默认存储JSON文件路径
|
||||
* @param context 应用上下文
|
||||
* @return 文件绝对路径
|
||||
*/
|
||||
public String getBeanListJsonFilePath(final Context context) {
|
||||
return context.getExternalFilesDir(TAG) + "/" + getName() + "_List.json";
|
||||
}
|
||||
|
||||
// ====================== JSON序列化基础方法 ======================
|
||||
/**
|
||||
* 写入基础Bean标识字段至JSON
|
||||
* @param jsonWriter JSON写入流
|
||||
* @throws IOException 写入异常
|
||||
*/
|
||||
public void writeThisToJsonWriter(final JsonWriter jsonWriter) throws IOException {
|
||||
jsonWriter.name(BEAN_NAME).value(getName());
|
||||
}
|
||||
|
||||
/**
|
||||
* 基类通用字段解析回调
|
||||
* @param jsonReader JSON读取流
|
||||
* @param name 字段名
|
||||
* @return 是否完成当前字段解析
|
||||
* @throws IOException 读取异常
|
||||
*/
|
||||
public boolean initObjectsFromJsonReader(final JsonReader jsonReader, final String name) throws IOException {
|
||||
return false;
|
||||
}
|
||||
|
||||
// ====================== 实体字符串序列化 ======================
|
||||
@Override
|
||||
public String toString() {
|
||||
LogUtils.d(TAG, "执行BaseBean实体转JSON字符串");
|
||||
final StringWriter stringWriter = new StringWriter();
|
||||
final JsonWriter jsonWriter = new JsonWriter(stringWriter);
|
||||
jsonWriter.setIndent(" ");
|
||||
try {
|
||||
jsonWriter.beginObject();
|
||||
writeThisToJsonWriter(jsonWriter);
|
||||
jsonWriter.endObject();
|
||||
return stringWriter.toString();
|
||||
} catch (final IOException e) {
|
||||
LogUtils.d(TAG, "实体转JSON字符串异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
// ====================== 列表序列化工具 ======================
|
||||
/**
|
||||
* Bean列表转为格式化JSON数组字符串
|
||||
* @param beanList 实体集合
|
||||
* @param <T> 实体泛型
|
||||
* @return JSON字符串
|
||||
*/
|
||||
public static <T extends BaseBean> String toStringByBeanList(final ArrayList<T> beanList) {
|
||||
LogUtils.d(TAG, "执行Bean列表序列化JSON操作");
|
||||
try {
|
||||
final StringWriter stringWriter = new StringWriter();
|
||||
final JsonWriter jsonWriter = new JsonWriter(stringWriter);
|
||||
jsonWriter.setIndent(" ");
|
||||
jsonWriter.beginArray();
|
||||
for (int i = 0; i < beanList.size(); i++) {
|
||||
jsonWriter.beginObject();
|
||||
beanList.get(i).writeThisToJsonWriter(jsonWriter);
|
||||
jsonWriter.endObject();
|
||||
}
|
||||
jsonWriter.endArray();
|
||||
jsonWriter.close();
|
||||
return stringWriter.toString();
|
||||
} catch (final IOException e) {
|
||||
LogUtils.d(TAG, "列表序列化JSON异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
// ====================== JSON字符串解析实体 ======================
|
||||
/**
|
||||
* JSON文本解析为单个实体对象
|
||||
* @param szBean JSON文本
|
||||
* @param clazz 实体Class字节码
|
||||
* @param <T> 实体泛型
|
||||
* @return 解析完成实体
|
||||
* @throws IOException 解析IO异常
|
||||
*/
|
||||
public static <T extends BaseBean> T parseStringToBean(final String szBean, final Class<T> clazz) throws IOException {
|
||||
LogUtils.d(TAG, "进入字符串解析实体方法,目标Class:" + clazz.getSimpleName());
|
||||
final StringReader stringReader = new StringReader(szBean);
|
||||
final JsonReader jsonReader = new JsonReader(stringReader);
|
||||
try {
|
||||
final T beanTemp = clazz.newInstance();
|
||||
return (T) beanTemp.readBeanFromJsonReader(jsonReader);
|
||||
} catch (final InstantiationException e) {
|
||||
LogUtils.d(TAG, "实体反射实例化失败(InstantiationException)", Thread.currentThread().getStackTrace());
|
||||
} catch (final IllegalAccessException e) {
|
||||
LogUtils.d(TAG, "实体反射权限访问失败(IllegalAccessException)", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* JSON数组文本解析填充实体列表
|
||||
* @param szBeanList JSON数组文本
|
||||
* @param beanList 目标存储集合
|
||||
* @param clazz 实体字节码
|
||||
* @param <T> 实体泛型
|
||||
* @return 解析结果
|
||||
*/
|
||||
public static <T extends BaseBean> boolean parseStringToBeanList(final String szBeanList, ArrayList<T> beanList, final Class<T> clazz) {
|
||||
LogUtils.d(TAG, "进入列表字符串解析方法");
|
||||
try {
|
||||
if (beanList == null) {
|
||||
beanList = new ArrayList<T>();
|
||||
} else {
|
||||
beanList.clear();
|
||||
}
|
||||
final StringReader stringReader = new StringReader(szBeanList);
|
||||
final JsonReader jsonReader = new JsonReader(stringReader);
|
||||
jsonReader.beginArray();
|
||||
while (jsonReader.hasNext()) {
|
||||
final T beanTemp = clazz.newInstance();
|
||||
final T bean = (T) beanTemp.readBeanFromJsonReader(jsonReader);
|
||||
if (bean != null) {
|
||||
beanList.add(bean);
|
||||
}
|
||||
}
|
||||
jsonReader.endArray();
|
||||
return true;
|
||||
} catch (final InstantiationException e) {
|
||||
LogUtils.d(TAG, "列表解析反射实例化异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IllegalAccessException e) {
|
||||
LogUtils.d(TAG, "列表解析反射权限异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IOException e) {
|
||||
LogUtils.d(TAG, "列表解析JSON读写异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// ====================== 文件加载实体 ======================
|
||||
/**
|
||||
* 从默认路径加载单个实体
|
||||
* @param context 上下文
|
||||
* @param clazz 实体字节码
|
||||
* @param <T> 实体泛型
|
||||
* @return 加载实体
|
||||
*/
|
||||
public static <T extends BaseBean> T loadBean(final Context context, final Class<T> clazz) {
|
||||
LogUtils.d(TAG, "执行默认路径加载实体数据");
|
||||
try {
|
||||
final T beanTemp = clazz.newInstance();
|
||||
return loadBeanFromFile(beanTemp.getBeanJsonFilePath(context), clazz);
|
||||
} catch (final InstantiationException e) {
|
||||
LogUtils.d(TAG, "加载实体反射实例化失败", Thread.currentThread().getStackTrace());
|
||||
} catch (final IllegalAccessException e) {
|
||||
LogUtils.d(TAG, "加载实体反射权限失败", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 自定义文件路径加载单个实体
|
||||
* @param szFilePath 文件路径
|
||||
* @param clazz 实体字节码
|
||||
* @param <T> 实体泛型
|
||||
* @return 实体对象
|
||||
*/
|
||||
public static <T extends BaseBean> T loadBeanFromFile(final String szFilePath, final Class<T> clazz) {
|
||||
LogUtils.d(TAG, "指定路径加载实体,路径:" + szFilePath);
|
||||
try {
|
||||
final File file = new File(szFilePath);
|
||||
if (file.exists()) {
|
||||
final T beanTemp = clazz.newInstance();
|
||||
final String json = UTF8FileUtils.readStringFromFile(szFilePath);
|
||||
return beanTemp.parseStringToBean(json, clazz);
|
||||
}
|
||||
} catch (final InstantiationException e) {
|
||||
LogUtils.d(TAG, "文件加载实体反射实例化异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IllegalAccessException e) {
|
||||
LogUtils.d(TAG, "文件加载实体反射权限异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IOException e) {
|
||||
LogUtils.d(TAG, "文件读取JSON数据异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 默认路径加载实体列表
|
||||
* @param context 上下文
|
||||
* @param beanListDst 目标集合
|
||||
* @param clazz 实体字节码
|
||||
* @param <T> 实体泛型
|
||||
* @return 加载结果
|
||||
*/
|
||||
public static <T extends BaseBean> boolean loadBeanList(final Context context, final ArrayList<T> beanListDst, final Class<T> clazz) {
|
||||
LogUtils.d(TAG, "默认路径加载实体列表数据");
|
||||
try {
|
||||
final T beanTemp = clazz.newInstance();
|
||||
return loadBeanListFromFile(beanTemp.getBeanListJsonFilePath(context), beanListDst, clazz);
|
||||
} catch (final InstantiationException e) {
|
||||
LogUtils.d(TAG, "列表加载反射实例化异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IllegalAccessException e) {
|
||||
LogUtils.d(TAG, "列表加载反射权限异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 自定义路径加载实体列表
|
||||
* @param szFilePath 文件路径
|
||||
* @param beanList 目标集合
|
||||
* @param clazz 实体字节码
|
||||
* @param <T> 实体泛型
|
||||
* @return 加载结果
|
||||
*/
|
||||
public static <T extends BaseBean> boolean loadBeanListFromFile(final String szFilePath, final ArrayList<T> beanList, final Class<T> clazz) {
|
||||
LogUtils.d(TAG, "指定路径加载实体列表,路径:" + szFilePath);
|
||||
try {
|
||||
final File file = new File(szFilePath);
|
||||
if (file.exists()) {
|
||||
final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
|
||||
return parseStringToBeanList(listJson, beanList, clazz);
|
||||
}
|
||||
} catch (final IOException e) {
|
||||
LogUtils.d(TAG, "列表文件读取异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// ====================== 实体数据保存文件 ======================
|
||||
/**
|
||||
* 默认路径保存单个实体
|
||||
* @param context 上下文
|
||||
* @param bean 待保存实体
|
||||
* @param <T> 实体泛型
|
||||
* @return 保存结果
|
||||
*/
|
||||
public static <T extends BaseBean> boolean saveBean(final Context context, final T bean) {
|
||||
return saveBeanToFile(bean.getBeanJsonFilePath(context), bean);
|
||||
}
|
||||
|
||||
/**
|
||||
* 自定义路径保存单个实体
|
||||
* @param szFilePath 保存路径
|
||||
* @param bean 待保存实体
|
||||
* @param <T> 实体泛型
|
||||
* @return 保存结果
|
||||
*/
|
||||
public static <T extends BaseBean> boolean saveBeanToFile(final String szFilePath, final T bean) {
|
||||
LogUtils.d(TAG, "执行实体数据写入文件操作");
|
||||
try {
|
||||
final String json = bean.toString();
|
||||
UTF8FileUtils.writeStringToFile(szFilePath, json);
|
||||
return true;
|
||||
} catch (final IOException e) {
|
||||
LogUtils.d(TAG, "实体写入文件异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 默认路径保存实体列表
|
||||
* @param context 上下文
|
||||
* @param beanList 实体集合
|
||||
* @param clazz 实体字节码
|
||||
* @param <T> 实体泛型
|
||||
* @return 保存结果
|
||||
*/
|
||||
public static <T extends BaseBean> boolean saveBeanList(final Context context, final ArrayList<T> beanList, final Class<T> clazz) {
|
||||
LogUtils.d(TAG, "默认路径保存实体列表数据");
|
||||
try {
|
||||
final T beanTemp = clazz.newInstance();
|
||||
return saveBeanListToFile(beanTemp.getBeanListJsonFilePath(context), beanList);
|
||||
} catch (final InstantiationException e) {
|
||||
LogUtils.d(TAG, "列表保存反射实例化异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IllegalAccessException e) {
|
||||
LogUtils.d(TAG, "列表保存反射权限异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 自定义路径保存实体列表
|
||||
* @param szFilePath 保存路径
|
||||
* @param beanList 实体集合
|
||||
* @param <T> 实体泛型
|
||||
* @return 保存结果
|
||||
*/
|
||||
public static <T extends BaseBean> boolean saveBeanListToFile(final String szFilePath, final ArrayList<T> beanList) {
|
||||
LogUtils.d(TAG, "指定路径保存实体列表数据");
|
||||
try {
|
||||
final String json = toStringByBeanList(beanList);
|
||||
UTF8FileUtils.writeStringToFile(szFilePath, json);
|
||||
return true;
|
||||
} catch (final IOException e) {
|
||||
LogUtils.d(TAG, "列表数据写入文件异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// ====================== Bean类型一致性校验 ======================
|
||||
/**
|
||||
* 校验本地JSON列表内实体类型是否统一
|
||||
* @param szFilePath 列表文件路径
|
||||
* @param clazz 目标校验实体Class
|
||||
* @param <T> 实体泛型
|
||||
* @return 校验结果信息
|
||||
*/
|
||||
public static <T extends BaseBean> String checkIsTheSameBeanListAndFile(final String szFilePath, final Class<T> clazz) {
|
||||
final StringBuilder sbResult = new StringBuilder();
|
||||
final String szErrorInfo = "Check Is The Same Bean List And File Error : ";
|
||||
try {
|
||||
int sameCount = 0;
|
||||
int totalCount = 0;
|
||||
final T beanTemp = clazz.newInstance();
|
||||
final String targetBeanName = beanTemp.getName();
|
||||
final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
|
||||
final StringReader stringReader = new StringReader(listJson);
|
||||
final JsonReader jsonReader = new JsonReader(stringReader);
|
||||
jsonReader.beginArray();
|
||||
while (jsonReader.hasNext()) {
|
||||
totalCount++;
|
||||
jsonReader.beginObject();
|
||||
while (jsonReader.hasNext()) {
|
||||
final String name = jsonReader.nextName();
|
||||
if (BEAN_NAME.equals(name)) {
|
||||
if (targetBeanName.equals(jsonReader.nextString())) {
|
||||
sameCount++;
|
||||
}
|
||||
} else {
|
||||
jsonReader.skipValue();
|
||||
}
|
||||
}
|
||||
jsonReader.endObject();
|
||||
}
|
||||
jsonReader.endArray();
|
||||
if (sameCount != totalCount) {
|
||||
sbResult.append("Total : ").append(totalCount).append(" Diff : ").append(totalCount - sameCount);
|
||||
}
|
||||
} catch (final InstantiationException e) {
|
||||
sbResult.append(szErrorInfo).append(e);
|
||||
LogUtils.d(TAG, "类型校验反射实例化异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IllegalAccessException e) {
|
||||
sbResult.append(szErrorInfo).append(e);
|
||||
LogUtils.d(TAG, "类型校验反射权限异常", Thread.currentThread().getStackTrace());
|
||||
} catch (final IOException e) {
|
||||
sbResult.append(szErrorInfo).append(e);
|
||||
LogUtils.d(TAG, "类型校验文件读取解析异常", Thread.currentThread().getStackTrace());
|
||||
}
|
||||
return sbResult.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package cc.winboll.studio.libappbase.views;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.net.Uri;
|
||||
@@ -12,6 +14,7 @@ import android.widget.ImageButton;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.R;
|
||||
@@ -74,12 +77,12 @@ public class AboutView extends LinearLayout {
|
||||
private EditText metDevUserPassword;
|
||||
|
||||
// ===================================== 页面视图控件 =====================================
|
||||
private DebugSwitchImageView ivAppIcon;
|
||||
private DebugSwitchInfoImageView ivAppIcon;
|
||||
private TextView tvAppNameVersion;
|
||||
private TextView tvAppDesc;
|
||||
private LinearLayout llFunctionContainer;
|
||||
private ImageButton ibSebugStepOver;
|
||||
private ImageButton ibSigngetDialog;
|
||||
private ImageButton ibDebugUnlock;
|
||||
private ImageButton ibWinBoLLHostDialog;
|
||||
|
||||
// ===================================== 构造方法(按参数从少到多排序) =====================================
|
||||
@@ -193,12 +196,12 @@ public class AboutView extends LinearLayout {
|
||||
llFunctionContainer = findViewById(R.id.ll_function_container);
|
||||
// 功能按钮绑定
|
||||
ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
|
||||
ibSigngetDialog = findViewById(R.id.ib_signgetdialog);
|
||||
ibDebugUnlock = findViewById(R.id.ib_debug_unlock);
|
||||
ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
|
||||
|
||||
// 调试按钮统一只在调试模式显示
|
||||
ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
||||
//ibSigngetDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
||||
//ibDebugUnlock.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
||||
ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
||||
|
||||
// 绑定按钮点击事件
|
||||
@@ -310,6 +313,47 @@ public class AboutView extends LinearLayout {
|
||||
LogUtils.d(TAG, "initAboutPageView():视图组装完成,功能项加载完毕");
|
||||
}
|
||||
|
||||
// ===================================== 调试解锁弹窗 =====================================
|
||||
private void showDebugUnlockDialog() {
|
||||
final AlertDialog dialog = new AlertDialog.Builder(mContext).create();
|
||||
dialog.setTitle("应用调试解锁");
|
||||
dialog.setCanceledOnTouchOutside(true);
|
||||
|
||||
final EditText etToken = new EditText(mContext);
|
||||
etToken.setHint("请输入调试Token");
|
||||
dialog.setView(etToken);
|
||||
|
||||
dialog.setButton(DialogInterface.BUTTON_POSITIVE, "调试解锁", (DialogInterface.OnClickListener) null);
|
||||
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
|
||||
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||
@Override
|
||||
public void onShow(DialogInterface d) {
|
||||
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
String inputToken = etToken.getText().toString().trim();
|
||||
String savedToken = DebugSwitchInfoImageView.getDebugToken();
|
||||
if (savedToken != null && savedToken.equals(inputToken)) {
|
||||
GlobalApplication.setIsDebugging(true);
|
||||
GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
|
||||
Toast.makeText(mContext, "调试解锁成功,重启应用后生效", Toast.LENGTH_SHORT).show();
|
||||
} else {
|
||||
Toast.makeText(mContext, "调试Token不匹配", Toast.LENGTH_SHORT).show();
|
||||
dialog.dismiss();
|
||||
}
|
||||
}
|
||||
});
|
||||
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
dialog.show();
|
||||
}
|
||||
|
||||
// ===================================== 内部工具/事件方法 =====================================
|
||||
/**
|
||||
* 绑定功能按钮点击事件,处理正版校验、调试地址配置弹窗唤起
|
||||
@@ -335,6 +379,15 @@ public class AboutView extends LinearLayout {
|
||||
new DebugHostDialog(mContext).show();
|
||||
}
|
||||
});
|
||||
|
||||
// 应用调试解锁按钮
|
||||
ibDebugUnlock.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
LogUtils.d(TAG, "ibDebugUnlock onClick:弹出调试解锁对话框");
|
||||
showDebugUnlockDialog();
|
||||
}
|
||||
});
|
||||
LogUtils.d(TAG, "setBtnClickListener():功能按钮点击事件绑定完成");
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
package cc.winboll.studio.libappbase.views;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.ClipData;
|
||||
import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.SharedPreferences;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import java.util.UUID;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
|
||||
/**
|
||||
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/04/06 19:32
|
||||
* @Describe 应用Logo控件,连续点击6次弹出调试Token对话框,支持复制与重置
|
||||
*/
|
||||
public class DebugSwitchInfoImageView extends ImageView {
|
||||
|
||||
public static final String TAG = "DebugSwitchInfoImageView";
|
||||
|
||||
// 连续点击计数
|
||||
private int mClickCount = 0;
|
||||
// 目标点击次数
|
||||
private static final int TARGET_CLICK_COUNT = 7;
|
||||
|
||||
private static String mDebugToken = null;
|
||||
private static final String SP_DEBUG_TOKEN = "debug_token_prefs";
|
||||
private static final String KEY_DEBUG_TOKEN = "debug_token";
|
||||
|
||||
public static String getDebugToken() {
|
||||
if (mDebugToken != null) {
|
||||
return mDebugToken;
|
||||
}
|
||||
Context context = GlobalApplication.getInstance();
|
||||
if (context != null) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
|
||||
mDebugToken = sp.getString(KEY_DEBUG_TOKEN, null);
|
||||
if (mDebugToken == null) {
|
||||
mDebugToken = UUID.randomUUID().toString();
|
||||
sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
|
||||
}
|
||||
}
|
||||
return mDebugToken;
|
||||
}
|
||||
|
||||
public static void resetDebugToken() {
|
||||
Context context = GlobalApplication.getInstance();
|
||||
if (context != null) {
|
||||
mDebugToken = UUID.randomUUID().toString();
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
|
||||
sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
|
||||
}
|
||||
}
|
||||
|
||||
private void showDebugTokenDialog() {
|
||||
final AlertDialog dialog = new AlertDialog.Builder(getContext()).create();
|
||||
dialog.setTitle("调试Token");
|
||||
dialog.setMessage(getDebugToken());
|
||||
dialog.setCanceledOnTouchOutside(false);
|
||||
dialog.setButton(DialogInterface.BUTTON_POSITIVE, "复制到剪贴板", (DialogInterface.OnClickListener) null);
|
||||
dialog.setButton(DialogInterface.BUTTON_NEUTRAL, "重置", (DialogInterface.OnClickListener) null);
|
||||
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
|
||||
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||
@Override
|
||||
public void onShow(DialogInterface d) {
|
||||
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
ClipboardManager cm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
cm.setPrimaryClip(ClipData.newPlainText("DebugToken", getDebugToken()));
|
||||
}
|
||||
});
|
||||
dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
resetDebugToken();
|
||||
dialog.setMessage(getDebugToken());
|
||||
}
|
||||
});
|
||||
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
dialog.show();
|
||||
}
|
||||
|
||||
public DebugSwitchInfoImageView(Context context) {
|
||||
super(context);
|
||||
init();
|
||||
}
|
||||
|
||||
public DebugSwitchInfoImageView(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
init();
|
||||
}
|
||||
|
||||
public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr) {
|
||||
super(context, attrs, defStyleAttr);
|
||||
init();
|
||||
}
|
||||
|
||||
public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
|
||||
super(context, attrs, defStyleAttr, defStyleRes);
|
||||
init();
|
||||
}
|
||||
|
||||
private void init() {
|
||||
setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
mClickCount++;
|
||||
if (mClickCount >= TARGET_CLICK_COUNT) {
|
||||
mClickCount = 0;
|
||||
showDebugTokenDialog();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
android:paddingRight="16dp"
|
||||
android:paddingBottom="16dp">
|
||||
|
||||
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
|
||||
<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
|
||||
android:id="@+id/iv_app_icon"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
@@ -81,7 +81,8 @@
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:src="@drawable/ic_key"
|
||||
android:id="@+id/ib_signgetdialog"
|
||||
android:id="@+id/ib_debug_unlock"
|
||||
android:contentDescription="应用调试解锁"
|
||||
android:scaleType="fitCenter"
|
||||
android:adjustViewBounds="true"
|
||||
android:background="@null"/>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
android:paddingRight="16dp"
|
||||
android:paddingBottom="16dp">
|
||||
|
||||
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
|
||||
<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
|
||||
android:id="@+id/iv_app_icon"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
@@ -81,7 +81,8 @@
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:src="@drawable/ic_key"
|
||||
android:id="@+id/ib_signgetdialog"
|
||||
android:id="@+id/ib_debug_unlock"
|
||||
android:contentDescription="应用调试解锁"
|
||||
android:scaleType="fitCenter"
|
||||
android:adjustViewBounds="true"
|
||||
android:background="@null"/>
|
||||
|
||||
@@ -60,4 +60,7 @@
|
||||
<!-- DebugLogStyle 应用调试日志样式属性 -->
|
||||
<attr name="debugTextColor" format="color"/>
|
||||
|
||||
<!-- 边框圆角属性 -->
|
||||
<attr name="borderCornerRadius" format="dimension"/>
|
||||
|
||||
</resources>
|
||||
5
settings.gradle
Normal file
5
settings.gradle
Normal file
@@ -0,0 +1,5 @@
|
||||
// AES 项目编译设置
|
||||
include ':aes'
|
||||
include ':libaes'
|
||||
rootProject.name = "aes"
|
||||
|
||||
Reference in New Issue
Block a user