diff --git a/app/build.gradle b/app/build.gradle index 1ea9b01..3397ec3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.xypower.mppreview" - minSdk 28 + minSdk 30 targetSdk 30 versionCode 3 versionName "1.2" diff --git a/app/src/main/java/com/xypower/mppreview/MainActivity.java b/app/src/main/java/com/xypower/mppreview/MainActivity.java index 4c6fa6a..18c84a7 100644 --- a/app/src/main/java/com/xypower/mppreview/MainActivity.java +++ b/app/src/main/java/com/xypower/mppreview/MainActivity.java @@ -34,7 +34,6 @@ import com.xypower.mppreview.ui.CameraChannelActivity; import com.xypower.mppreview.utils.PhotoUtil; import com.xypower.mppreview.bean.Contants; import com.xypower.mppreview.utils.CameraUtils; -import com.xypower.mppreview.utils.RouteManager; import java.io.File; @@ -213,6 +212,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE); try { String[] cameraIds = manager.getCameraIdList(); + return cameraIds.length; } catch (CameraAccessException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/xypower/mppreview/ui/CameraChannelActivity.java b/app/src/main/java/com/xypower/mppreview/ui/CameraChannelActivity.java index 5176c0a..bd74478 100644 --- a/app/src/main/java/com/xypower/mppreview/ui/CameraChannelActivity.java +++ b/app/src/main/java/com/xypower/mppreview/ui/CameraChannelActivity.java @@ -71,11 +71,23 @@ public class CameraChannelActivity extends AppCompatActivity implements View.OnC private void initEvent() { viewBinding.imageCaptureButton.setOnClickListener(this); + viewBinding.foward.setOnClickListener(this); + viewBinding.back.setOnClickListener(this); } @Override public void onClick(View v) { - takePhoto(); + switch (v.getId()) { + case R.id.image_capture_button: + takePhoto(); + break; + case R.id.foward: + setInt(311, 101); + break; + case R.id.back: + setInt(311, 201); + break; + } } private void startCamera(int cameraid) { @@ -110,7 +122,7 @@ public class CameraChannelActivity extends AppCompatActivity implements View.OnC processCameraProvider.unbindAll(); // 绑定用例至相机 - processCameraProvider.bindToLifecycle(CameraChannelActivity.this, cameraSelector, preview,imageCapture,imageAnalysis); + processCameraProvider.bindToLifecycle(CameraChannelActivity.this, cameraSelector, preview, imageCapture, imageAnalysis); } catch (Exception e) { Log.e(Contants.TAG, "用例绑定失败!" + e); diff --git a/app/src/main/res/layout/activity_camera_channel.xml b/app/src/main/res/layout/activity_camera_channel.xml index 73f3688..f65187d 100644 --- a/app/src/main/res/layout/activity_camera_channel.xml +++ b/app/src/main/res/layout/activity_camera_channel.xml @@ -12,17 +12,28 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - - - - - - - - - - - +