diff --git a/contacts/build.gradle b/contacts/build.gradle index 2fb0f2b..c5f7b9a 100644 --- a/contacts/build.gradle +++ b/contacts/build.gradle @@ -45,6 +45,9 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) + api 'cc.winboll.studio:libaes:15.6.0' + api 'cc.winboll.studio:libapputils:15.3.4' + api 'cc.winboll.studio:libappbase:15.7.6' // 权限请求框架：https://github.com/getActivity/XXPermissions api 'com.github.getActivity:XXPermissions:18.63' @@ -81,8 +84,4 @@ dependencies { //api 'androidx.vectordrawable:vectordrawable:1.1.0' //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.fragment:fragment:1.1.0' - - api 'cc.winboll.studio:libaes:15.2.4' - api 'cc.winboll.studio:libapputils:15.2.1' - api 'cc.winboll.studio:libappbase:15.2.2' } diff --git a/contacts/build.properties b/contacts/build.properties index 0272881..ce07783 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Apr 14 12:09:37 GMT 2025 +#Sun May 04 11:53:33 GMT 2025 stageCount=8 libraryProject= baseVersion=15.2 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/App.java b/contacts/src/main/java/cc/winboll/studio/contacts/App.java index c5a8621..c252442 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/App.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/App.java @@ -7,7 +7,7 @@ package cc.winboll.studio.contacts; */ import android.view.Gravity; import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; +import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager; import com.hjq.toast.ToastUtils; public class App extends GlobalApplication { @@ -20,8 +20,8 @@ public class App extends GlobalApplication { // 这样可以预先设置日志与数据的存储根目录。 //setIsDebuging(BuildConfig.DEBUG); super.onCreate(); - // 设置 WinBoll 应用 UI 类型 - WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication); + // 设置 WinBoLL 应用 UI 类型 + getWinBoLLActivityManager().setWinBoLLUI_TYPE(WinBoLLActivityManager.WinBoLLUI_TYPE.Aplication); //LogUtils.d(TAG, "onCreate"); 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 c2de167..3600ab7 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java @@ -35,19 +35,19 @@ 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; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import com.google.android.material.tabs.TabLayout; import java.util.ArrayList; import java.util.List; -final public class MainActivity extends AppCompatActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener { +final public class MainActivity extends AppCompatActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener { public static final String TAG = "MainActivity"; public static final int REQUEST_HOME_ACTIVITY = 0; public static final int REQUEST_ABOUT_ACTIVITY = 1; - public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS"; + public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoLL.ACTION_SOS"; static MainActivity _MainActivity; LogView mLogView; @@ -71,10 +71,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct private static final int DIALER_REQUEST_CODE = 1; - @Override - public Activity getActivity() { - return this; - } +// @Override +// public Activity getActivity() { +// return this; +// } // @Override // public APPInfo getAppInfo() { @@ -111,7 +111,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct // // 显示后退按钮 // getSupportActionBar().setDisplayHomeAsUpEnabled(true); // } - getSupportActionBar().setSubtitle(getTag()); + getSupportActionBar().setSubtitle(TAG); tabLayout = findViewById(R.id.tabLayout); viewPager = findViewById(R.id.viewPager); @@ -339,7 +339,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct // // if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) { // try { -// WinBollActivity clazzActivity = UnitTestActivity.class.newInstance(); +// WinBoLLActivity clazzActivity = UnitTestActivity.class.newInstance(); // String tag = clazzActivity.getTag(); // LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag); // Intent subIntent = new Intent(this, UnitTestActivity.class); @@ -357,8 +357,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct // } // // Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath())); -// //startWinBollActivity(subIntent, tag); -// WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class); +// //startWinBoLLActivity(subIntent, tag); +// WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class); // } catch (IllegalAccessException | InstantiationException | IOException e) { // LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); // // 函数处理异常返回失败 @@ -371,10 +371,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct // return true; // } - @Override - public String getTag() { - return TAG; - } +// @Override +// public String getTag() { +// return TAG; +// } // @Override // public void onBackPressed() { @@ -386,7 +386,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct // // @Override // public void onYes() { -// WinBollActivityManager.getInstance(getApplicationContext()).finishAll(); +// WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll(); // } // // @Override @@ -408,7 +408,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct if (item.getItemId() == R.id.item_settings) { Intent intent = new Intent(this, SettingsActivity.class); startActivity(intent); - //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class); + //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, CallActivity.class); } // } else // if (item.getItemId() == R.id.item_exit) { diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java index 453062b..04cd69e 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java @@ -15,9 +15,9 @@ import cc.winboll.studio.contacts.R; import cc.winboll.studio.libaes.winboll.APPInfo; import cc.winboll.studio.libaes.winboll.AboutView; import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; -public class AboutActivity extends WinBollActivity implements IWinBollActivity { +public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity { public static final String TAG = "AboutActivity"; @@ -64,13 +64,13 @@ public class AboutActivity extends WinBollActivity implements IWinBollActivity { ); layout.addView(aboutView, params); - GlobalApplication.getWinBollActivityManager().add(this); + GlobalApplication.getWinBoLLActivityManager().add(this); } @Override protected void onDestroy() { super.onDestroy(); - GlobalApplication.getWinBollActivityManager().registeRemove(this); + GlobalApplication.getWinBoLLActivityManager().registeRemove(this); } public AboutView CreateAboutView() { diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java index 03fb968..776dc11 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java @@ -36,12 +36,12 @@ import cc.winboll.studio.contacts.dun.Rules; import cc.winboll.studio.contacts.services.MainService; import cc.winboll.studio.contacts.views.DuInfoTextView; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import com.hjq.toast.ToastUtils; import java.lang.reflect.Field; import java.util.List; -public class SettingsActivity extends AppCompatActivity implements IWinBollActivity { +public class SettingsActivity extends AppCompatActivity implements IWinBoLLActivity { public static final String TAG = "SettingsActivity"; @@ -323,6 +323,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv } public void onAbout(View view) { - App.getWinBollActivityManager().startWinBollActivity(this, AboutActivity.class); + App.getWinBoLLActivityManager().startWinBoLLActivity(this, AboutActivity.class); } } 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 new file mode 100644 index 0000000..dc91382 --- /dev/null +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBoLLActivity.java @@ -0,0 +1,60 @@ +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/java/cc/winboll/studio/contacts/activities/WinBollActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java index c54650e..dc91382 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java @@ -11,11 +11,11 @@ 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; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; -public class WinBollActivity extends AppCompatActivity implements IWinBollActivity { +public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity { - public static final String TAG = "WinBollActivity"; + public static final String TAG = "WinBoLLActivity"; protected volatile AESThemeBean.ThemeType mThemeType; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java index f61cde5..cb1354d 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java @@ -31,7 +31,7 @@ import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.sos.SOS; import java.util.Timer; import java.util.TimerTask; -import cc.winboll.studio.libappbase.sos.WinBoll; +import cc.winboll.studio.libappbase.sos.WinBoLL; import cc.winboll.studio.contacts.App; import cc.winboll.studio.libappbase.sos.APPModel; @@ -129,11 +129,11 @@ public class MainService extends Service { isServiceRunning = true; // 唤醒守护进程 wakeupAndBindAssistant(); - // 召唤 WinBoll APP 绑定本服务 + // 召唤 WinBoLL APP 绑定本服务 if (App.isDebuging()) { - WinBoll.bindToAPPBaseBeta(this, MainService.class.getName()); + WinBoLL.bindToAPPBaseBeta(this, MainService.class.getName()); } else { - WinBoll.bindToAPPBase(this, MainService.class.getName()); + WinBoLL.bindToAPPBase(this, MainService.class.getName()); } // 初始化服务运行参数 diff --git a/contacts/src/main/res/values/colors.xml b/contacts/src/main/res/values/colors.xml index 063cdb0..5b13816 100644 --- a/contacts/src/main/res/values/colors.xml +++ b/contacts/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - + #FF196ABC #FF002B57 #FF80BFFF