优化背景像素拾取UI

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jun 22 16:21:12 HKT 2025
+#Mon Jun 23 06:46:57 GMT 2025
 stageCount=5
 libraryProject=
 baseVersion=15.4
 publishVersion=15.4.4
-buildCount=0
+buildCount=19
 baseBetaVersion=15.4.5

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundPictureActivity.java

@@ -14,6 +14,7 @@ import android.os.Bundle;
 import android.provider.MediaStore;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import cc.winboll.studio.libaes.views.AToolbar;
@@ -32,10 +33,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import android.service.quickaccesswallet.GetWalletCardsError;
-import android.widget.RelativeLayout;
 
-public class BackgroundPictureActivity extends Activity implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
+public class BackgroundPictureActivity extends WinBoLLActivity implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
 
     public static final String TAG = "BackgroundPictureActivity";
     public BackgroundPictureUtils mBackgroundPictureUtils;
@@ -60,6 +59,16 @@ public class BackgroundPictureActivity extends Activity implements BackgroundPic
     private int mnPictureCompress = 100;
     private static String _RecivedPictureFileName;
 
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -106,7 +115,7 @@ public class BackgroundPictureActivity extends Activity implements BackgroundPic
         findViewById(R.id.activitybackgroundpictureAButton6).setOnClickListener(onCropFreePictureClickListener);
 		findViewById(R.id.activitybackgroundpictureAButton7).setOnClickListener(onPixelPickerClickListener);
 		findViewById(R.id.activitybackgroundpictureAButton8).setOnClickListener(onCleanPixelClickListener);
-		
+
         updatePreviewBackground();
 
         // 处理分享的图片
@@ -161,7 +170,7 @@ public class BackgroundPictureActivity extends Activity implements BackgroundPic
                     //drawable.setAlpha(120);
                     ivPreviewBackground.setImageDrawable(drawable);
                 }
-                ToastUtils.show("背景图片已更新");
+                //ToastUtils.show("背景图片已更新");
             } catch (IOException e) {
                 LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
                 ToastUtils.show("背景图片加载失败");
@@ -255,7 +264,7 @@ public class BackgroundPictureActivity extends Activity implements BackgroundPic
             updatePreviewBackground();
         }
     };
-	
+
 	private View.OnClickListener onPixelPickerClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -264,11 +273,11 @@ public class BackgroundPictureActivity extends Activity implements BackgroundPic
 			String imagePath = mfRecivedCropPicture.toString();
 			Intent intent = new Intent(getApplicationContext(), PixelPickerActivity.class);
 			intent.putExtra("imagePath", imagePath);
-			//startActivity(intent);
+			startActivity(intent);
-            App.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), intent, PixelPickerActivity.class);
+            //App.getWinBoLLActivityManager().startWinBoLLActivity(getActivity(), intent, PixelPickerActivity.class);
         }
     };
-	
+
 	private View.OnClickListener onCleanPixelClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -520,11 +529,11 @@ public class BackgroundPictureActivity extends Activity implements BackgroundPic
                 LogUtils.e(TAG, "剪裁保存异常" + e);
                 ToastUtils.show("保存失败：" + e.getMessage());
             }/* finally {
-                // 安全删除临时文件
+			 // 安全删除临时文件
-                if (mfTempCropPicture.exists()) {
+			 if (mfTempCropPicture.exists()) {
-                    mfTempCropPicture.delete();
+			 mfTempCropPicture.delete();
-                }
+			 }
-            }*/
+			 }*/
         } else if (resultCode != RESULT_OK) {
             LogUtils.d(TAG, "操作取消或失败，requestCode: " + requestCode);
             ToastUtils.show("操作已取消");
@@ -566,7 +575,7 @@ public class BackgroundPictureActivity extends Activity implements BackgroundPic
             }
         }
     }
-	
+
 	void setBackgroundColor() {
 		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
 		BackgroundPictureBean bean = utils.getBackgroundPictureBean();

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java

@@ -15,11 +15,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.activities.PixelPickerActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
@@ -41,9 +42,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 		return TAG;
 	}
 
-
+	private AToolbar mAToolbar;
-
-
 	private ImageView imageView;
 	private Bitmap originalBitmap;
 	private TextView infoText;
@@ -54,6 +53,19 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_pixelpicker);
 
+
+        // 初始化工具栏
+        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
+        setActionBar(mAToolbar);
+        mAToolbar.setSubtitle(R.string.subtitle_activity_pixelpicker);
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish();
+                }
+            });
+
 		imageView = findViewById(R.id.imageView);
 		infoText = findViewById(R.id.infoText);
 		imageContainer = findViewById(R.id.imageContainer);
