Studio/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

应用退出按钮调试完成，添加日志窗口调动响应。

Browse Source
This commit is contained in:
ZhanGSKen
2025-01-20 12:50:22 +08:00
parent de6361b19b
commit af2e09c02a
6 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apputils/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Mon Jan 20 03:06:12 GMT 2025 #Mon Jan 20 04:46:17 GMT 2025
stageCount=2 stageCount=2
libraryProject=libapputils libraryProject=libapputils
baseVersion=9.2 baseVersion=9.2
publishVersion=9.2.1 publishVersion=9.2.1
buildCount=1 buildCount=15
baseBetaVersion=9.2.2 baseBetaVersion=9.2.2

11
apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
View File

@@ -50,10 +50,13 @@ final public class MainActivity extends WinBollActivity {
} }
public void onLogUtilsClick(View view) { public void onLogUtilsClick(View view) {
Intent intent = new Intent(this, LogActivity.class); // Intent intent = new Intent(this, LogActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); // intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); // intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
startActivity(intent); // startActivity(intent);
//WinBollActivityManager.getInstance().printAvtivityListInfo();
WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
} }
@Override @Override

4
libapputils/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Mon Jan 20 03:06:12 GMT 2025 #Mon Jan 20 04:46:17 GMT 2025
stageCount=2 stageCount=2
libraryProject=libapputils libraryProject=libapputils
baseVersion=9.2 baseVersion=9.2
publishVersion=9.2.1 publishVersion=9.2.1
buildCount=1 buildCount=15
baseBetaVersion=9.2.2 baseBetaVersion=9.2.2

10
libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivity.java
View File

@@ -366,10 +366,16 @@ abstract public class WinBollActivity extends AppCompatActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
LogUtils.d(TAG, "onOptionsItemSelected"); LogUtils.d(TAG, "onOptionsItemSelected");
if (item.getItemId() == R.id.item_log) { if (item.getItemId() == R.id.item_log) {
LogUtils.d(TAG, "item_log not yet."); // LogUtils.d(TAG, "item_log not yet.");
// Intent intent = new Intent(this, LogActivity.class);
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
// startActivity(intent);
//WinBollActivityManager.getInstance().printAvtivityListInfo(); //WinBollActivityManager.getInstance().printAvtivityListInfo();
//WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class); WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
} else if (item.getItemId() == R.id.item_exit) { } else if (item.getItemId() == R.id.item_exit) {
//ToastUtils.show("item_exit");
WinBollActivityManager.getInstance(this).finishAll(); WinBollActivityManager.getInstance(this).finishAll();
} else if (item.getItemId() == R.id.item_info) { } else if (item.getItemId() == R.id.item_info) {
WinBollApplication application = (WinBollApplication) getApplication(); WinBollApplication application = (WinBollApplication) getApplication();

41
libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java
View File

@@ -13,6 +13,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import androidx.core.app.TaskStackBuilder; import androidx.core.app.TaskStackBuilder;
import cc.winboll.studio.libapputils.log.LogUtils; import cc.winboll.studio.libapputils.log.LogUtils;
import com.hjq.toast.ToastUtils;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
@@ -175,26 +176,26 @@ public class WinBollActivityManager {
*/ */
public void finishAll() { public void finishAll() {
try { try {
LogUtils.d(TAG, "finishAll no yet."); for (String key : _mapActivityList.keySet()) {
//ToastUtils.show(String.format("finishAll() size : %d", _mWinBollActivityList.size())); //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
// for (int i = _mWinBollActivityList.size() - 1; i > -1; i--) { WinBollActivity activity = _mapActivityList.get(key);
// WinBollActivity activity = _mWinBollActivityList.get(i); //ToastUtils.show("finishAll() activity");
// ToastUtils.show("finishAll() activity"); if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
// if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) { //ToastUtils.show("activity != null ...");
// //ToastUtils.show("activity != null ..."); if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Service) {
// if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Service) { // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
// // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。 activity.finishAndRemoveTask();
// activity.finishAndRemoveTask(); //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
// //ToastUtils.show("finishAll() activity.finishAndRemoveTask();"); } else if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Aplication) {
// } else if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Aplication) { // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
// // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。 activity.finish();
// activity.finish(); //ToastUtils.show("finishAll() activity.finish();");
// //ToastUtils.show("finishAll() activity.finish();"); } else {
// } else { LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
// ToastUtils.show("WinBollApplication.WinBollUI_TYPE error."); //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
// } }
// } }
// } }
} catch (Exception e) { } catch (Exception e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
} }

35
libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java
View File

@@ -1,30 +1,41 @@
package cc.winboll.studio.libapputils.log; package cc.winboll.studio.libapputils.log;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.libapputils.R; import cc.winboll.studio.libapputils.R;
import cc.winboll.studio.libapputils.app.WinBollActivity; import cc.winboll.studio.libapputils.app.WinBollActivity;
import cc.winboll.studio.libapputils.ads.ADsView;
import cc.winboll.studio.libapputils.app.WinBollApplication; import cc.winboll.studio.libapputils.app.WinBollApplication;
import android.view.View; import androidx.appcompat.widget.Toolbar;
import android.app.Activity;
/** /**
* @Author ZhanGSKen@QQ.COM * @Author ZhanGSKen@QQ.COM
* @Date 2024/08/12 15:07:58 * @Date 2024/08/12 15:07:58
* @Describe WinBoll 应用日志窗口 * @Describe WinBoll 应用日志窗口
*/ */
public class LogActivity extends Activity { public class LogActivity extends WinBollActivity {
public static final String TAG = "LogActivity"; public static final String TAG = "LogActivity";
LogView mLogView; LogView mLogView;
//ADsView mADsView;
// @Override @Override
// protected boolean isEnableDisplayHomeAsUp() { public String getTag() {
// return false; return TAG;
// } }
@Override
protected Toolbar initToolBar() {
return null;
}
@Override
protected boolean isEnableDisplayHomeAsUp() {
return false;
}
@Override
protected boolean isAddWinBollToolBar() {
return false;
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -36,8 +47,8 @@ public class LogActivity extends Activity {
//mADsView.loadUrl("https://www.winboll.cc"); //mADsView.loadUrl("https://www.winboll.cc");
//mLogView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE); //mLogView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE);
//mADsView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE); //mADsView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE);
if(WinBollApplication.isDebug()) { mLogView.start(); } if (WinBollApplication.isDebug()) { mLogView.start(); }
} }
@Override @Override