From b3075f778d18ef38abe15db6d8c2004e0dc3ef38 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 13:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AA=97=E5=8F=A3=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +- .../winboll/studio/appbase/MainActivity.java | 4 +- .../appbase/activities/New2Activity.java | 5 +-- .../appbase/activities/NewActivity.java | 5 +-- libappbase/build.properties | 4 +- libappbase/src/main/AndroidManifest.xml | 11 +++-- .../studio/libappbase/GlobalApplication.java | 9 ++-- .../winboll/MyActivityLifecycleCallbacks.java | 15 ++----- .../winboll/WinBollActivityBase.java | 42 +++++++++++++++++++ 9 files changed, 67 insertions(+), 32 deletions(-) create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java diff --git a/appbase/build.properties b/appbase/build.properties index a11a2d6..71cdb43 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 05:25:32 GMT 2025 +#Fri Mar 28 05:43:39 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=145 +buildCount=152 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 2aa8dbe..ae2bee2 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -4,7 +4,6 @@ import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; @@ -23,8 +22,9 @@ import cc.winboll.studio.libappbase.sos.SOS; import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; -public class MainActivity extends AppCompatActivity implements IWinBollActivity { +public class MainActivity extends WinBollActivityBase implements IWinBollActivity { public static final String TAG = "MainActivity"; 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 c6f01fa..fbb9b72 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,7 +7,6 @@ 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; @@ -15,9 +14,9 @@ import android.view.View; import cc.winboll.studio.appbase.R; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; +import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; -public class New2Activity extends AppCompatActivity implements IWinBollActivity { +public class New2Activity extends WinBollActivityBase 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 a2e71ba..9bc8286 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,7 +6,6 @@ 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; @@ -14,9 +13,9 @@ import android.view.View; import cc.winboll.studio.appbase.R; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; +import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; -public class NewActivity extends AppCompatActivity implements IWinBollActivity { +public class NewActivity extends WinBollActivityBase implements IWinBollActivity { public static final String TAG = "NewActivity"; diff --git a/libappbase/build.properties b/libappbase/build.properties index a11a2d6..71cdb43 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 05:25:32 GMT 2025 +#Fri Mar 28 05:43:39 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=145 +buildCount=152 baseBetaVersion=15.1.1 diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml index 535f497..af4418c 100644 --- a/libappbase/src/main/AndroidManifest.xml +++ b/libappbase/src/main/AndroidManifest.xml @@ -9,6 +9,9 @@ + + + - @@ -86,7 +90,8 @@ - @@ -99,4 +104,4 @@ - + \ No newline at end of file diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java index cc01fbd..240c13f 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java @@ -73,11 +73,10 @@ public class GlobalApplication extends Application { setIsDebuging(appBaseModel.isDebuging()); } -// WinBollActivityManager.getInstance(_GlobalApplication); -// WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service); -// // 注册回调 -// mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(); -// registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks); + getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service); + // 注册窗口回调监听 + mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(); + registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks); } diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java index d634d08..dfe768e 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java @@ -8,24 +8,17 @@ import android.app.Activity; import android.app.Application; import android.content.Intent; import android.os.Bundle; -import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.utils.ToastUtils; -import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.utils.ToastUtils; public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { public static final String TAG = "MyActivityLifecycleCallbacks"; - - + public String mInfo = ""; public MyActivityLifecycleCallbacks() { - - } - - WinBollActivityManager getWinBollActivityManager() { - return WinBollActivityManager.getInstance(GlobalApplication.getInstance()); + } void createActivityeInfo(Activity activity) { @@ -64,7 +57,6 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc //System.out.println(activity.getLocalClassName() + " was created"); LogUtils.d(TAG, activity.getLocalClassName() + " was created"); createActivityeInfo(activity); - getWinBollActivityManager().add((IWinBollActivity)activity); } @Override @@ -102,6 +94,5 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc public void onActivityDestroyed(Activity activity) { //System.out.println(activity.getLocalClassName() + " was destroyed"); LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed"); - getWinBollActivityManager().registeRemove((IWinBollActivity)activity); } } diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java new file mode 100644 index 0000000..d15c352 --- /dev/null +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java @@ -0,0 +1,42 @@ +package cc.winboll.studio.libappbase.winboll; + +/** + * @Author ZhanGSKen@AliYun.Com + * @Date 2025/03/28 13:35:28 + * @Describe WinBoll应用窗口基类 + */ +import android.app.Activity; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import cc.winboll.studio.libappbase.GlobalApplication; + +public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity { + + public static final String TAG = "WinBollActivityBase"; + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + WinBollActivityManager getWinBollActivityManager() { + return WinBollActivityManager.getInstance(GlobalApplication.getInstance()); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWinBollActivityManager().add(this); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + getWinBollActivityManager().registeRemove(this); + } +}