From f3ef7226d8cce318721bd72f47ea6e4d2959b185 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 25 Mar 2025 20:59:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E8=AF=95=E6=A1=86?= =?UTF-8?q?=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +- appbase/src/main/AndroidManifest.xml | 8 +-- .../winboll/studio/appbase/MainActivity.java | 53 +++++++++++++---- .../appbase/activities/New2Activity.java | 58 +++++++++++++++++++ .../appbase/activities/NewActivity.java | 31 +++++++--- appbase/src/main/res/layout/activity_main.xml | 7 +-- appbase/src/main/res/layout/activity_new.xml | 9 +++ appbase/src/main/res/layout/activity_new2.xml | 50 ++++++++++++++++ appbase/src/main/res/menu/toolbar_main.xml | 9 +++ libappbase/build.properties | 4 +- libappbase/src/main/AndroidManifest.xml | 9 ++- .../studio/libappbase/GlobalApplication.java | 10 ++-- .../libappbase/winboll/LogActivity.java | 44 ++++++++++++++ .../src/main/res/layout/activity_log.xml | 20 +++---- 14 files changed, 264 insertions(+), 52 deletions(-) create mode 100644 appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java create mode 100644 appbase/src/main/res/layout/activity_new2.xml create mode 100644 appbase/src/main/res/menu/toolbar_main.xml create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java diff --git a/appbase/build.properties b/appbase/build.properties index b0c800f..bbc8b51 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 21:28:41 GMT 2025 +#Tue Mar 25 12:59:12 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=12 +buildCount=41 baseBetaVersion=15.0.11 diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml index 19f89ca..2e4b180 100644 --- a/appbase/src/main/AndroidManifest.xml +++ b/appbase/src/main/AndroidManifest.xml @@ -13,7 +13,6 @@ @@ -106,10 +105,9 @@ android:name="android.max_aspect" android:value="4.0"/> - + + + diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index b2b5842..e15b13d 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -19,12 +19,15 @@ import cc.winboll.studio.libappbase.sos.SOS; import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.LogActivity; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; +import android.view.Menu; +import android.view.MenuItem; public class MainActivity extends Activity implements IWinBollActivity { public static final String TAG = "MainActivity"; - + @Override public Activity getActivity() { return this; @@ -36,7 +39,7 @@ public class MainActivity extends Activity implements IWinBollActivity { } Toolbar mToolbar; - LogView mLogView; + //LogView mLogView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -49,14 +52,32 @@ public class MainActivity extends Activity implements IWinBollActivity { CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1); cbIsDebugMode.setChecked(GlobalApplication.isDebuging()); - mLogView = findViewById(R.id.activitymainLogView1); + //mLogView = findViewById(R.id.activitymainLogView1); - if (GlobalApplication.isDebuging()) { - mLogView.start(); - ToastUtils.show("LogView start."); - } +// if (GlobalApplication.isDebuging()) { +// mLogView.start(); +// ToastUtils.show("LogView start."); +// } } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.toolbar_main, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { + onLogActivity(); + return true; + } + // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 + return super.onOptionsItemSelected(item); + } + + + @Override protected void onDestroy() { super.onDestroy(); @@ -67,9 +88,9 @@ public class MainActivity extends Activity implements IWinBollActivity { @Override protected void onResume() { - LogUtils.d(TAG, "onResume"); + //LogUtils.d(TAG, "onResume"); super.onResume(); - mLogView.start(); + //mLogView.start(); } public void onSwitchDebugMode(View view) { @@ -155,8 +176,20 @@ public class MainActivity extends Activity implements IWinBollActivity { Intent intent = new Intent(this, TestDemoBindService.class); stopService(intent); } - + public void onTestOpenNewActivity(View view) { WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class); } + + public void onLogActivity() { + Intent intent = new Intent(MainActivity.this, LogActivity.class); + //打开多任务窗口 flags +// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); +// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); +// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); +// startActivity(intent); + WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class); + + } } diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java new file mode 100644 index 0000000..0df980f --- /dev/null +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java @@ -0,0 +1,58 @@ +package cc.winboll.studio.appbase.activities; + +/** + * @Author ZhanGSKen@AliYun.Com + * @Date 2025/03/25 11:46:40 + * @Describe 测试窗口2 + */ +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import cc.winboll.studio.appbase.R; +import cc.winboll.studio.libappbase.LogView; +import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; + +public class New2Activity extends Activity implements IWinBollActivity { + + public static final String TAG = "New2Activity"; + + //LogView mLogView; + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_new2); + +// mLogView = findViewById(R.id.logview); +// mLogView.start(); + } + + @Override + protected void onResume() { + super.onResume(); + //mLogView.start(); + } + + public void onCloseThisActivity(View view) { + WinBollActivityManager.getInstance(this).finish(this); + } + + public void onCloseAllActivity(View view) { + WinBollActivityManager.getInstance(this).finishAll(); + } + + public void onNewActivity(View view) { + WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class); + } +} diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java index 289be86..3a7c370 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java @@ -1,20 +1,23 @@ package cc.winboll.studio.appbase.activities; -import android.app.Activity; -import android.os.Bundle; -import android.view.View; -import cc.winboll.studio.appbase.R; -import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; - /** * @Author ZhanGSKen@AliYun.Com * @Date 2025/03/25 05:04:22 */ +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import cc.winboll.studio.appbase.R; +import cc.winboll.studio.libappbase.LogView; +import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; + public class NewActivity extends Activity implements IWinBollActivity { public static final String TAG = "NewActivity"; + //LogView mLogView; + @Override public Activity getActivity() { return this; @@ -29,13 +32,25 @@ public class NewActivity extends Activity implements IWinBollActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_new); +// mLogView = findViewById(R.id.logview); +// mLogView.start(); + } + + @Override + protected void onResume() { + super.onResume(); + //mLogView.start(); } public void onCloseThisActivity(View view) { WinBollActivityManager.getInstance(this).finish(this); } - + public void onCloseAllActivity(View view) { WinBollActivityManager.getInstance(this).finishAll(); } + + public void onNew2Activity(View view) { + WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class); + } } diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml index 0c085fa..81cf153 100644 --- a/appbase/src/main/res/layout/activity_main.xml +++ b/appbase/src/main/res/layout/activity_main.xml @@ -198,11 +198,6 @@ - - - + diff --git a/appbase/src/main/res/layout/activity_new.xml b/appbase/src/main/res/layout/activity_new.xml index a405f12..8a1452a 100644 --- a/appbase/src/main/res/layout/activity_new.xml +++ b/appbase/src/main/res/layout/activity_new.xml @@ -29,6 +29,15 @@ android:text="CloseAllActivity" android:textAllCaps="false" android:onClick="onCloseAllActivity"/> + +