diff --git a/powerbell/build.properties b/powerbell/build.properties
index 36c868ba..61031d1e 100644
--- a/powerbell/build.properties
+++ b/powerbell/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Mon Jun 23 06:26:53 GMT 2025
+#Mon Jun 23 06:46:57 GMT 2025
stageCount=5
libraryProject=
baseVersion=15.4
publishVersion=15.4.4
-buildCount=10
+buildCount=19
baseBetaVersion=15.4.5
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 31bacbbf..dbf28593 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
@@ -15,18 +15,18 @@ 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;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import cc.winboll.studio.powerbell.App;
public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActivity {
@@ -42,9 +42,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
return TAG;
}
-
-
-
+ private AToolbar mAToolbar;
private ImageView imageView;
private Bitmap originalBitmap;
private TextView infoText;
@@ -55,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);
@@ -183,6 +194,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
bean.setPixelColor(pixelColor);
utils.saveData();
Toast.makeText(PixelPickerActivity.this, "已记录像素值", Toast.LENGTH_SHORT).show();
+ setBackgroundColor();
}
});
@@ -198,7 +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();
+ }
}
diff --git a/powerbell/src/main/res/layout/activity_pixelpicker.xml b/powerbell/src/main/res/layout/activity_pixelpicker.xml
index 4bce86bc..44eae4bf 100644
--- a/powerbell/src/main/res/layout/activity_pixelpicker.xml
+++ b/powerbell/src/main/res/layout/activity_pixelpicker.xml
@@ -1,31 +1,54 @@
-
+
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/powerbell/src/main/res/values-zh/strings.xml b/powerbell/src/main/res/values-zh/strings.xml
index 57737727..20f9b67a 100644
--- a/powerbell/src/main/res/values-zh/strings.xml
+++ b/powerbell/src/main/res/values-zh/strings.xml
@@ -15,6 +15,7 @@
Slide Right To Clean Up APP Record.
清理记录
更换背景图片
+ 背景像素拾取
关于应用
>>>Seek 100% To Clear Battery Record.>>>
diff --git a/powerbell/src/main/res/values/strings.xml b/powerbell/src/main/res/values/strings.xml
index c70425a5..dbd55db1 100644
--- a/powerbell/src/main/res/values/strings.xml
+++ b/powerbell/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
Slide Right To Clean Up APP Record.
Clean Record
Background Picture
+ Pixel Picker
About The APP
>>>Seek 100% To Clear Battery Record.>>>