From a0575a5e8bf296dbdc128fe909aec80709facc0c Mon Sep 17 00:00:00 2001
From: ZhanGSKen <zhangsken@188.com>
Date: Mon, 23 Jun 2025 20:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=83=8F=E7=B4=A0=E6=8B=BE?=
 =?UTF-8?q?=E5=8F=96=E7=AA=97=E5=8F=A3=E3=80=81=E8=83=8C=E6=99=AF=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3=E4=B8=8E=E4=B8=BB?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 powerbell/build.properties                    |  4 +--
 .../activities/PixelPickerActivity.java       | 20 +++++++++++++
 .../powerbell/activities/WinBoLLActivity.java | 28 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/powerbell/build.properties b/powerbell/build.properties
index 68e94f1..73af272 100644
--- a/powerbell/build.properties
+++ b/powerbell/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jun 23 14:49:46 HKT 2025
+#Mon Jun 23 11:59:59 GMT 2025
 stageCount=6
 libraryProject=
 baseVersion=15.4
 publishVersion=15.4.5
-buildCount=0
+buildCount=3
 baseBetaVersion=15.4.6
diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
index dbf2859..7408304 100644
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
@@ -10,6 +10,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,7 +20,9 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.PixelPickerActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -225,6 +228,23 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 		super.onResume();
 		setBackgroundColor();
 	}
+	
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
+            return true;
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+	@Override
+	public void onBackPressed() {
+		super.onBackPressed();
+		GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
+	}
 }
 
 
diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java
index 44da1de..4f21e81 100644
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java
@@ -22,4 +22,32 @@ public abstract class WinBoLLActivity extends Activity implements IWinBoLLActivi
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
+            return true;
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+	@Override
+	public void onBackPressed() {
+		super.onBackPressed();
+		GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
+	}
 }