From ded775ae0162532fe45e65658309f31631cb9da9 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 4 May 2025 21:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=BA=93=E6=9B=B4=E6=96=B0=EF=BC=8CBu?= =?UTF-8?q?gFix=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts/build.gradle | 2 +- contacts/build.properties | 12 ++-- .../winboll/studio/contacts/MainActivity.java | 12 +++- .../contacts/activities/WinBollActivity.java | 60 ------------------- contacts/src/main/res/values/styles.xml | 4 +- 5 files changed, 20 insertions(+), 70 deletions(-) delete mode 100644 contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java diff --git a/contacts/build.gradle b/contacts/build.gradle index c5f7b9a..99746b5 100644 --- a/contacts/build.gradle +++ b/contacts/build.gradle @@ -29,7 +29,7 @@ android { // versionName 更新后需要手动设置 // 项目模块目录的 build.gradle 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.2" + versionName "15.3" if(true) { versionName = genVersionName("${versionName}") } diff --git a/contacts/build.properties b/contacts/build.properties index ce07783..916ac4b 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun May 04 11:53:33 GMT 2025 -stageCount=8 +#Sun May 04 13:00:39 GMT 2025 +stageCount=0 libraryProject= -baseVersion=15.2 -publishVersion=15.2.7 -buildCount=14 -baseBetaVersion=15.2.8 +baseVersion=15.3 +publishVersion=15.3.0 +buildCount=2 +baseBetaVersion=15.3.1 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java index 3600ab7..86a546d 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java @@ -32,7 +32,6 @@ import cc.winboll.studio.contacts.fragments.CallLogFragment; import cc.winboll.studio.contacts.fragments.ContactsFragment; import cc.winboll.studio.contacts.fragments.LogFragment; import cc.winboll.studio.contacts.services.MainService; -import cc.winboll.studio.libaes.winboll.APPInfo; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; @@ -95,6 +94,17 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct // return null; // } + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + @Override protected void onCreate(Bundle savedInstanceState) { // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java deleted file mode 100644 index dc91382..0000000 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java +++ /dev/null @@ -1,60 +0,0 @@ -package cc.winboll.studio.contacts.activities; - -/** - * @Author ZhanGSKen@AliYun.Com - * @Date 2025/03/31 15:16:45 - * @Describe 应用窗口基类 - */ -import android.app.Activity; -import android.os.Bundle; -import android.view.MenuItem; -import androidx.appcompat.app.AppCompatActivity; -import cc.winboll.studio.libaes.beans.AESThemeBean; -import cc.winboll.studio.libaes.utils.AESThemeUtil; -import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; - -public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity { - - public static final String TAG = "WinBoLLActivity"; - - protected volatile AESThemeBean.ThemeType mThemeType; - - @Override - public Activity getActivity() { - return this; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - mThemeType = getThemeType(); - setThemeStyle(); - super.onCreate(savedInstanceState); - } - - AESThemeBean.ThemeType getThemeType() { - /*SharedPreferences sharedPreferences = getSharedPreferences( - SHAREDPREFERENCES_NAME, MODE_PRIVATE); - return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))]; - */ - return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext())); - } - - void setThemeStyle() { - //setTheme(AESThemeBean.getThemeStyle(getThemeType())); - setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext())); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if(item.getItemId() == android.R.id.home) { - finish(); - return true; - } - return super.onOptionsItemSelected(item); - } -} diff --git a/contacts/src/main/res/values/styles.xml b/contacts/src/main/res/values/styles.xml index 8380acf..b9fe8d7 100644 --- a/contacts/src/main/res/values/styles.xml +++ b/contacts/src/main/res/values/styles.xml @@ -1,6 +1,6 @@ - -