From 32082c4dd03f8f79c6698e081774f9f897836b89 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 24 Mar 2025 08:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99=E6=A8=A1?= =?UTF-8?q?=E5=9D=97,=E5=85=B6=E6=A8=A1=E5=9D=97=E5=B7=B2=E8=BD=AC?= =?UTF-8?q?=E7=A7=BB=E8=87=B3AES=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apputils/build.properties | 4 +- .../java/cc/winboll/studio/apputils/App.java | 14 +- .../winboll/studio/apputils/MainActivity.java | 84 ++--- .../apputils/TestBBMorseCodeActivity.java | 29 +- .../TestStringToQrCodeViewActivity.java | 28 +- libapputils/build.properties | 4 +- .../libapputils/activities/AboutActivity.java | 31 +- .../activities/AssetsHtmlActivity.java | 29 +- .../libapputils/activities/LogActivity.java | 28 +- .../activities/QRCodeDecodeActivity.java | 35 +- .../libapputils/app/IWinBollActivity.java | 23 -- .../app/MyActivityLifecycleCallbacks.java | 98 ------ .../app/WinBollActivityManager.java | 318 ------------------ .../studio/libapputils/view/AboutView.java | 1 - 14 files changed, 48 insertions(+), 678 deletions(-) delete mode 100644 libapputils/src/main/java/cc/winboll/studio/libapputils/app/IWinBollActivity.java delete mode 100644 libapputils/src/main/java/cc/winboll/studio/libapputils/app/MyActivityLifecycleCallbacks.java delete mode 100644 libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java diff --git a/apputils/build.properties b/apputils/build.properties index 8c67a89..856a100 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 08:10:09 HKT 2025 +#Mon Mar 24 00:39:52 GMT 2025 stageCount=11 libraryProject=libapputils baseVersion=15.0 publishVersion=15.0.10 -buildCount=0 +buildCount=4 baseBetaVersion=15.0.11 diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/App.java b/apputils/src/main/java/cc/winboll/studio/apputils/App.java index 59e6796..2382ede 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/App.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/App.java @@ -10,8 +10,6 @@ import android.content.Context; import android.widget.Toast; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libapputils.app.MyActivityLifecycleCallbacks; -import cc.winboll.studio.libapputils.app.WinBollActivityManager; import cc.winboll.studio.libapputils.bean.DebugBean; public class App extends GlobalApplication { @@ -21,7 +19,7 @@ public class App extends GlobalApplication { public static final String _ACTION_DEBUGVIEW = App.class.getName() + "_ACTION_DEBUGVIEW"; //static volatile WinBollApplication _WinBollApplication = null; - MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks; + //MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks; // 标记当前应用是否处于调试状态 static volatile boolean isDebug = false; @@ -34,9 +32,9 @@ public class App extends GlobalApplication { return isDebug; } - MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() { - return mMyActivityLifecycleCallbacks; - } +// MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() { +// return mMyActivityLifecycleCallbacks; +// } @Override public Context getApplicationContext() { @@ -74,8 +72,8 @@ public class App extends GlobalApplication { } // 应用窗口管理模块参数设置 // - mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(); - registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks); + //mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(); + //registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks); // 设置默认 WinBoll 应用 UI 类型 //WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service); //ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE()); diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java index 7d1b245..2d711a7 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java @@ -20,15 +20,13 @@ import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity; import cc.winboll.studio.libapputils.activities.LogActivity; import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity; import cc.winboll.studio.libapputils.app.AboutActivityFactory; -import cc.winboll.studio.libapputils.app.IWinBollActivity; -import cc.winboll.studio.libapputils.app.WinBollActivityManager; import cc.winboll.studio.libapputils.bean.APPInfo; import cc.winboll.studio.libapputils.view.AboutView; import cc.winboll.studio.libapputils.view.YesNoAlertDialog; import java.util.List; import java.util.Set; -final public class MainActivity extends Activity implements IWinBollActivity { +final public class MainActivity extends Activity { public static final String TAG = "MainActivity"; @@ -42,44 +40,24 @@ final public class MainActivity extends Activity implements IWinBollActivity { // return this; // } - @Override - public APPInfo getAppInfo() { - String szBranchName = "apputils"; - - APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo(); - appInfo.setAppName("APPUtils"); - appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); - appInfo.setAppDescription("APPUtils Description"); - appInfo.setAppGitName("APP"); - appInfo.setAppGitOwner("Studio"); - appInfo.setAppGitAPPBranch(szBranchName); - appInfo.setAppGitAPPSubProjectFolder(szBranchName); - appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP"); - appInfo.setAppAPKName("APPUtils"); - appInfo.setAppAPKFolderName("APPUtils"); - return appInfo; - //return null; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - public boolean isAddWinBollToolBar() { - return true; - } - - @Override - public Toolbar initToolBar() { - return findViewById(R.id.activitymainToolbar1); - } - - @Override - public boolean isEnableDisplayHomeAsUp() { - return false; - } +// @Override +// public APPInfo getAppInfo() { +// String szBranchName = "apputils"; +// +// APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo(); +// appInfo.setAppName("APPUtils"); +// appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); +// appInfo.setAppDescription("APPUtils Description"); +// appInfo.setAppGitName("APP"); +// appInfo.setAppGitOwner("Studio"); +// appInfo.setAppGitAPPBranch(szBranchName); +// appInfo.setAppGitAPPSubProjectFolder(szBranchName); +// appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP"); +// appInfo.setAppAPKName("APPUtils"); +// appInfo.setAppAPKFolderName("APPUtils"); +// return appInfo; +// //return null; +// } @Override protected void onCreate(Bundle savedInstanceState) { @@ -92,11 +70,11 @@ final public class MainActivity extends Activity implements IWinBollActivity { // 初始化工具栏 mToolbar = findViewById(R.id.activitymainToolbar1); setActionBar(mToolbar); - if (isEnableDisplayHomeAsUp()) { - // 显示后退按钮 - getActionBar().setDisplayHomeAsUpEnabled(true); - } - getActionBar().setSubtitle(getTag()); +// if (isEnableDisplayHomeAsUp()) { +// // 显示后退按钮 +// getActionBar().setDisplayHomeAsUpEnabled(true); +// } +// getActionBar().setSubtitle(getTag()); checkResolveActivity(); archiveInstance(); @@ -248,10 +226,10 @@ final public class MainActivity extends Activity implements IWinBollActivity { public boolean onCreateOptionsMenu(Menu menu) { //ToastUtils.show("onCreateOptionsMenu"); getMenuInflater().inflate(R.menu.toolbar_main, menu); - if (isAddWinBollToolBar()) { - //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()"); - getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu); - } +// if (isAddWinBollToolBar()) { +// //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()"); +// getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu); +// } if (App.isDebug()) { getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu); } @@ -264,9 +242,9 @@ final public class MainActivity extends Activity implements IWinBollActivity { if (item.getItemId() == R.id.item_exit) { exit(); return true; - } else if (item.getItemId() == R.id.item_about) { - AboutActivityFactory.showAboutActivity(this, getAppInfo()); - return true; +// } else if (item.getItemId() == R.id.item_about) { +// AboutActivityFactory.showAboutActivity(this, getAppInfo()); +// return true; } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) { //WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class); } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) { diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java index 390e541..1781971 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java @@ -6,38 +6,11 @@ package cc.winboll.studio.apputils; */ import android.app.Activity; import android.os.Bundle; -import android.widget.Toolbar; -import cc.winboll.studio.libapputils.app.IWinBollActivity; -import cc.winboll.studio.libapputils.bean.APPInfo; -public class TestBBMorseCodeActivity extends Activity implements IWinBollActivity { +public class TestBBMorseCodeActivity extends Activity { public static final String TAG = "TestBBMorseCodeActivity"; - @Override - public APPInfo getAppInfo() { - return null; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - public Toolbar initToolBar() { - return findViewById(R.id.activityteststringtoqrcodeviewToolbar1); - } - - @Override - public boolean isEnableDisplayHomeAsUp() { - return true; - } - - @Override - public boolean isAddWinBollToolBar() { - return true; - } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java index f209f92..66d01e4 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java @@ -8,11 +8,10 @@ import cc.winboll.studio.apputils.R; import android.app.Activity; import android.os.Bundle; import android.widget.Toolbar; -import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.bean.APPInfo; import cc.winboll.studio.libapputils.view.StringToQrCodeView; -public class TestStringToQrCodeViewActivity extends Activity implements IWinBollActivity { +public class TestStringToQrCodeViewActivity extends Activity { public static final String TAG = "TestStringToQrCodeViewActivity"; @@ -23,31 +22,6 @@ public class TestStringToQrCodeViewActivity extends Activity implements IWinBoll // return this; // } - @Override - public APPInfo getAppInfo() { - return null; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - public Toolbar initToolBar() { - return findViewById(R.id.activityteststringtoqrcodeviewToolbar1); - } - - @Override - public boolean isEnableDisplayHomeAsUp() { - return true; - } - - @Override - public boolean isAddWinBollToolBar() { - return true; - } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/libapputils/build.properties b/libapputils/build.properties index 354f595..856a100 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 08:10:00 HKT 2025 +#Mon Mar 24 00:39:52 GMT 2025 stageCount=11 libraryProject=libapputils baseVersion=15.0 publishVersion=15.0.10 -buildCount=0 +buildCount=4 baseBetaVersion=15.0.11 diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java index fb96bb1..492d6d2 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java @@ -12,20 +12,16 @@ import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; import android.widget.LinearLayout; -import android.widget.Toolbar; import cc.winboll.studio.libapputils.R; -import cc.winboll.studio.libapputils.app.IWinBollActivity; -import cc.winboll.studio.libapputils.app.WinBollActivityManager; import cc.winboll.studio.libapputils.bean.APPInfo; import cc.winboll.studio.libapputils.view.AboutView; -final public class AboutActivity extends Activity implements IWinBollActivity { +final public class AboutActivity extends Activity { public static final String TAG = "AboutActivity"; public static final String EXTRA_APPINFO = "EXTRA_APPINFO"; - APPInfo mAPPInfo; @Override @@ -33,31 +29,6 @@ final public class AboutActivity extends Activity implements IWinBollActivity { return this; } - @Override - public APPInfo getAppInfo() { - return null; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - public boolean isEnableDisplayHomeAsUp() { - return true; - } - - @Override - public boolean isAddWinBollToolBar() { - return false; - } - - @Override - public Toolbar initToolBar() { - return findViewById(R.id.activityaboutToolbar1); - } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java index 050869d..8ff479a 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java @@ -15,13 +15,12 @@ import android.view.Menu; import android.view.MenuItem; import android.widget.Toolbar; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.bean.APPInfo; import cc.winboll.studio.libapputils.view.SimpleWebView; import java.io.IOException; import java.io.InputStream; -public class AssetsHtmlActivity extends Activity implements IWinBollActivity { +public class AssetsHtmlActivity extends Activity { public static final String TAG = "AssetsHtmlActivity"; @@ -39,32 +38,6 @@ public class AssetsHtmlActivity extends Activity implements IWinBollActivity { // return this; // } - @Override - public APPInfo getAppInfo() { - return null; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - public boolean isEnableDisplayHomeAsUp() { - return true; - } - - - @Override - public boolean isAddWinBollToolBar() { - return false; - } - - @Override - public Toolbar initToolBar() { - return findViewById(R.id.activityassetshtmlToolbar1); - } - @Override public boolean onCreateOptionsMenu(Menu menu) { return super.onCreateOptionsMenu(menu); diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/LogActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/LogActivity.java index 8ed6667..0c6f586 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/LogActivity.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/LogActivity.java @@ -11,10 +11,9 @@ import android.os.Bundle; import android.widget.Toolbar; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogView; -import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.bean.APPInfo; -public class LogActivity extends Activity implements IWinBollActivity { +public class LogActivity extends Activity { public static final String TAG = "LogActivity"; @@ -25,31 +24,6 @@ public class LogActivity extends Activity implements IWinBollActivity { // return this; // } - @Override - public APPInfo getAppInfo() { - return null; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - public Toolbar initToolBar() { - return null; - } - - @Override - public boolean isEnableDisplayHomeAsUp() { - return false; - } - - @Override - public boolean isAddWinBollToolBar() { - return false; - } - @Override protected void onCreate(Bundle savedInstanceState) { LogUtils.d(TAG, "onCreate"); diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/QRCodeDecodeActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/QRCodeDecodeActivity.java index ab8b24b..a48a389 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/QRCodeDecodeActivity.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/QRCodeDecodeActivity.java @@ -5,22 +5,19 @@ package cc.winboll.studio.libapputils.activities; * @Date 2025/01/18 10:32:21 * @Describe 二维码扫码解码窗口 */ -import cc.winboll.studio.libapputils.R; import android.app.Activity; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.widget.TextView; -import android.widget.Toolbar; -import cc.winboll.studio.libapputils.app.IWinBollActivity; -import cc.winboll.studio.libapputils.bean.APPInfo; +import cc.winboll.studio.libapputils.R; import com.google.zxing.ResultPoint; import com.journeyapps.barcodescanner.BarcodeCallback; import com.journeyapps.barcodescanner.BarcodeResult; import com.journeyapps.barcodescanner.DecoratedBarcodeView; import java.util.List; -public class QRCodeDecodeActivity extends Activity implements IWinBollActivity { +public class QRCodeDecodeActivity extends Activity { public static final String TAG = "QRCodeDecodeActivity"; @@ -35,32 +32,6 @@ public class QRCodeDecodeActivity extends Activity implements IWinBollActivity { // return this; // } - @Override - public APPInfo getAppInfo() { - return null; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - public boolean isEnableDisplayHomeAsUp() { - return true; - } - - - @Override - public boolean isAddWinBollToolBar() { - return false; - } - - @Override - public Toolbar initToolBar() { - return findViewById(R.id.activityqrcodedecodeToolbar1); - } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -77,8 +48,6 @@ public class QRCodeDecodeActivity extends Activity implements IWinBollActivity { // startScanning(); // } startScanning(); - - } private void startScanning() { diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/IWinBollActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/IWinBollActivity.java deleted file mode 100644 index 888ff84..0000000 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/IWinBollActivity.java +++ /dev/null @@ -1,23 +0,0 @@ -package cc.winboll.studio.libapputils.app; - -/** - * @Author ZhanGSKen@AliYun.Com - * @Date 2025/03/08 00:15:36 - * @Describe WinBoll 活动窗口通用接口 - */ -import android.content.Context; -import android.widget.Toolbar; -import cc.winboll.studio.libapputils.bean.APPInfo; - -public interface IWinBollActivity { - - public static final String TAG = "IWinBollActivity"; - - // 获取应用资源上下文 - //abstract public Context getApplicationContext(); - abstract public APPInfo getAppInfo(); - abstract public String getTag(); - abstract public Toolbar initToolBar(); - abstract public boolean isEnableDisplayHomeAsUp(); - abstract public boolean isAddWinBollToolBar(); -} diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/MyActivityLifecycleCallbacks.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/MyActivityLifecycleCallbacks.java deleted file mode 100644 index 7397cd4..0000000 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/MyActivityLifecycleCallbacks.java +++ /dev/null @@ -1,98 +0,0 @@ -package cc.winboll.studio.libapputils.app; - -/** - * @Author ZhanGSKen@QQ.COM - * @Date 2024/12/24 11:02:08 - */ -import android.app.Activity; -import android.app.Application; -import android.content.Intent; -import android.os.Bundle; -import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.utils.ToastUtils; - -public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { - - public static final String TAG = "MyActivityLifecycleCallbacks"; - - - public String mInfo = ""; - - public MyActivityLifecycleCallbacks() { - } - - void createActivityeInfo(Activity activity) { - StringBuilder sb = new StringBuilder(); - Intent receivedIntent = activity.getIntent(); - sb.append("\nCallingActivity : \n"); - if (activity.getCallingActivity() != null) { - sb.append(activity.getCallingActivity().getPackageName()); - } - sb.append("\nReceived Intent Package : \n"); - sb.append(receivedIntent.getPackage()); - - Bundle extras = receivedIntent.getExtras(); - if (extras != null) { - for (String key : extras.keySet()) { - sb.append("\nIntentInfo"); - sb.append("\n键: "); - sb.append(key); - sb.append(", 值: "); - sb.append(extras.get(key)); - //Log.d("IntentInfo", "键: " + key + ", 值: " + extras.get(key)); - } - } - mInfo = sb.toString(); - //Log.d("IntentInfo", "发送Intent的应用包名: " + senderPackage); - } - - public void showActivityeInfo() { - ToastUtils.show("ActivityeInfo : " + mInfo); - LogUtils.d(TAG, "ActivityeInfo : " + mInfo); - } - - @Override - public void onActivityCreated(Activity activity, Bundle savedInstanceState) { - // 在这里可以做一些初始化相关的操作，例如记录Activity的创建时间等 - //System.out.println(activity.getLocalClassName() + " was created"); - LogUtils.d(TAG, activity.getLocalClassName() + " was created"); - createActivityeInfo(activity); - } - - @Override - public void onActivityStarted(Activity activity) { - //System.out.println(activity.getLocalClassName() + " was started"); - LogUtils.d(TAG, activity.getLocalClassName() + " was started"); - //createActivityeInfo(activity); - } - - @Override - public void onActivityResumed(Activity activity) { - //System.out.println(activity.getLocalClassName() + " was resumed"); - LogUtils.d(TAG, activity.getLocalClassName() + " was resumed"); - //createActivityeInfo(activity); - } - - @Override - public void onActivityPaused(Activity activity) { - //System.out.println(activity.getLocalClassName() + " was paused"); - LogUtils.d(TAG, activity.getLocalClassName() + " was paused"); - } - - @Override - public void onActivityStopped(Activity activity) { - //System.out.println(activity.getLocalClassName() + " was stopped"); - LogUtils.d(TAG, activity.getLocalClassName() + " was stopped"); - } - - @Override - public void onActivitySaveInstanceState(Activity activity, Bundle outState) { - // 可以在这里添加保存状态的自定义逻辑 - } - - @Override - public void onActivityDestroyed(Activity activity) { - //System.out.println(activity.getLocalClassName() + " was destroyed"); - LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed"); - } -} diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java deleted file mode 100644 index e0e1119..0000000 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java +++ /dev/null @@ -1,318 +0,0 @@ -package cc.winboll.studio.libapputils.app; - -/** - * @Author ZhanGSKen@QQ.COM - * @Date 2024/08/12 16:09:15 - * @Describe 应用活动窗口管理器 - * 参考 ： - * android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label - * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app - */ -import android.app.ActivityManager; -import android.app.TaskStackBuilder; -import android.content.Context; -import android.content.Intent; -import cc.winboll.studio.libappbase.LogUtils; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -public class WinBollActivityManager { - -// public static final String TAG = "WinBollActivityManager"; -// public static final String EXTRA_TAG = "EXTRA_TAG"; -// -// public static enum WinBollUI_TYPE { -// Aplication, // 退出应用后，保持最近任务栏任务记录主窗口 -// Service // 退出应用后，清理所有最近任务栏任务记录窗口 -// }; -// -// // 应用类型标志 -// volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service; -// -// Context mContext; -// MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks; -// static WinBollActivityManager _mWinBollActivityManager; -// static Map _mapIWinBollList; -// IWinBollActivity firstIWinBollActivity; -// -// public WinBollActivityManager(Context context) { -// mContext = context; -// LogUtils.d(TAG, "WinBollActivityManager()"); -// _mapIWinBollList = new HashMap(); -// } -// -// public static synchronized WinBollActivityManager getInstance(Context context) { -// LogUtils.d(TAG, "getInstance"); -// if (_mWinBollActivityManager == null) { -// LogUtils.d(TAG, "_mWinBollActivityManager == null"); -// _mWinBollActivityManager = new WinBollActivityManager(context); -// } -// return _mWinBollActivityManager; -// } -// -// // -// // 设置 WinBoll 应用 UI 类型 -// // -// public synchronized static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) { -// _mWinBollUI_TYPE = mWinBollUI_TYPE; -// } -// -// // -// // 获取 WinBoll 应用 UI 类型 -// // -// public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() { -// return _mWinBollUI_TYPE; -// } -// -// // -// // 把Activity添加到管理中 -// // -// public void add(T iWinBoll) { -// if (isActive(iWinBoll.getTag())) { -// LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag())); -// } else { -// // 设置起始活动窗口，以便最后退出时提问 -// if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) { -// firstIWinBollActivity = iWinBoll; -// } -// -// // 添加到活动窗口列表 -// _mapIWinBollList.put(iWinBoll.getTag(), iWinBoll); -// LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size())); -// } -// } -// -// -// // -// // activity: 为 null 时， -// // intent.putExtra 函数 EXTRA_TAG 参数为 tag -// // activity: 不为 null 时， -// // intent.putExtra 函数 "tag" 参数为 activity.getTag() -// // -// public void startWinBollActivity(Context context, Class clazz) { -// try { -// // 如果窗口已存在就重启窗口 -// String tag = clazz.newInstance().getTag(); -// if (isActive(tag)) { -// resumeActivity(context, tag); -// return; -// } -// -// // 新建一个任务窗口 -// Intent intent = new Intent(context, clazz); -// //打开多任务窗口 flags -// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); -// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); -// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -// intent.putExtra(EXTRA_TAG, tag); -// mContext.startActivity(intent); -// } catch (InstantiationException | IllegalAccessException e) { -// LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); -// } -// } -// -// public void startWinBollActivity(Context context, Intent intent, Class clazz) { -// try { -// // 如果窗口已存在就重启窗口 -// String tag = clazz.newInstance().getTag(); -// if (isActive(tag)) { -// resumeActivity(context, tag); -// return; -// } -// -// // 新建一个任务窗口 -// //Intent intent = new Intent(context, clazz); -// //打开多任务窗口 flags -// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); -// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); -// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -// intent.putExtra(EXTRA_TAG, tag); -// mContext.startActivity(intent); -// } catch (InstantiationException | IllegalAccessException e) { -// LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); -// } -// } -// -// public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) { -// return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity; -// } -// -// // -// // 判断 tag绑定的 MyActivity是否存在 -// // -// public boolean isActive(String tag) { -// //printAvtivityListInfo(); -// IWinBollActivity iWinBoll = getIWinBoll(tag); -// if (iWinBoll != null) { -// LogUtils.d(TAG, "isActive(...) activity != null tag " + tag); -// //ToastUtils.show("activity != null tag " + tag); -// //判断是否为 BaseActivity,如果已经销毁，则移除 -// if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) { -// _mapIWinBollList.remove(iWinBoll.getTag()); -// //_mWinBollActivityList.remove(activity); -// LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag)); -// return false; -// } else { -// LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag)); -// return true; -// } -// } else { -// LogUtils.d(TAG, String.format("isActive(...) activity == null\ntag : %s", tag)); -// return false; -// } -// } -// -// static IWinBollActivity getIWinBoll(String tag) { -// return _mapIWinBollList.get(tag); -// } -// -// // -// // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 -// // -// public void resumeActivity(Context context, String tag) { -// LogUtils.d(TAG, "resumeActivty"); -// T iWinBoll = (T)getIWinBoll(tag); -// //LogUtils.d(TAG, "activity " + activity.getTag()); -// if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) { -// resumeActivity(context, iWinBoll); -// } -// } -// -// // -// // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 -// // -// public void resumeActivity(Context context, T iWinBoll) { -// ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE); -// //返回启动它的根任务（home 或者 MainActivity） -// Intent intent = new Intent(context, iWinBoll.getClass()); -// TaskStackBuilder stackBuilder = TaskStackBuilder.create(context); -// 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); -// } -// -// -// // -// // 结束所有 Activity -// // -// public void finishAll() { -// try { -// for (String key : _mapIWinBollList.keySet()) { -// //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key)); -// IWinBollActivity iWinBoll = _mapIWinBollList.get(key); -// //ToastUtils.show("finishAll() activity"); -// if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) { -// //ToastUtils.show("activity != null ..."); -// if (getWinBollUI_TYPE() == WinBollUI_TYPE.Service) { -// // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。 -// iWinBoll.getActivity().finishAndRemoveTask(); -// //ToastUtils.show("finishAll() activity.finishAndRemoveTask();"); -// } else if (getWinBollUI_TYPE() == WinBollUI_TYPE.Aplication) { -// // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。 -// iWinBoll.getActivity().finish(); -// //ToastUtils.show("finishAll() activity.finish();"); -// } else { -// LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error."); -// //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error."); -// } -// } -// } -// } catch (Exception e) { -// LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); -// } -// } -// -// // -// // 结束指定Activity -// // -// public void finish(T iWinBoll) { -// try { -// if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) { -// //根据tag 移除 MyActivity -// //String tag= activity.getTag(); -// //_mWinBollActivityList.remove(tag); -// //ToastUtils.show("remove"); -// //ToastUtils.show("_mWinBollActivityArrayMap.size() " + Integer.toString(_mWinBollActivityArrayMap.size())); -// -// // 窗口回调规则： -// // [] 当前窗口位置 >> 调度出的窗口位置 -// // ★：[0] 1 2 3 4 >> 1 -// // ★：0 1 [2] 3 4 >> 1 -// // ★：0 1 2 [3] 4 >> 2 -// // ★：0 1 2 3 [4] >> 3 -// // ★：[0] >> 直接关闭当前窗口 -// LogUtils.d(TAG, "finish no yet."); -// IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll); -// iWinBoll.getActivity().finish(); -// if (preIWinBoll != null) { -// resumeActivity(mContext, preIWinBoll); -// } -// } -// -// } catch (Exception e) { -// LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); -// } -// } -// -// // -// // 获取窗口队列中的前一个窗口 -// // -// IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) { -// try { -// boolean bingo = false; -// IWinBollActivity preIWinBoll = null; -// for (Map.Entry entity : _mapIWinBollList.entrySet()) { -// if (entity.getKey().equals(iWinBoll.getTag())) { -// bingo = true; -// LogUtils.d(TAG, "bingo"); -// break; -// } -// preIWinBoll = entity.getValue(); -// } -// -// if (bingo) { -// return preIWinBoll; -// } -// } catch (Exception e) { -// LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); -// } -// -// return null; -// } -// -// // -// // 从管理列表中移除管理项 -// // -// public boolean registeRemove(T activity) { -// IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag()); -// if (iWinBollTest != null) { -// _mapIWinBollList.remove(activity.getTag()); -// return true; -// } -// return false; -// } -// -// // -// // 打印管理列表项列表里的信息 -// // -// public static void printIWinBollListInfo() { -// //LogUtils.d(TAG, "printAvtivityListInfo"); -// if (!_mapIWinBollList.isEmpty()) { -// StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size())); -// Iterator> iterator = _mapIWinBollList.entrySet().iterator(); -// while (iterator.hasNext()) { -// Map.Entry entry = iterator.next(); -// sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag()); -// //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag()); -// } -// sb.append("\nMap entries end."); -// LogUtils.d(TAG, sb.toString()); -// } else { -// LogUtils.d(TAG, "The map is empty."); -// } -// } -} diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java index 9379a36..f9e0d1f 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java @@ -21,7 +21,6 @@ import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libapputils.app.AppVersionUtils; -import cc.winboll.studio.libapputils.app.WinBollActivityManager; import cc.winboll.studio.libapputils.bean.APPInfo; import cc.winboll.studio.libapputils.bean.DebugBean; import cc.winboll.studio.libapputils.util.PrefUtils;