diff --git a/colorpickerdialogex/build.gradle b/colorpickerdialogex/build.gradle index a2b0ce1..610a092 100644 --- a/colorpickerdialogex/build.gradle +++ b/colorpickerdialogex/build.gradle @@ -107,8 +107,8 @@ dependencies { implementation 'com.termux:termux-shared:0.118.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libaes:15.15.2' - api 'cc.winboll.studio:libappbase:15.15.11' + api 'cc.winboll.studio:libaes:15.15.9' + api 'cc.winboll.studio:libappbase:15.15.21' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.7' diff --git a/colorpickerdialogex/build.properties b/colorpickerdialogex/build.properties index a994c26..0dee8ac 100644 --- a/colorpickerdialogex/build.properties +++ b/colorpickerdialogex/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 02 07:59:50 GMT 2026 +#Sat May 02 12:22:08 GMT 2026 stageCount=0 libraryProject=libcolorpickerdialogex baseVersion=15.0 publishVersion=15.0.0 -buildCount=14 +buildCount=20 baseBetaVersion=15.0.1 diff --git a/colorpickerdialogex/src/main/AndroidManifest.xml b/colorpickerdialogex/src/main/AndroidManifest.xml index aa839cc..8f86dec 100644 --- a/colorpickerdialogex/src/main/AndroidManifest.xml +++ b/colorpickerdialogex/src/main/AndroidManifest.xml @@ -32,6 +32,9 @@ + + diff --git a/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/AboutActivity.java b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/AboutActivity.java new file mode 100644 index 0000000..016e1ac --- /dev/null +++ b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/AboutActivity.java @@ -0,0 +1,50 @@ +package cc.winboll.studio.colorpickerdialogex; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import android.widget.Toolbar; +import cc.winboll.studio.colorpickerdialogex.R; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.models.APPInfo; +import cc.winboll.studio.libappbase.views.AboutView; + +/** + * @Author 豆包&ZhanGSKen + * @Date 2026/01/11 12:55 + * @Describe AboutActivity + */ +public class AboutActivity extends Activity { + + public static final String TAG = "AboutActivity"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_about); + + Toolbar toolbar = findViewById(R.id.toolbar); + setActionBar(toolbar); + + AboutView aboutView = findViewById(R.id.aboutview); + aboutView.setAPPInfo(genDefaultAppInfo()); + } + + private APPInfo genDefaultAppInfo() { + LogUtils.d(TAG, "genDefaultAppInfo() 调用"); + String branchName = "colorpickerdialogex"; + APPInfo appInfo = new APPInfo(); + appInfo.setAppName("ColorPickerDialogEx"); + appInfo.setAppIcon(R.drawable.ic_winboll); + appInfo.setAppDescription(getString(R.string.app_description)); + appInfo.setAppGitName("ColorPickerDialogEx"); + appInfo.setAppGitOwner("ZhanGSKen"); + appInfo.setAppGitAPPBranch(branchName); + appInfo.setAppGitAPPSubProjectFolder(branchName); + appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=ColorPickerDialogEx"); + appInfo.setAppAPKName("ColorPickerDialogEx"); + appInfo.setAppAPKFolderName("ColorPickerDialogEx"); + LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成"); + return appInfo; + } +} diff --git a/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/App.java b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/App.java index fdfd062..2463052 100644 --- a/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/App.java +++ b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/App.java @@ -48,6 +48,10 @@ public class App extends GlobalApplication { @Override public void onCreate() { super.onCreate(); + // 如果应用不在调试状态，就根据编译类型设置调试状态 + if (isDebugging() != true) { + setIsDebugging(BuildConfig.DEBUG); + } // 初始化 Toast 框架 ToastUtils.init(this); diff --git a/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java index fd9941d..88944d3 100644 --- a/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java +++ b/colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/MainActivity.java @@ -31,9 +31,14 @@ public class MainActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - mLogView.start(); + if (App.isDebugging() == true) { + mLogView.setVisibility(View.VISIBLE); + mLogView.start(); + } else { + mLogView.setVisibility(View.GONE); + } } - + public void onSettingBackgroundWithColorPickerDialogEx(View view) { ColorPickerDialogEx dlg = new ColorPickerDialogEx(this, getResources().getColor(R.color.colorPrimary)); dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() { diff --git a/colorpickerdialogex/src/main/res/layout/activity_about.xml b/colorpickerdialogex/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..bfd02eb --- /dev/null +++ b/colorpickerdialogex/src/main/res/layout/activity_about.xml @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/colorpickerdialogex/src/main/res/values/strings.xml b/colorpickerdialogex/src/main/res/values/strings.xml index b4db7f3..c17d010 100644 --- a/colorpickerdialogex/src/main/res/values/strings.xml +++ b/colorpickerdialogex/src/main/res/values/strings.xml @@ -1,4 +1,5 @@ ColorPickerDialogEx - + WinBoLL ColorPickerDialogEx 调试版类库调试应用。 + diff --git a/libcolorpickerdialogex/build.properties b/libcolorpickerdialogex/build.properties index a994c26..0dee8ac 100644 --- a/libcolorpickerdialogex/build.properties +++ b/libcolorpickerdialogex/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 02 07:59:50 GMT 2026 +#Sat May 02 12:22:08 GMT 2026 stageCount=0 libraryProject=libcolorpickerdialogex baseVersion=15.0 publishVersion=15.0.0 -buildCount=14 +buildCount=20 baseBetaVersion=15.0.1