diff --git a/appbase/build.properties b/appbase/build.properties index 2e5f008..fb4a17b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Mar 27 04:31:35 GMT 2025 +#Thu Mar 27 06:34:28 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=103 +buildCount=116 baseBetaVersion=15.1.1 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 e870ea3..bb5fd9b 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -74,6 +74,8 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { WinBollActivityManager.getInstance(this).startLogActivity(this); return true; + } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { + moveTaskToBack(true); } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 return super.onOptionsItemSelected(item); 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 a322390..b7adf3e 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 @@ -8,6 +8,9 @@ package cc.winboll.studio.appbase.activities; import android.app.Activity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; @@ -17,6 +20,7 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity public static final String TAG = "New2Activity"; + Toolbar mToolbar; //LogView mLogView; @Override @@ -36,6 +40,9 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity // mLogView = findViewById(R.id.logview); // mLogView.start(); + mToolbar = findViewById(R.id.toolbar); + setSupportActionBar(mToolbar); + } @Override @@ -55,4 +62,24 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity public void onNewActivity(View view) { WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class); } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.toolbar_main, menu); + getMenuInflater().inflate(R.menu.toolbar_appbase, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { + WinBollActivityManager.getInstance(this).startLogActivity(this); + return true; + } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { + moveTaskToBack(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 d44f864..f9059cf 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 @@ -7,6 +7,9 @@ package cc.winboll.studio.appbase.activities; import android.app.Activity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; @@ -16,6 +19,7 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity { public static final String TAG = "NewActivity"; + Toolbar mToolbar; //LogView mLogView; @Override @@ -34,6 +38,9 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity { setContentView(R.layout.activity_new); // mLogView = findViewById(R.id.logview); // mLogView.start(); + mToolbar = findViewById(R.id.toolbar); + setSupportActionBar(mToolbar); + } @Override @@ -53,4 +60,24 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity { public void onNew2Activity(View view) { WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class); } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.toolbar_main, menu); + getMenuInflater().inflate(R.menu.toolbar_appbase, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { + WinBollActivityManager.getInstance(this).startLogActivity(this); + return true; + } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { + moveTaskToBack(true); + } + // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 + return super.onOptionsItemSelected(item); + } } diff --git a/appbase/src/main/res/layout/activity_new.xml b/appbase/src/main/res/layout/activity_new.xml index 8a1452a..0917de8 100644 --- a/appbase/src/main/res/layout/activity_new.xml +++ b/appbase/src/main/res/layout/activity_new.xml @@ -6,11 +6,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + - void add(T iWinBoll) { - if (isActive(iWinBoll.getTag())) { + String tag = ((IWinBollActivity)iWinBoll).getTag(); + LogUtils.d(TAG, String.format("add(T iWinBoll) tag is %s", tag)); + if (isActive(tag)) { LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag())); } else { // 设置起始活动窗口，以便最后退出时提问 @@ -94,7 +96,8 @@ public class WinBollActivityManager { public void startWinBollActivity(Context context, Class clazz) { try { // 如果窗口已存在就重启窗口 - String tag = clazz.newInstance().getTag(); + String tag = ((IWinBollActivity)clazz.newInstance()).getTag(); + LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Class clazz) tag is %s", tag)); if (isActive(tag)) { resumeActivity(context, tag); return; @@ -117,7 +120,8 @@ public class WinBollActivityManager { public void startWinBollActivity(Context context, Intent intent, Class clazz) { try { // 如果窗口已存在就重启窗口 - String tag = clazz.newInstance().getTag(); + String tag = ((IWinBollActivity)clazz.newInstance()).getTag(); + LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Intent intent, Class clazz) tag is %s", tag)); if (isActive(tag)) { resumeActivity(context, tag); return; @@ -171,10 +175,11 @@ public class WinBollActivityManager { // 判断 tag绑定的 MyActivity是否存在 // public boolean isActive(String tag) { - printIWinBollListInfo(); + LogUtils.d(TAG, String.format("isActive(String tag) tag is %s", tag)); + //printIWinBollListInfo(); IWinBollActivity iWinBoll = getIWinBoll(tag); if (iWinBoll != null) { - LogUtils.d(TAG, "isActive(...) activity != null tag " + tag); + //LogUtils.d(TAG, "isActive(...) activity != null tag " + tag); //ToastUtils.show("activity != null tag " + tag); //判断是否为 BaseActivity,如果已经销毁，则移除 if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) { @@ -187,12 +192,13 @@ public class WinBollActivityManager { return true; } } else { - LogUtils.d(TAG, String.format("isActive(...) activity == null\ntag : %s", tag)); + LogUtils.d(TAG, String.format("isActive(...) iWinBoll is null tag by %s", tag)); return false; } } static IWinBollActivity getIWinBoll(String tag) { + LogUtils.d(TAG, String.format("getIWinBoll(String tag) %s", tag)); return _mapIWinBollList.get(tag); } @@ -200,7 +206,7 @@ public class WinBollActivityManager { // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 // public void resumeActivity(Context context, String tag) { - LogUtils.d(TAG, "resumeActivty"); + LogUtils.d(TAG, "resumeActivity(Context context, String tag)"); T iWinBoll = (T)getIWinBoll(tag); //LogUtils.d(TAG, "activity " + activity.getTag()); if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) { @@ -212,6 +218,7 @@ public class WinBollActivityManager { // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 // public void resumeActivity(Context context, T iWinBoll) { + LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)"); ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE); //返回启动它的根任务（home 或者 MainActivity） Intent intent = new Intent(context, iWinBoll.getClass()); @@ -219,7 +226,6 @@ public class WinBollActivityManager { stackBuilder.addNextIntentWithParentStack(intent); stackBuilder.startActivities(); //moveTaskToFront(YourTaskId, 0); - LogUtils.d(TAG, "am.moveTaskToFront"); //ToastUtils.show("resumeActivity am.moveTaskToFront"); am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION); }