From 6ffdb1bd22b8dedf51a43ae3cf9e4e2bf057931f Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Tue, 15 Oct 2024 12:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E7=9B=B8?=
 =?UTF-8?q?=E6=9C=BA=E6=8B=8D=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  7 ++++
 .../com/xypower/mpapp/MicroPhotoService.java  | 35 +++++++++++++++++++
 .../java/com/xypower/mpapp/adb/CameraAdb.java |  9 +++--
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c4df279f..012a5f3a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -79,6 +79,13 @@
             android:enabled="true"
             android:exported="false"
             android:grantUriPermissions="true" />
+
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+        <intent>
+            <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
+        </intent>
     </queries>
 
     <application
diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index b805fbb6..82e60902 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -48,6 +48,7 @@ import androidx.core.app.NotificationCompat;
 import androidx.core.content.FileProvider;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import android.provider.MediaStore;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -75,6 +76,7 @@ import java.io.RandomAccessFile;
 import java.io.Reader;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
+import java.net.URI;
 import java.nio.channels.FileLock;
 import java.util.ArrayList;
 import java.util.Date;
@@ -1552,7 +1554,39 @@ cellSignalStrengthGsm.getDbm();
 
     public void callSystemCamera(final int cameraId, final long photoId) {
         Context context = getApplicationContext();
+
+        /*
+        Intent intent = null;
+        if (cameraId == 1) {
+
+            intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+
+            intent.putExtra("android.intent.extras.CAMERA_FACING", android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT);
+
+            intent.putExtra("android.intent.extras.LENS_FACING_FRONT", 1);
+
+            intent.putExtra("android.intent.extra.USE_FRONT_CAMERA", true);
+
+        } else{
+            intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        }
+
+        String appPath = MicroPhotoContext.buildMpAppDir(context);
+        File targetPath = new File(new File(appPath), "tmp/" + Long.toString(photoId) + ".jpg");
+
+
+        // Uri uri = FileProvider.getUriForFile(this, getPackageName() + ".fileprovider", targetPath);
+
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(targetPath));
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        if (intent.resolveActivity(getPackageManager()) != null) {
+            startActivity(intent);
+        }
+        */
+
         final CameraAdb cameraAdb = new CameraAdb(context, MicroPhotoContext.buildMpAppDir(context));
+
         cameraAdb.setCallback(new Runnable() {
             @Override
             public void run() {
@@ -1567,6 +1601,7 @@ cellSignalStrengthGsm.getDbm();
             }
         });
         cameraAdb.takePhoto(cameraId);
+
     }
     ////////////////////////GPS////////////////////
 
diff --git a/app/src/main/java/com/xypower/mpapp/adb/CameraAdb.java b/app/src/main/java/com/xypower/mpapp/adb/CameraAdb.java
index 01d36fbc..2da62052 100644
--- a/app/src/main/java/com/xypower/mpapp/adb/CameraAdb.java
+++ b/app/src/main/java/com/xypower/mpapp/adb/CameraAdb.java
@@ -8,6 +8,7 @@ import android.util.Log;
 import com.dev.devapi.api.SysApi;
 import com.xypower.common.FilesUtils;
 import com.xypower.common.MicroPhotoContext;
+import com.xypower.mpapp.BuildConfig;
 import com.xypower.mpapp.MicroPhotoService;
 import com.xypower.mpapp.v2.Camera2VideoActivity;
 
@@ -125,8 +126,12 @@ public class CameraAdb {
                 File targetFile = new File(new File(photoPath), photoFile);
                 try {
                     File srcFile = opFile.get();
-
-                    res = srcFile.renameTo(targetFile);
+                    if (BuildConfig.DEBUG) {
+                        FilesUtils.copyFile(srcFile, targetFile);
+                        res = true;
+                    } else {
+                        res = srcFile.renameTo(targetFile);
+                    }
                     if (res) {
                         targetPath = targetFile.getAbsolutePath();
                         break;