From e2b6fadd433dfba6e432f5d5826808717cc87ec6 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 27 Mar 2025 01:05:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E5=B1=8F=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E5=88=87=E6=8D=A2=E5=A4=B1=E6=95=88=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=89=8B=E5=8A=A8=E5=88=87=E6=8D=A2=E5=87=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=8F=E8=A7=86=E5=9B=BE=E5=86=8D=E5=9B=9E?= =?UTF-8?q?=E5=88=B0=E5=88=86=E5=B1=8F=E4=BB=BB=E5=8A=A1=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E6=97=B6=E5=B0=B1=E5=8F=AF=E4=BB=A5=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=AF=94=E4=BE=8B=E3=80=82=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B0=83=E5=87=BA=E4=BA=8C=E7=BA=A7=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E5=BC=B9=E5=87=BA=E6=97=B6=E4=B8=8D=E5=9C=A8=E5=8E=9F?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=AA=97=E5=8F=A3=E5=BC=B9=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 ++-- appbase/src/main/AndroidManifest.xml | 18 +++++++++++------- .../appbase/activities/New2Activity.java | 4 ++-- .../studio/appbase/activities/NewActivity.java | 4 ++-- libappbase/build.properties | 4 ++-- libappbase/src/main/AndroidManifest.xml | 10 ++++------ .../winboll/WinBollActivityManager.java | 16 ++++++++-------- 7 files changed, 31 insertions(+), 29 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 7aa16af..9acc40d 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 11:30:27 GMT 2025 +#Wed Mar 26 16:59:16 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=17 +buildCount=42 baseBetaVersion=15.1.1 diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml index 40fd259..26bddb9 100644 --- a/appbase/src/main/AndroidManifest.xml +++ b/appbase/src/main/AndroidManifest.xml @@ -13,10 +13,9 @@ + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"> @@ -32,7 +31,15 @@ - + + + - - - 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 0df980f..a322390 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 @@ -7,13 +7,13 @@ package cc.winboll.studio.appbase.activities; */ import android.app.Activity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import cc.winboll.studio.appbase.R; -import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; -public class New2Activity extends Activity implements IWinBollActivity { +public class New2Activity extends AppCompatActivity implements IWinBollActivity { public static final String TAG = "New2Activity"; 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 3a7c370..d44f864 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 @@ -6,13 +6,13 @@ package cc.winboll.studio.appbase.activities; */ import android.app.Activity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import cc.winboll.studio.appbase.R; -import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; -public class NewActivity extends Activity implements IWinBollActivity { +public class NewActivity extends AppCompatActivity implements IWinBollActivity { public static final String TAG = "NewActivity"; diff --git a/libappbase/build.properties b/libappbase/build.properties index 7aa16af..9acc40d 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 11:30:27 GMT 2025 +#Wed Mar 26 16:59:16 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=17 +buildCount=42 baseBetaVersion=15.1.1 diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml index d2ee0f2..2ce8228 100644 --- a/libappbase/src/main/AndroidManifest.xml +++ b/libappbase/src/main/AndroidManifest.xml @@ -22,15 +22,13 @@ android:launchMode="standard"/> - - - + + + 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 e0283c2..2857d56 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 @@ -9,12 +9,11 @@ package cc.winboll.studio.libappbase.winboll; * 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.ActivityOptions; import android.app.TaskStackBuilder; import android.content.Context; import android.content.Intent; -import android.graphics.Rect; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.utils.ToastUtils; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -100,6 +99,7 @@ public class WinBollActivityManager { resumeActivity(context, tag); return; } + ToastUtils.show("startWinBollActivity(Context context, Class clazz)"); // 新建一个任务窗口 Intent intent = new Intent(context, clazz); @@ -108,7 +108,7 @@ public class WinBollActivityManager { intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(EXTRA_TAG, tag); - mContext.startActivity(intent); + context.startActivity(intent); } catch (InstantiationException | IllegalAccessException e) { LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } @@ -130,7 +130,7 @@ public class WinBollActivityManager { intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(EXTRA_TAG, tag); - mContext.startActivity(intent); + context.startActivity(intent); } catch (InstantiationException | IllegalAccessException e) { LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } @@ -153,12 +153,12 @@ public class WinBollActivityManager { // 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_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); }