From a23bb0f37797ce5e737fa1360b29f01c91041fa3 Mon Sep 17 00:00:00 2001
From: buddygr <buddygr@126.com>
Date: Thu, 28 Apr 2022 13:37:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E6=89=8B=E7=94=B5=E7=AD=92=E9=97=AA=E4=B8=80=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qpython/qsl4a/qsl4a/facade/AndroidFacade.java    |  4 ++--
 .../org/qpython/qsl4a/qsl4a/facade/CameraFacade.java | 12 +++++++++---
 .../org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java  |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
index d6db9e9..62991ca 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
@@ -376,7 +376,7 @@ public class AndroidFacade extends RpcReceiver {
 
   void startActivity(final Intent intent) {
     try {
-      intent.setFlags(intentFlags);
+      intent.setFlags(intent.getFlags() | intentFlags);
       context.startActivity(intent);
     } catch (Exception e) {
       LogUtil.e("Failed to launch intent.", e);
@@ -426,7 +426,6 @@ public class AndroidFacade extends RpcReceiver {
   }
 
   public void doStartActivity(final Intent intent, Boolean wait) throws Exception {
-    intent.setFlags(intent.getFlags() | intentFlags);
     if (wait == null || !wait) {
       startActivity(intent);
     } else {
@@ -436,6 +435,7 @@ public class AndroidFacade extends RpcReceiver {
         @Override
         public void onCreate() {
           super.onCreate();
+          intent.setFlags(intent.getFlags() | intentFlags);
           startActivity(intent);
         }
 
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
index 6d376e5..cb68e1b 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
@@ -16,6 +16,7 @@
 
 package org.qpython.qsl4a.qsl4a.facade;
 
+import android.annotation.SuppressLint;
 import android.app.Service;
 
 import android.content.Context;
@@ -62,7 +63,7 @@ import java.util.concurrent.CountDownLatch;
 public class CameraFacade extends RpcReceiver {
 
   private final Service mService;
-  private final Parameters mParameters;
+  private Parameters mParameters;
   private final Context context;
 
   private class BooleanResult {
@@ -77,12 +78,12 @@ public class CameraFacade extends RpcReceiver {
     context = mService.getApplicationContext();
     //  ↑  //
 
-    Camera camera = Camera.open();
+    /*Camera camera = Camera.open();
     try {
       mParameters = camera.getParameters();
     } finally {
       camera.release();
-    }
+    }*/
   }
 
   @Rpc(description = "Take a picture and save it to the specified path.", returns = "A map of Booleans autoFocus and takePicture where True indicates success.")
@@ -93,6 +94,11 @@ public class CameraFacade extends RpcReceiver {
     final BooleanResult takePictureResult = new BooleanResult();
 
     Camera camera = Camera.open();
+    try {
+      mParameters = camera.getParameters();
+    } finally {
+      camera.release();
+    }
     camera.setParameters(mParameters);
 
     try {
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
index 57e1a00..f13bb9b 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
@@ -206,7 +206,7 @@ public class PhoneFacade extends RpcReceiver {
         // TODO(damonkohler): API level 5 has many more types.
         int networkType;
         if (SDK_INT >= 24) {
-        networkType = mTelephonyManager.getDataNetworkType();
+            networkType = mTelephonyManager.getDataNetworkType();
         } else {
             networkType = mTelephonyManager.getNetworkType();
         }
-- 
Gitee


From 42147ca143f63e3c9f8181dff79f0d559674afb6 Mon Sep 17 00:00:00 2001
From: buddygr <buddygr@126.com>
Date: Thu, 28 Apr 2022 15:02:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E6=89=8B=E7=94=B5=E7=AD=92=E9=97=AA=E4=B8=80=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
index cb68e1b..1890152 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
@@ -94,12 +94,12 @@ public class CameraFacade extends RpcReceiver {
     final BooleanResult takePictureResult = new BooleanResult();
 
     Camera camera = Camera.open();
-    try {
+    /*try {
       mParameters = camera.getParameters();
     } finally {
       camera.release();
     }
-    camera.setParameters(mParameters);
+    camera.setParameters(mParameters);*/
 
     try {
       Method method = camera.getClass().getMethod("setDisplayOrientation", int.class);
-- 
Gitee