From ccdb9c5abdf7e1f5b4615149f7762983d52eb70a Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 19 Jun 2025 21:14:22 +0800 Subject: [PATCH] =?UTF-8?q?UI=E7=BE=8E=E5=8C=96=EF=BC=8C=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.gradle | 6 ++-- powerbell/build.properties | 4 +-- .../studio/powerbell/MainActivity.java | 29 ++++++++++++++----- .../powerbell/activities/WinBoLLActivity.java | 20 +++++++++++++ .../src/main/res/layout/activity_main.xml | 6 ---- .../src/main/res/layout/fragment_mainview.xml | 24 +++++++++------ powerbell/src/main/res/menu/toolbar_main.xml | 3 ++ 7 files changed, 64 insertions(+), 28 deletions(-) create mode 100644 powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java diff --git a/powerbell/build.gradle b/powerbell/build.gradle index 22d7603..9e8f4f3 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -45,9 +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' + api 'cc.winboll.studio:libaes:15.8.0' + api 'cc.winboll.studio:libapputils:15.8.2' + api 'cc.winboll.studio:libappbase:15.8.2' // 吐司提示库 api 'com.github.getActivity:ToastUtils:10.5' diff --git a/powerbell/build.properties b/powerbell/build.properties index 0bfc721..b1c694e 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jun 19 10:22:12 HKT 2025 +#Thu Jun 19 13:11:30 GMT 2025 stageCount=3 libraryProject= baseVersion=15.4 publishVersion=15.4.2 -buildCount=0 +buildCount=5 baseBetaVersion=15.4.3 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java index 3e7527b..faa9c5d 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java @@ -1,6 +1,5 @@ package cc.winboll.studio.powerbell; -import android.app.Activity; import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Intent; @@ -13,20 +12,22 @@ import android.view.MenuItem; import android.widget.Toast; import cc.winboll.studio.libaes.views.AToolbar; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.powerbell.MainActivity; import cc.winboll.studio.powerbell.activities.AboutActivity; import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity; import cc.winboll.studio.powerbell.activities.BatteryReporterActivity; import cc.winboll.studio.powerbell.activities.ClearRecordActivity; +import cc.winboll.studio.powerbell.activities.WinBoLLActivity; import cc.winboll.studio.powerbell.fragments.MainViewFragment; +import android.app.Activity; -public class MainActivity extends Activity { +public class MainActivity extends WinBoLLActivity { + public static final String TAG = "MainActivity"; public static final int BACKGROUND_PICTURE_REQUEST_CODE = 0; public static MainActivity _mMainActivity; - LogView mLogView; + //LogView mLogView; //ArrayList mlistFragment; App mApplication; //AppConfigUtils mAppConfigUtils; @@ -35,6 +36,16 @@ public class MainActivity extends Activity { MainViewFragment mMainViewFragment; AToolbar mAToolbar; + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + @Override protected void onCreate(Bundle savedInstanceState) { //LogUtils.d(TAG, "onCreate(...)"); @@ -42,10 +53,10 @@ public class MainActivity extends Activity { setContentView(R.layout.activity_main); // 设置调试日志 - mLogView = findViewById(R.id.logview); - mLogView.start(); - //LogUtils.d(TAG, "LogView Start."); - mLogView.updateLogView(); +// mLogView = findViewById(R.id.logview); +// mLogView.start(); +// //LogUtils.d(TAG, "LogView Start."); +// mLogView.updateLogView(); _mMainActivity = MainActivity.this; mApplication = (App) getApplication(); @@ -157,6 +168,8 @@ public class MainActivity extends Activity { Intent intent = new Intent(); intent.setClass(this, BackgroundPictureActivity.class); startActivity(intent); + } else if (menuItemId == R.id.action_log) { + App.getWinBoLLActivityManager().startLogActivity(this); } return true; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java new file mode 100644 index 0000000..bb422cc --- /dev/null +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java @@ -0,0 +1,20 @@ +package cc.winboll.studio.powerbell.activities; + +import android.app.Activity; +import android.os.Bundle; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; + +/** + * @Author ZhanGSKen + * @Date 2025/06/19 20:35 + * @Describe 应用窗口基类 + */ +public abstract class WinBoLLActivity extends Activity implements IWinBoLLActivity { + + public static final String TAG = "WinBoLLActivity"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } +} diff --git a/powerbell/src/main/res/layout/activity_main.xml b/powerbell/src/main/res/layout/activity_main.xml index 874c31a..213ee82 100644 --- a/powerbell/src/main/res/layout/activity_main.xml +++ b/powerbell/src/main/res/layout/activity_main.xml @@ -33,11 +33,5 @@ - - diff --git a/powerbell/src/main/res/layout/fragment_mainview.xml b/powerbell/src/main/res/layout/fragment_mainview.xml index 7d530e1..1c5b33c 100644 --- a/powerbell/src/main/res/layout/fragment_mainview.xml +++ b/powerbell/src/main/res/layout/fragment_mainview.xml @@ -43,15 +43,6 @@ - - + + + + + + diff --git a/powerbell/src/main/res/menu/toolbar_main.xml b/powerbell/src/main/res/menu/toolbar_main.xml index dce9de9..77ba849 100644 --- a/powerbell/src/main/res/menu/toolbar_main.xml +++ b/powerbell/src/main/res/menu/toolbar_main.xml @@ -9,6 +9,9 @@ +