diff --git a/appbase/build.properties b/appbase/build.properties index ddd961c..4f2f52e 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jun 01 06:01:20 GMT 2025 +#Sun Jun 01 07:01:34 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.8 publishVersion=15.8.1 -buildCount=31 +buildCount=45 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 0802ddb..0b3a8a4 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -166,7 +166,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity { } public void onTestOpenNewActivity(View view) { - GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(NewActivity.class); + GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class); } @Override 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 689a05c..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 @@ -59,7 +59,7 @@ public class New2Activity extends WinBoLLActivity implements IWinBoLLActivity { } public void onNewActivity(View view) { - GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(NewActivity.class); + GlobalApplication.getWinBoLLActivityManager().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 1c5c2f4..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 @@ -57,7 +57,7 @@ public class NewActivity extends WinBoLLActivity implements IWinBoLLActivity { } public void onNew2Activity(View view) { - GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(New2Activity.class); + GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, New2Activity.class); } 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 63c405e..453af98 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 @@ -8,8 +8,10 @@ package cc.winboll.studio.appbase.activities; import android.app.Activity; import android.os.Bundle; import android.view.MenuItem; +import cc.winboll.studio.appbase.MainActivity; import cc.winboll.studio.appbase.R; import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; public class WinBoLLActivity extends Activity implements IWinBoLLActivity { @@ -26,11 +28,19 @@ public class WinBoLLActivity extends Activity implements IWinBoLLActivity { return TAG; } + @Override + protected void onResume() { + super.onResume(); + LogUtils.d(TAG, String.format("onResume %s", getTag())); + } @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.item_log) { - GlobalApplication.getWinBoLLActivityManager().startLogActivity(); + GlobalApplication.getWinBoLLActivityManager().startLogActivity(this); + return true; + } else if (item.getItemId() == R.id.item_home) { + GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class); return true; } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 diff --git a/appbase/src/main/res/menu/toolbar_main.xml b/appbase/src/main/res/menu/toolbar_main.xml index 7d2cfeb..7fac644 100644 --- a/appbase/src/main/res/menu/toolbar_main.xml +++ b/appbase/src/main/res/menu/toolbar_main.xml @@ -1,6 +1,10 @@ + void startWinBoLLActivity(Class clazz) { + public void startWinBoLLActivity(Context context, Class clazz) { // 如果窗口已存在就重启窗口 if (!resumeActivity(clazz)) { // 新建一个任务窗口 - Intent intent = new Intent(mContext, clazz); + Intent intent = new Intent(context, clazz); //打开多任务窗口 flags intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); //intent.putExtra("tag", tag); - mContext.startActivity(intent); + context.startActivity(intent); } } - public void startWinBoLLActivity(Intent intent, Class clazz) { + public void startWinBoLLActivity(Context context, Intent intent, Class clazz) { // 如果窗口已存在就重启窗口 if (!resumeActivity(clazz)) { // 新建一个任务窗口 @@ -95,31 +95,31 @@ public class WinBoLLActivityManager { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); //intent.putExtra("tag", tag); - mContext.startActivity(intent); + context.startActivity(intent); } } - public void startLogActivity() { + public void startLogActivity(Context context) { // 如果窗口已存在就重启窗口 - if (!resumeActivity(LogActivity.class)) { - // 新建一个任务窗口 - Intent intent = new Intent(mContext, LogActivity.class); - //打开多任务窗口 flags - // Define the bounds. + //if (!resumeActivity(LogActivity.class)) { + // 新建一个任务窗口 + 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.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); + //intent.putExtra(EXTRA_TAG, tag); - //context.startActivity(intent, options.toBundle()); - mContext.startActivity(intent); - } + //context.startActivity(intent, options.toBundle()); + context.startActivity(intent); + //} } //