@@ -182,6 +194,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 					bean.setPixelColor(pixelColor);
 					utils.saveData();
 					Toast.makeText(PixelPickerActivity.this, "已记录像素值", Toast.LENGTH_SHORT).show();
+					setBackgroundColor();
 				}
 			});
 
@@ -197,6 +210,21 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 			originalBitmap = null;
 		}
 	}
+
+
+	void setBackgroundColor() {
+		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(PixelPickerActivity.this);
+		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+		int nPixelColor = bean.getPixelColor();
+		RelativeLayout mainLayout = findViewById(R.id.activitypixelpickerRelativeLayout1);
+		mainLayout.setBackgroundColor(nPixelColor);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		setBackgroundColor();
+	}
 }
 
 

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java

@@ -1,14 +1,19 @@
 package cc.winboll.studio.powerbell.activities;
 
-import android.app.Activity;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-
 /**
  * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/06/19 20:35
  * @Describe 应用窗口基类
  */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
+
 public abstract class WinBoLLActivity extends Activity implements IWinBoLLActivity {
 
     public static final String TAG = "WinBoLLActivity";

powerbell/src/main/res/layout/activity_pixelpicker.xml

@@ -1,31 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
-    android:layout_width="match_parent"
+	xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-    <FrameLayout
+	<cc.winboll.studio.libaes.views.AToolbar
-        android:id="@+id/imageContainer"
+		android:layout_width="match_parent"
-        android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
-        android:layout_height="match_parent">
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"
+		style="@style/DefaultAToolbar"/>
 
-        <ImageView
+	<RelativeLayout
-            android:id="@+id/imageView"
+		android:layout_width="match_parent"
-            android:layout_width="match_parent"
+		android:layout_height="0dp"
-            android:layout_height="match_parent"
+		android:layout_weight="1.0">
-            android:layout_gravity="center"
-            android:scaleType="centerCrop"
-            android:src="@drawable/ic_launcher" />
-    </FrameLayout>
 
-    <TextView
+		<RelativeLayout
-        android:id="@+id/infoText"
+			android:layout_width="match_parent"
-        android:layout_width="wrap_content"
+			android:layout_height="match_parent"
-        android:layout_height="wrap_content"
+			android:background="#FFEE2121"
-        android:layout_alignParentBottom="true"
+			android:id="@+id/activitypixelpickerRelativeLayout1"/>
-        android:layout_centerHorizontal="true"
+
-        android:padding="10dp"
+		<FrameLayout
-        android:background="#80000000"
+			android:id="@+id/imageContainer"
-        android:textColor="#FFFFFF"
+			android:layout_width="match_parent"
-        android:text="点击图片获取像素值" />
+			android:layout_height="match_parent">
-</RelativeLayout>
+
+			<ImageView
+				android:id="@+id/imageView"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:src="@drawable/ic_launcher"/>
+
+		</FrameLayout>
+
+		<TextView
+			android:id="@+id/infoText"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:layout_centerHorizontal="true"
+			android:padding="10dp"
+			android:background="#80000000"
+			android:textColor="#FFFFFF"
+			android:text="点击图片获取像素值"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
 

powerbell/src/main/res/values-zh/strings.xml

@@ -15,6 +15,7 @@
     <string name="texthint_CustomSlideToCleanRecord">Slide Right To Clean Up APP Record.</string>
     <string name="subtitle_activity_clearrecord">清理记录</string>
     <string name="subtitle_activity_backgroundpicture">更换背景图片</string>
+    <string name="subtitle_activity_pixelpicker">背景像素拾取</string>
     <string name="subtitle_activity_about">关于应用</string>
     <string name="msg_AOHPCTCSeekBar_ClearRecord">&gt;&gt;&gt;Seek 100% To Clear Battery Record.&gt;&gt;&gt;</string>
 </resources>

powerbell/src/main/res/values/strings.xml

@@ -18,6 +18,7 @@
     <string name="texthint_CustomSlideToCleanRecord">Slide Right To Clean Up APP Record.</string>
     <string name="subtitle_activity_clearrecord">Clean Record</string>
     <string name="subtitle_activity_backgroundpicture">Background Picture</string>
+    <string name="subtitle_activity_pixelpicker">Pixel Picker</string>
     <string name="subtitle_activity_about">About The APP</string>
     <string name="msg_AOHPCTCSeekBar_ClearRecord">&gt;&gt;&gt;Seek 100% To Clear Battery Record.&gt;&gt;&gt;</string>
 </resources>