From d0ac7497058a947a6c87a477b77d73bacfe14934 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 21 Oct 2024 22:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/build.gradle | 20 +++++++++---------- .../camera2raw/Camera2RawFragment.java | 20 +++++++++---------- .../layout-land/fragment_camera2_basic.xml | 11 ---------- .../res/layout/fragment_camera2_basic.xml | 12 +---------- .../src/main/res/values/base-strings.xml | 12 ++--------- Application/src/main/res/values/strings.xml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 25 insertions(+), 54 deletions(-) diff --git a/Application/build.gradle b/Application/build.gradle index 3cdc07d..2a87c6b 100644 --- a/Application/build.gradle +++ b/Application/build.gradle @@ -3,10 +3,11 @@ buildscript { repositories { jcenter() google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:7.2.1' } } @@ -15,13 +16,12 @@ apply plugin: 'com.android.application' repositories { jcenter() google() + mavenCentral() } dependencies { - compile "com.android.support:support-v4:27.0.2" - compile "com.android.support:support-v13:27.0.2" - compile "com.android.support:cardview-v7:27.0.2" - compile "com.android.support:appcompat-v7:27.0.2" + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:2.0.4' } // The sample build uses multiple directories to @@ -33,9 +33,7 @@ List dirs = [ 'template'] // boilerplate code that is generated by the sample template process android { - compileSdkVersion 27 - - buildToolsVersion "27.0.2" + compileSdk 33 defaultConfig { minSdkVersion 21 @@ -43,8 +41,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } sourceSets { @@ -59,4 +57,6 @@ android { } + ndkVersion '26.1.10909125' + } diff --git a/Application/src/main/java/com/example/android/camera2raw/Camera2RawFragment.java b/Application/src/main/java/com/example/android/camera2raw/Camera2RawFragment.java index d28c7fc..7bd20e7 100644 --- a/Application/src/main/java/com/example/android/camera2raw/Camera2RawFragment.java +++ b/Application/src/main/java/com/example/android/camera2raw/Camera2RawFragment.java @@ -55,8 +55,8 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.os.SystemClock; -import android.support.v13.app.FragmentCompat; import android.support.v4.app.ActivityCompat; +import android.text.TextUtils; import android.util.Log; import android.util.Size; import android.util.SparseIntArray; @@ -119,7 +119,7 @@ import java.util.concurrent.atomic.AtomicInteger; * */ public class Camera2RawFragment extends Fragment - implements View.OnClickListener, FragmentCompat.OnRequestPermissionsResultCallback { + implements View.OnClickListener { /** * Conversion from screen rotation to JPEG orientation. @@ -609,7 +609,7 @@ public class Camera2RawFragment extends Fragment @Override public void onViewCreated(final View view, Bundle savedInstanceState) { view.findViewById(R.id.picture).setOnClickListener(this); - view.findViewById(R.id.info).setOnClickListener(this); + // view.findViewById(R.id.info).setOnClickListener(this); mTextureView = (AutoFitTextureView) view.findViewById(R.id.texture); // Setup a new OrientationEventListener. This is used to handle rotation events like a @@ -804,9 +804,9 @@ public class Camera2RawFragment extends Fragment */ private void requestCameraPermissions() { if (shouldShowRationale()) { - PermissionConfirmationDialog.newInstance().show(getChildFragmentManager(), "dialog"); + // PermissionConfirmationDialog.newInstance().show(getChildFragmentManager(), "dialog"); } else { - FragmentCompat.requestPermissions(this, CAMERA_PERMISSIONS, REQUEST_CAMERA_PERMISSIONS); + // FragmentCompat.requestPermissions(this, CAMERA_PERMISSIONS, REQUEST_CAMERA_PERMISSIONS); } } @@ -832,9 +832,9 @@ public class Camera2RawFragment extends Fragment */ private boolean shouldShowRationale() { for (String permission : CAMERA_PERMISSIONS) { - if (FragmentCompat.shouldShowRequestPermissionRationale(this, permission)) { - return true; - } + // if (FragmentCompat.shouldShowRequestPermissionRationale(this, permission)) { + // return true; + // } } return false; } @@ -1829,8 +1829,8 @@ public class Camera2RawFragment extends Fragment .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - FragmentCompat.requestPermissions(parent, CAMERA_PERMISSIONS, - REQUEST_CAMERA_PERMISSIONS); + // FragmentCompat.requestPermissions(parent, CAMERA_PERMISSIONS, + // REQUEST_CAMERA_PERMISSIONS); } }) .setNegativeButton(android.R.string.cancel, diff --git a/Application/src/main/res/layout-land/fragment_camera2_basic.xml b/Application/src/main/res/layout-land/fragment_camera2_basic.xml index a9acd3f..3881adf 100644 --- a/Application/src/main/res/layout-land/fragment_camera2_basic.xml +++ b/Application/src/main/res/layout-land/fragment_camera2_basic.xml @@ -43,17 +43,6 @@ android:layout_gravity="center" android:text="@string/picture" /> - - - diff --git a/Application/src/main/res/layout/fragment_camera2_basic.xml b/Application/src/main/res/layout/fragment_camera2_basic.xml index cfd6f71..466b4d6 100644 --- a/Application/src/main/res/layout/fragment_camera2_basic.xml +++ b/Application/src/main/res/layout/fragment_camera2_basic.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" - android:layout_below="@id/texture" + android:background="#4285f4">