From 934d54963a0444de4e1cb91179118bfcd5c2d483 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 30 May 2025 09:42:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=89=93=E5=BC=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +-- .../winboll/studio/appbase/MainActivity.java | 8 ++--- .../appbase/activities/New2Activity.java | 4 --- .../appbase/activities/NewActivity.java | 4 --- .../appbase/activities/WinBoLLActivity.java | 15 ++++++++++ appbase/src/main/res/layout/activity_main.xml | 6 ---- libappbase/build.properties | 4 +-- .../winboll/WinBoLLActivityManager.java | 29 +++++++++++++++++++ 8 files changed, 50 insertions(+), 24 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 34e5a97..c4bba31 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri May 30 01:04:53 GMT 2025 +#Fri May 30 01:41:12 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.8 publishVersion=15.8.1 -buildCount=7 +buildCount=12 baseBetaVersion=15.8.2 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 8618ea5..0b3a8a4 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -40,7 +40,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity { } Toolbar mToolbar; - LogView mLogView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -53,8 +52,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity { CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1); cbIsDebugMode.setChecked(GlobalApplication.isDebuging()); - mLogView = findViewById(R.id.logview); - mLogView.start(); } @Override @@ -175,8 +172,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity { @Override protected void onResume() { super.onResume(); - mLogView.start(); } - - + + } 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 index 9876ea3..da5178c 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java @@ -71,10 +71,6 @@ public class New2Activity extends WinBoLLActivity implements IWinBoLLActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { - //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this); - return true; - } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 return super.onOptionsItemSelected(item); } 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 d148c4f..429cdcd 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 @@ -69,10 +69,6 @@ public class NewActivity extends WinBoLLActivity implements IWinBoLLActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { - //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this); - return true; - } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 return super.onOptionsItemSelected(item); } diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java index 3071f98..648d96a 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java @@ -6,6 +6,9 @@ package cc.winboll.studio.appbase.activities; * @Describe WinBoLL 窗口基础类 */ import android.app.Activity; +import android.view.MenuItem; +import cc.winboll.studio.appbase.R; +import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; public class WinBoLLActivity extends Activity implements IWinBoLLActivity { @@ -21,4 +24,16 @@ public class WinBoLLActivity extends Activity implements IWinBoLLActivity { public String getTag() { return TAG; } + + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.item_log) { + GlobalApplication.getWinBoLLActivityManager().startLogActivity(this); + return true; + } + // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 + return super.onOptionsItemSelected(item); + } + } diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml index 64a90a4..b268f28 100644 --- a/appbase/src/main/res/layout/activity_main.xml +++ b/appbase/src/main/res/layout/activity_main.xml @@ -217,11 +217,5 @@ - - - diff --git a/libappbase/build.properties b/libappbase/build.properties index 34e5a97..c4bba31 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri May 30 01:04:53 GMT 2025 +#Fri May 30 01:41:12 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.8 publishVersion=15.8.1 -buildCount=7 +buildCount=12 baseBetaVersion=15.8.2 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java index 8442ded..a00661d 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java @@ -24,7 +24,9 @@ public class WinBoLLActivityManager { public static final String TAG = "IWinBoLLActivityManager"; + public static final String EXTRA_TAG = "EXTRA_TAG"; + public enum WinBoLLUI_TYPE { Aplication, Service } Context mContext; @@ -112,6 +114,33 @@ public class WinBoLLActivityManager { LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } } + + public void startLogActivity(Context context) { + // 如果窗口已存在就重启窗口 + String tag = LogActivity.TAG; + if (isActive(tag)) { + resumeActivity(context, tag); + return; + } + + // 新建一个任务窗口 + Intent intent = new Intent(context, LogActivity.class); + //打开多任务窗口 flags + // Define the bounds. +// Rect bounds = new Rect(0, 0, 800, 200); +// // Set the bounds as an activity option. +// ActivityOptions options = ActivityOptions.makeBasic(); +// options.setLaunchBounds(bounds); + intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); + intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + + intent.putExtra(EXTRA_TAG, tag); + + //context.startActivity(intent, options.toBundle()); + context.startActivity(intent); + } /** * 判断 tag绑定的 MyActivity是否存在