public/customCamera
9
0
Fork 0
mirror of https://gitee.com/shuto/customCamera.git synced 2026-05-02 00:07:24 +08:00
Code Issues Projects Releases Wiki Activity

Ajout du flash auto en plus du flash_on et flash_off

Browse Source
This commit is contained in:
Thomas BOY
2015-01-28 15:21:38 +01:00
parent 2296abc817
commit a150d5f0e3
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/customCamera/res/drawable-hdpi/icon_flash_auto.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

src/android/customCamera/res/layout/activity_camera_view.xml
+11 -2
View File
@@ -25,7 +25,7 @@
android:id="@+id/flash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginTop="60dp"
android:background="@android:color/transparent"
android:onClick="enableFlash"
android:src="@drawable/flash" />
@@ -34,11 +34,20 @@
android:id="@+id/noFlash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginTop="60dp"
android:background="@android:color/transparent"
android:onClick="enableFlash"
android:src="@drawable/no_flash" />
<ImageButton
android:id="@+id/flashAuto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:background="@android:color/transparent"
android:onClick="enableFlash"
android:src="@drawable/icon_flash_auto" />
<LinearLayout
android:id="@+id/beforePhoto"
android:layout_width="match_parent"
src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+8 -3
View File
@@ -866,25 +866,30 @@ public class CameraActivity extends Activity {
*/
public void enableFlash(View view) {
ImageButton flash = (ImageButton)findViewById(R.id.flash);
ImageButton flashAuto = (ImageButton)findViewById(R.id.flashAuto);
ImageButton noFlash = (ImageButton)findViewById(R.id.noFlash);
Camera.Parameters params = customCamera.getParameters();
if (hasFlash()) {
flash.setVisibility(View.INVISIBLE);
flashAuto.setVisibility(View.INVISIBLE);
noFlash.setVisibility(View.INVISIBLE);
if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_ON)
|| params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_AUTO)
|| params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_RED_EYE)
|| params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_TORCH)) {
params.setFlashMode(Camera.Parameters.FLASH_MODE_AUTO);
flashAuto.setVisibility(View.VISIBLE);
} else if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_AUTO)) {
params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
noFlash.setVisibility(View.VISIBLE);
flash.setVisibility(View.INVISIBLE);
} else if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_OFF)) {
params.setFlashMode(Camera.Parameters.FLASH_MODE_ON);
noFlash.setVisibility(View.INVISIBLE);
flash.setVisibility(View.VISIBLE);
}
customCamera.setParameters(params);
} else {
flash.setVisibility(View.INVISIBLE);
flashAuto.setVisibility(View.INVISIBLE);
noFlash.setVisibility(View.INVISIBLE);
}
}