瀏覽代碼

减少曝光,优化界面

詹子聪 5 年之前
父節點
當前提交
621bf107e4
共有 2 個文件被更改,包括 24 次插入5 次删除
  1. 2 2
      app/build.gradle
  2. 22 3
      app/src/main/java/com/miekir/ocr/ui/camera/otalia/OtaCameraActivity.java

+ 2 - 2
app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.miekir.ocr"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 19
-        versionName "1.0.19"
+        versionCode 20
+        versionName "1.0.20"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

+ 22 - 3
app/src/main/java/com/miekir/ocr/ui/camera/otalia/OtaCameraActivity.java

@@ -57,9 +57,26 @@ public class OtaCameraActivity extends BaseCameraActivity {
             @Override
             public void run() {
                 // 设置拍照的分辨率
-//                AspectRatio ratio = AspectRatio.of(new Size(camera.getWidth(), camera.getHeight()));
-//                SizeSelector selector = SizeSelectors.aspectRatio(ratio, 30);
-//                camera.setPictureSize(selector);
+                //AspectRatio ratio = AspectRatio.of(new Size(camera.getWidth(), camera.getHeight()));
+                /*AspectRatio ratio = AspectRatio.parse(camera.getWidth() + ":" + camera.getHeight());
+                SizeSelector matchRatio = SizeSelectors.aspectRatio(ratio, 50);
+                SizeSelector matchSize = new SizeSelector() {
+                    @NonNull
+                    @Override
+                    public List<Size> select(@NonNull List<Size> source) {
+                        List<Size> sizeList = new ArrayList<>();
+                        sizeList.add(new Size(camera.getWidth(), camera.getHeight()));
+                        return sizeList;
+                    }
+                };
+                SizeSelector matchAll = SizeSelectors.or(
+                        SizeSelectors.and(matchRatio, matchSize), // Try to respect both constraints.
+                        matchRatio, // If couldn't respect size, at least match aspect ratio
+                        matchSize, // If couldn't match aspect ratio, at least respect the size
+                        SizeSelectors.biggest() // If couldn't match any, take the biggest.
+                );
+                camera.setPictureSize(matchAll);*/
+
 
                 // 这两个方法只能设置小于屏幕分辨率的
                 //camera.setSnapshotMaxWidth(camera.getWidth() * 2 + 100);
@@ -67,6 +84,8 @@ public class OtaCameraActivity extends BaseCameraActivity {
                 // 高质量输出
                 //camera.setPictureSnapshotMetering(true);
 
+
+
                 setWidthHeight(camera.getWidth(), camera.getHeight());
             }
         });