commit acb8aeb8aeb89af057ac8600e5446a48fafeef83
Author: incar <chs@incartech.cn>
Date: Sat Aug 12 11:56:44 2023 +0800
添加相机水印和前摄镜像
Change-Id: Iea7ca33cb3f061af80ce73fe8ac08a855b7f5ea6
diff --git a/res/drawable/u1.png b/res/drawable/u1.png
new file mode 100644
index 000000000..da0d19f55
Binary files /dev/null and b/res/drawable/u1.png differ
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
old mode 100644
new mode 100755
index ad7a5167c..9504953f8
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,6 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="1175086483881127797">"相机"</string>
+ <string name="flash_auto" msgid="1175086483881127798">"自动"</string>
<string name="video_camera_label" msgid="1723708322021743770">"摄像机"</string>
<string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
@@ -82,6 +83,8 @@
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"后置"</string>
<string name="pref_camera_id_entry_front" msgid="6233067010315787044">"前置"</string>
<string name="pref_camera_save_location_title" msgid="2344235620113384017">"保存位置信息"</string>
+ <string name="pref_camera_watermark_camera_title" msgid="2344235620113384018">"水印相机"</string>
+ <string name="pref_camera_mirror_image_title" msgid="2344235620113384011">"前摄镜像"</string>
<string name="pref_camera_location_label" msgid="8695441802378057719">"位置信息"</string>
<string name="pref_camera_timer_title" msgid="4728838281741571323">"倒计时器"</string>
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
old mode 100644
new mode 100755
index 4731a6997..919a9d1f2
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,6 +51,9 @@
<!-- String used as a menu label. The user can choose to edit the image
[CHAR_LIMIT=20]-->
<string name="edit">Edit</string>
+ <string name="pref_camera_watermark_camera_title">Watermark camera</string>
+ <string name="pref_camera_mirror_image_title" >Proactive mirror image</string>
+ <string name="flash_auto" >AUTO</string>
<!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
<string name="crop_action">Crop</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
old mode 100644
new mode 100755
index 42e596257..a046f57b1
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -61,10 +61,22 @@
android:title="@string/pref_camera_sound_title" />
<!-- Location -->
- <com.android.camera.settings.ManagedSwitchPreference
+ <!-- <com.android.camera.settings.ManagedSwitchPreference
android:defaultValue="false"
android:key="pref_camera_recordlocation_key"
- android:title="@string/pref_camera_save_location_title" />
+ android:title="@string/pref_camera_save_location_title" />-->
+
+ <!-- watermark camera -->
+ <com.android.camera.settings.ManagedSwitchPreference
+ android:defaultValue="false"
+ android:key="pref_camera_watermark_camera_key"
+ android:title="@string/pref_camera_watermark_camera_title" />
+
+ <!-- mirror_image -->
+ <com.android.camera.settings.ManagedSwitchPreference
+ android:defaultValue="false"
+ android:key="pref_camera_mirror_image_key"
+ android:title="@string/pref_camera_mirror_image_title" />
<!-- Face Detection enable -->
<com.android.camera.settings.ManagedSwitchPreference
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
old mode 100644
new mode 100755
index 112d8e010..4c5809e81
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3486,6 +3486,7 @@ public class PhotoModule
CameraCapabilities.FlashMode flashMode = mCameraCapabilities.getStringifier()
.flashModeFromString(settingsManager.getString(mAppController.getCameraScope(),
Keys.KEY_FLASH_MODE));
+ android.util.Log.d("liujunjie33", "updateParametersFlashMode: "+flashMode);
if (mCameraCapabilities.supports(flashMode)) {
mCameraSettings.setFlashMode(flashMode);
}
diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
old mode 100644
new mode 100755
index 14a62b5fa..101365998
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -16,6 +16,15 @@
package com.android.camera;
+import static com.android.camera.settings.Keys.KEY_CAMERA_MIRROR_IMG;
+import static com.android.camera.settings.Keys.KEY_CAMERA_WAKE_MAKE;
+import static com.android.camera.settings.Keys.isCameraBackFacing;
+import static com.android.camera.settings.SettingsManager.SCOPE_GLOBAL;
+
+import com.android.camera.app.CameraServicesImpl;
+import com.android.camera.settings.SettingsManager;
+import com.android.camera2.R;;
+
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
@@ -45,6 +54,15 @@ import java.util.HashMap;
import java.util.UUID;
import javax.annotation.Nonnull;
+//liujunjie add
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.Canvas;
+import android.content.res.Resources;
+import java.nio.ByteBuffer;
+import java.io.ByteArrayOutputStream;
+import android.graphics.Matrix;
+import android.graphics.drawable.Drawable;
public class Storage {
public final String DIRECTORY;
@@ -78,9 +96,11 @@ public class Storage {
public static Storage instance() {
return Singleton.INSTANCE;
}
+ private Context mContext;
private Storage(Context context) {
DIRECTORY = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES).getPath();
+ this.mContext = context;
}
/**
@@ -132,6 +152,7 @@ public class Storage {
int height, String mimeType) throws IOException {
if (data.length >= 0) {
+
return addImageToMediaStore(resolver, title, date, location, orientation, data.length,
data, width, height, mimeType, exif);
}
@@ -201,16 +222,24 @@ public class Storage {
public Uri addImageToMediaStore(ContentResolver resolver, String title, long date,
Location location, int orientation, long jpegLength, byte[] jpeg, int width,
int height, String mimeType, ExifInterface exif) {
+ //前摄镜像
+ byte[] tar = null;
+
+ byte[] mirrorIMG = cameraMirrorIMG(jpeg,orientation);
+ // liujunjie add 添加相机水印
+ tar = addPngWatermark(mirrorIMG, R.drawable.u1, mContext.getResources(),orientation);
+ // liujunjie add emd
+
// Insert into MediaStore.
ContentValues values = getContentValuesForData(title, date, location, mimeType, true);
String path = generateFilepath(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES).getPath(), title, mimeType);
- Log.i(TAG, "---zc---path:" + path);
+ Log.i(TAG, "---zc---path:" + path +"orientation:"+orientation+",exif:"+exif);
Uri uri = null;
try {
uri = resolver.insert(Media.EXTERNAL_CONTENT_URI, values);
- writeFile(path, uri, exif, jpeg, resolver);
+ writeFile(path, uri, exif, tar, resolver);
} catch (Throwable th) {
// This can happen when the external volume is already mounted, but
// MediaScanner has not notify MediaProvider to add that volume.
@@ -225,6 +254,130 @@ public class Storage {
return uri;
}
+ private byte[] cameraMirrorIMG(byte[] jpeg,int or) {
+ android.util.Log.d("liujunjie22", "cameraMirrorIMG isCameraBackFacing : "+isCameraBackFacing(CameraServicesImpl.instance().getSettingsManager(),SCOPE_GLOBAL));
+ if (!CameraServicesImpl.instance().getSettingsManager().getBoolean(SCOPE_GLOBAL, KEY_CAMERA_MIRROR_IMG,false) ||
+ isCameraBackFacing(CameraServicesImpl.instance().getSettingsManager(),SCOPE_GLOBAL)){
+ return jpeg;
+ }
+ Bitmap mBitmap = BitmapFactory.decodeByteArray(jpeg, 0, jpeg.length);
+ //反转
+ Bitmap newBitmap = getFlipBitmap(mBitmap,or);
+
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ newBitmap.compress(Bitmap.CompressFormat.JPEG,100,byteArrayOutputStream);
+ return byteArrayOutputStream.toByteArray();
+
+
+ }
+
+ /**
+ * 左右翻转
+ * */
+ public static Bitmap getFlipBitmap(Bitmap bitmap,int or) {
+ Matrix matrix = new Matrix();
+ if (or == 0 || or == 180){
+ matrix.postScale(-1, 1);
+ }else {
+ matrix.postScale(1, -1);
+ }
+ return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(),
+ bitmap.getHeight(), matrix, false);
+ }
+
+ /**
+ * 添加水印
+ * @param data 原数据流
+ * @return byte[] 返回的数据流
+ */
+ private byte[] addPngWatermark(byte[] data, int res, Resources r,int orientation) {
+ android.util.Log.d("liujunjie22", "addTimeWatermark: "+res);
+ if (!CameraServicesImpl.instance().getSettingsManager().getBoolean(SCOPE_GLOBAL, KEY_CAMERA_WAKE_MAKE,false)){
+ android.util.Log.d("liujunjie22", "addPngWatermark: 开关没开");
+ return data;
+ }
+
+ Bitmap mBitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
+ int mBitmapWidth = mBitmap.getWidth();
+ int mBitmapHeight = mBitmap.getHeight();
+
+
+ Bitmap sy_t = BitmapFactory.decodeResource(r, res); //ver
+ /* Drawable vectorDrawable = mContext.getDrawable(res);
+ Bitmap sy_t = Bitmap.createBitmap(vectorDrawable.getIntrinsicWidth(),
+ vectorDrawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(sy_t);
+ vectorDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+ vectorDrawable.draw(canvas); */
+
+ Bitmap sy = null;
+ if (orientation == 270){
+ sy = getRotateBitmap(sy_t,90f);
+ }else if (orientation == 180){
+ sy = getRotateBitmap(sy_t,180f);
+ }else if (orientation == 90){
+ sy = getRotateBitmap(sy_t,270f);
+ }else if (orientation == 0){
+ sy = getRotateBitmap(sy_t,orientation+0f);
+ }
+
+ // int sy_w = 760/2;
+ int sy_w = mBitmapWidth/8; // /4
+ //int sy_h = 376/2;
+ //int sy_h = mBitmapHeight/8;
+ int sy_h = (int) (sy_w*0.5f); //保留比例
+
+ if (orientation == 90 || orientation == 270){
+ //sy_h = 760/2;
+ sy_h = mBitmapWidth/8;
+ //sy_w = 376/2;
+ sy_w = (int) (sy_w*0.5f);
+ }
+
+ int padding = (100*mBitmapWidth)/3264;
+
+ Bitmap mNewBitmap = Bitmap.createBitmap(mBitmapWidth, mBitmapHeight, Bitmap.Config.ARGB_8888); //创建一个新画布
+
+ Canvas mCanvas = new Canvas(mNewBitmap);
+ mCanvas.drawBitmap(mBitmap,0,0,null);//全部画完
+
+ Rect rect = new Rect(0,0,sy.getWidth(),sy.getHeight());
+
+ RectF rectF = null;
+ if (orientation == 0 ){ //左上右下
+ rectF = new RectF(mBitmapWidth -sy_w-padding ,mBitmapHeight - sy_h-padding,mBitmapWidth-padding,mBitmapHeight-padding); //右下
+
+ }else if (orientation == 90){
+
+ rectF = new RectF(mBitmapWidth -sy_w-padding ,padding,mBitmapWidth-padding,padding+sy_h); //右下
+
+ }else if (orientation == 180){
+
+ rectF = new RectF(padding ,padding,padding+sy_w,padding+sy_h); //右下
+
+ }else if (orientation == 270){
+
+ rectF = new RectF(padding ,mBitmapHeight - sy_h-padding,padding+sy_w,mBitmapHeight-padding); //右下
+ }
+ mCanvas.drawBitmap(sy,rect,rectF,null);
+ mCanvas.save();
+ mCanvas.restore();
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ mNewBitmap.compress(Bitmap.CompressFormat.JPEG,100,byteArrayOutputStream);
+ return byteArrayOutputStream.toByteArray();
+ }
+
+
+ /**
+ * 旋转bitmap
+ * */
+ public static Bitmap getRotateBitmap(Bitmap bitmap, float rotateDegree) {
+ Matrix matrix = new Matrix();
+ matrix.postRotate(rotateDegree);
+ return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(),
+ bitmap.getHeight(), matrix, false);
+ }
+
private void writeBitmap(Uri uri, ExifInterface exif, Bitmap bitmap, ContentResolver resolver)
throws FileNotFoundException, IOException {
OutputStream os = resolver.openOutputStream(uri);
diff --git a/src/com/android/camera/settings/Keys.java b/src/com/android/camera/settings/Keys.java
old mode 100644
new mode 100755
index 781a0c573..4668ac41f
--- a/src/com/android/camera/settings/Keys.java
+++ b/src/com/android/camera/settings/Keys.java
@@ -37,6 +37,8 @@ import com.android.camera2.R;
public class Keys {
public static final String KEY_RECORD_LOCATION = "pref_camera_recordlocation_key";
+ public static final String KEY_CAMERA_MIRROR_IMG = "pref_camera_mirror_image_key";
+ public static final String KEY_CAMERA_WAKE_MAKE = "pref_camera_watermark_camera_key";
public static final String KEY_VIDEO_QUALITY_BACK = "pref_video_quality_back_key";
public static final String KEY_VIDEO_QUALITY_FRONT = "pref_video_quality_front_key";
public static final String KEY_PICTURE_SIZE_BACK = "pref_camera_picturesize_back_key";
@@ -421,6 +423,12 @@ public class Keys {
if (settingsManager.isSet(SettingsManager.SCOPE_GLOBAL, KEY_RECORD_LOCATION))
settingsManager.set(SettingsManager.SCOPE_GLOBAL, KEY_RECORD_LOCATION, false);
+ if (settingsManager.isSet(SettingsManager.SCOPE_GLOBAL, KEY_CAMERA_WAKE_MAKE))
+ settingsManager.set(SettingsManager.SCOPE_GLOBAL, KEY_CAMERA_WAKE_MAKE, false);
+
+ if (settingsManager.isSet(SettingsManager.SCOPE_GLOBAL, KEY_CAMERA_MIRROR_IMG))
+ settingsManager.set(SettingsManager.SCOPE_GLOBAL, KEY_CAMERA_MIRROR_IMG, false);
+
if (settingsManager.isSet(SettingsManager.SCOPE_GLOBAL, KEY_PREVIEW_FULL_SIZE_ENABLE))
settingsManager.setToDefault(SettingsManager.SCOPE_GLOBAL, KEY_PREVIEW_FULL_SIZE_ENABLE);
if (settingsManager.isSet(SettingsManager.SCOPE_GLOBAL, KEY_PREVIEW_FULL_SIZE_ON))
05-26
359
![](https://csdnimg.cn/release/blogv2/dist/pc/img/readCountWhite.png)
01-05
05-30
“相关推荐”对你有帮助么?
-
非常没帮助
-
没帮助
-
一般
-
有帮助
-
非常有帮助
提交