rhodes 7.4.1 → 7.6.0

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraActivity.java

@@ -1,156 +0,0 @@
-/*------------------------------------------------------------------------
-* (The MIT License)
-*
-* Copyright (c) 2008-2011 Rhomobile, Inc.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*
-* http://rhomobile.com
-*------------------------------------------------------------------------*/
-
-package com.rho.camera;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.security.InvalidParameterException;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.BaseActivity;
-import com.rhomobile.rhodes.R;
-import com.rhomobile.rhodes.RhodesActivity;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.graphics.PixelFormat;
-import android.hardware.Camera;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.OrientationEventListener;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-public class CameraActivity extends BaseActivity implements OnClickListener {
-    private static final String TAG = CameraActivity.class.getSimpleName();
-    private CameraPreview mPreview;
-    private Camera mCamera = null;
-    private ICameraObject camera = null;
-    private Button button = null;
-    private String id = null;
-    //public static boolean CURRENT_SCREEN_AUTO_ROTATE_MODE;
-    //public static boolean CURRENT_FULL_SCREEN_MODE;
-
-    @Override
-    protected void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        Logger.T(TAG, "onCreate");
-        CameraObject.CURRENT_SCREEN_AUTO_ROTATE_MODE = RhodesActivity.safeGetInstance().getScreenAutoRotateMode();
-        CameraObject.CURRENT_FULL_SCREEN_MODE = RhodesActivity.safeGetInstance().getFullScreenMode();
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        RhodesActivity.safeGetInstance().setScreenAutoRotateMode(false);
-        RhodesActivity.safeGetInstance().setFullScreenMode(true);
-        if(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){
-    	   setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    	   setContentView(R.layout.camera_port);
-        }
-        if(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE){
-    	   setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-    	   setContentView(R.layout.camera_land);
-        }        
-        id = getIntent().getStringExtra(CameraExtension.INTENT_EXTRA_PREFIX + "CAMERA_ID");        
-        camera = ((CameraFactory)CameraFactorySingleton.getInstance()).getCameraObject(id);
-        button =(Button)findViewById(R.id.cameraButton);
-        button.setOnClickListener(this);
-        mPreview = new CameraPreview((SurfaceView)findViewById(R.id.previewSurface));
-
-    }
-    
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Logger.T(TAG, "onResume");        
-        startOrientationService();
-        try{
-          mPreview.startPreview(camera, this);
-          // Setting focus if supported by camera of the device after camera previewing
-          camera.setFocus(this);
-        }
-        catch(RuntimeException e){
-        	
-        }
-    }
-    
-    @Override
-    protected void onPause() {
-    	super.onPause();
-        Logger.T(TAG, "onPause");
-        button.setEnabled(true);
-        if(mCamera != null){
-          mCamera.stopPreview();
-          mCamera.release();
-          mCamera = null;
-        }
-    }
-    
-    @Override
-    protected void onStop() {
-    	super.onStop();
-	stopService(new Intent(CameraActivity.this,OrientationListnerService.class));
-	button.setEnabled(true);
-    }
-    
-    @Override
-    protected void onDestroy() {
-    	super.onDestroy();
-    	if(camera !=null){
-    		camera.stopPreview();
-    		camera = null;
-    	}
-    }
-	
-    @Override
-    public void onClick(View view) {
-        Logger.T(TAG, "onClick");
-        try{
-        if (view.getId() == R.id.cameraButton) {
-            Logger.T(TAG, "cameraButton");            
-            camera.doTakePicture(this,0);
-            button.setEnabled(false);
-          }
-        }
-        catch(Exception e){
-        	e.printStackTrace();
-        }
-    }
-    
-    private void startOrientationService()
-    {
-    	Intent i=new Intent(this,OrientationListnerService.class);
-    	startService(i);
-    }
-}

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraEclair.java

@@ -1,227 +0,0 @@
-package com.rho.camera;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import android.app.Activity;
-import android.hardware.Camera;
-import android.view.SurfaceHolder;
-
-import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.api.IMethodResult;
-
-public class CameraEclair extends CameraObject implements ICameraObject {
-    private static final String TAG = CameraEclair.class.getSimpleName();
-
-    private List<Camera.Size> mSupportedPictureSizes;
-
-    CameraEclair(String id) {
-        super(id);
-
-        getPropertiesMap().put("cameraType", "back");
-        getPropertiesMap().put("compressionFormat", "jpg");
-        getPropertiesMap().put("outputFormat", "image");
-        if (hasPermission()) {
-            openCamera();
-            Camera.Parameters params = getCamera().getParameters();
-            closeCamera();
-
-            mSupportedPictureSizes = params.getSupportedPictureSizes();
-            ISize maxSize = null;
-            for(android.hardware.Camera.Size size: mSupportedPictureSizes) {
-                Logger.D(TAG, "Possible picture size: " + size.width + "X" + size.height);
-                ISize curSize = new CameraSize(size);
-                if ((maxSize == null) || (curSize.D2() > maxSize.D2())) {
-                    maxSize = curSize;
-                }
-            }
-
-            getPropertiesMap().put("maxWidth", String.valueOf(maxSize.getWidth()));
-            getPropertiesMap().put("maxHeight", String.valueOf(maxSize.getHeight()));
-        }
-        else {
-            mSupportedPictureSizes = new ArrayList<Camera.Size>();
-            Logger.E(TAG, "Application has no permission to Camera access !!!");
-            getPropertiesMap().put("maxWidth", String.valueOf(0));
-            getPropertiesMap().put("maxHeight", String.valueOf(0));
-        }
-    }
-
-    @Override
-    public void startPreview(SurfaceHolder surfaceHolder) {
-        try {
-            openCamera();
-            Camera camera = getCamera();
-
-            Camera.Parameters cameraParams = camera.getParameters();
-
-            List<String> supportedFlashModes = cameraParams.getSupportedFlashModes();
-            if (supportedFlashModes != null) {
-                String flashMode = getFlashMode();
-                if (supportedFlashModes.contains(flashMode)) {
-                    cameraParams.setFlashMode(flashMode);
-                } else {
-                    Logger.W(TAG,"Flash mode is not supported by the camera: " + flashMode);
-                }
-            }
-
-            List<String> supportedColorEffects = cameraParams.getSupportedColorEffects();
-            if (supportedColorEffects != null) {
-                String colorEffect = getColorMode();
-                if (supportedColorEffects.contains(colorEffect)) {
-                    cameraParams.setColorEffect(colorEffect);
-                } else {
-                    Logger.W(TAG, "Color effect is not supported by the camera: " + colorEffect);
-                }
-            }
-
-            camera.setParameters(cameraParams);
-
-            camera.setPreviewDisplay(surfaceHolder);
-            camera.startPreview();
-        } catch (Throwable e) {
-            Logger.E(TAG, e);
-            return;
-        }
-    }
-
-    @Override
-    public void doTakePicture(final Activity previewActivity, int rotation) {
-        Logger.T(TAG, "doTakePicture: rotation: " + rotation);
-        openCamera();
-        ISize pictureSize = getDesiredSize();
-        Camera.Parameters params = getCamera().getParameters();
-        params.setRotation((90 + rotation) % 360);
-        if (pictureSize != null) {
-            params.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
-        }
-        getCamera().setParameters(params);
-        if (hasAutoFocus()) {
-            getCamera().autoFocus(new Camera.AutoFocusCallback() {
-                public void onAutoFocus(boolean success, Camera camera) {
-                    openCamera();
-                    getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
-                    closeCamera();
-                }
-            });
-
-        } else {
-            getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
-        }
-        closeCamera();
-    }
-
-    protected ISize getDesiredSize() {
-        String strDesiredWidth = getActualPropertyMap().get("desiredWidth");
-        String strDesiredHeight = getActualPropertyMap().get("desiredHeight");
-
-        if (Boolean.parseBoolean(getActualPropertyMap().get("useRealBitmapResize"))) {
-            return null;
-        }
-
-        if (Integer.valueOf(strDesiredWidth) <= 0) {
-            strDesiredWidth = null;
-        }
-        if (Integer.valueOf(strDesiredHeight) <= 0) {
-            strDesiredHeight = null;
-        }
-
-        int minDiff = Integer.MAX_VALUE;
-        ISize selectedSize = null;
-
-        if (strDesiredWidth != null && strDesiredHeight != null) {
-            ISize desiredSize = new RawSize(Integer.valueOf(strDesiredWidth),
-                                            Integer.valueOf(strDesiredHeight));
-            Logger.T(TAG, "Desired picture size: " + desiredSize);
-            for(Camera.Size size: mSupportedPictureSizes) {
-                ISize curSize = new CameraSize(size);
-                int curDiff = Math.abs(curSize.D2() - desiredSize.D2());
-                if (curDiff < minDiff) {
-                    minDiff = curDiff;
-                    selectedSize = curSize;
-                }
-            }
-        } else if (strDesiredWidth != null) {
-            int desiredWidth = Integer.valueOf(strDesiredWidth);
-            Logger.T(TAG, "Desired picture width: " + desiredWidth);
-            for(Camera.Size size: mSupportedPictureSizes) {
-                int curDiff = Math.abs(size.width - desiredWidth);
-                if (curDiff < minDiff) {
-                    minDiff = curDiff;
-                    selectedSize = new CameraSize(size);
-                }
-            }
-        } else if (strDesiredHeight != null) {
-            int desiredHeight = Integer.valueOf(strDesiredHeight);
-            Logger.T(TAG, "Desired picture width: " + desiredHeight);
-            for(Camera.Size size: mSupportedPictureSizes) {
-                int curDiff = Math.abs(size.height - desiredHeight);
-                if (curDiff < minDiff) {
-                    minDiff = curDiff;
-                    selectedSize = new CameraSize(size);
-                }
-            }
-        }
-        Logger.T(TAG, "Selected picture size: " + selectedSize);
-        return selectedSize;
-    }
-
-    protected boolean hasAutoFocus() {
-        if (!hasPermission()) {
-            Logger.D(TAG, "Application has no permission to Camera access !!!");
-            return false;
-        }
-        String focusMode = getCamera().getParameters().getFocusMode();
-        boolean supported = false;
-        if (focusMode != null) {
-            supported = (focusMode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focusMode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
-        }
-        return supported;
-
-    }
-
-    protected String getFlashMode() {
-        String flashParam = getActualPropertyMap().get("flashMode");
-        String flashMode = Camera.Parameters.FLASH_MODE_AUTO;
-        if (flashParam != null) {
-            if (flashParam.equals("on")) {
-                flashMode = Camera.Parameters.FLASH_MODE_ON;
-            } else
-                if (flashParam.equals("off")) {
-                    flashMode = Camera.Parameters.FLASH_MODE_OFF;
-                } else
-                    if (flashParam.equals("redEye")) {
-                        flashMode = Camera.Parameters.FLASH_MODE_RED_EYE;
-                    } else
-                        if (flashParam.equals("torch")) {
-                            flashMode = Camera.Parameters.FLASH_MODE_TORCH;
-                        }
-        }
-        Logger.T(TAG, "Flash mode: " + flashMode);
-        return flashMode;
-    }
-    protected String getColorMode() {
-        String colorParam = getActualPropertyMap().get("colorModel");
-        String colorMode = Camera.Parameters.EFFECT_NONE;
-        if (colorParam != null) {
-            if (colorParam.equals("grayscale")) {
-                colorMode = Camera.Parameters.EFFECT_MONO;
-            }
-        }
-        Logger.T(TAG, "Color effect: " + colorMode);
-        return colorMode;
-    }
-
-    public void getSupportedSizeList(IMethodResult result) {
-        List<Object> res = new ArrayList<Object>();
-        for(Camera.Size size: mSupportedPictureSizes) {
-            Map<String, Integer> resSize = new HashMap<String, Integer>();
-            resSize.put("width", Integer.valueOf(size.width));
-            resSize.put("height", Integer.valueOf(size.height));
-            res.add(resSize);
-        }
-        result.set(res);
-    }
-}

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraGingerbread.java

@@ -1,152 +0,0 @@
-package com.rho.camera;
-
-import java.io.File;
-import java.util.List;
-
-import android.app.Activity;
-import android.hardware.Camera;
-import android.os.Environment;
-
-import com.rhomobile.rhodes.Logger;
-
-
-import android.support.v4.content.PermissionChecker;
-import android.support.v4.content.ContextCompat;
-import android.content.pm.PackageManager;
-import com.rhomobile.rhodes.RhodesActivity;
-import android.Manifest;
-
-public class CameraGingerbread extends CameraEclair implements ICameraObject {
-    private static final String TAG = CameraGingerbread.class.getSimpleName();
-    
-    private int mCameraUsers = 0;
-
-    CameraGingerbread(String id) { 
-        super(id); 
-
-        getPropertiesMap().put("compressionFormat", "jpg");
-        getPropertiesMap().put("outputFormat", "image");
-
-        android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
-        android.hardware.Camera.getCameraInfo(getCameraIndex(), info);
-        switch (info.facing) {
-        case android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK:
-            getPropertiesMap().put("cameraType", "back");
-            break;
-        case android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT:
-            getPropertiesMap().put("cameraType", "front");
-            break;
-        default:
-            getPropertiesMap().put("cameraType", "unknown");
-            break;
-        }
-
-        if (hasPermission()) {
-            openCamera();
-            Camera.Parameters params = getCamera().getParameters();
-            closeCamera();
-
-            List<android.hardware.Camera.Size> listSize = params.getSupportedPictureSizes();
-            ISize maxSize = null;
-            for(android.hardware.Camera.Size curSize: listSize) {
-                Logger.D(TAG, "Possible picture size: " + curSize.width + "X" + curSize.height);
-                if ((maxSize == null) || (curSize.width > maxSize.getWidth())) {
-                    maxSize = new CameraSize(curSize);
-                }
-            }
-
-            getPropertiesMap().put("maxWidth", String.valueOf(maxSize.getWidth()));
-            getPropertiesMap().put("maxHeight", String.valueOf(maxSize.getHeight()));
-        }
-        else {
-            Logger.E(TAG, "Application has no permission to Camera access !!!");
-            getPropertiesMap().put("maxWidth", String.valueOf(0));
-            getPropertiesMap().put("maxHeight", String.valueOf(0));
-        }
-    }
-
-
-    @Override synchronized
-    protected void openCamera() {
-        if (hasPermission()) {
-            if (mCameraUsers == 0) {
-                setCamera(Camera.open(getCameraIndex()));
-            }
-            mCameraUsers++;
-        }
-    }
-
-    @Override synchronized
-    protected void closeCamera() {
-        if (hasPermission()) {
-            mCameraUsers--;
-            if (mCameraUsers == 0) {
-                getCamera().release();
-            }
-        }
-    }
-
-
-    protected String getTemporaryPath(String targetPath) {
-        if(Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            File externalRoot = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
-            if (! externalRoot.exists()){
-                if (! externalRoot.mkdirs()){
-                    Logger.E(TAG, "Failed to create directory: " + externalRoot);
-                    return null;
-                }
-            }
-            String filename = new File(targetPath).getName();
-            return new File(externalRoot, filename).getAbsolutePath();
-        } else {
-            return null;
-        }
-    }
-    @Override
-    public void doTakePicture(final Activity previewActivity, int rotation) {
-        Logger.T(TAG, "doTakePicture: rotation: " + rotation);
-        android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
-        android.hardware.Camera.getCameraInfo(getCameraIndex(), info);
-        openCamera();
-        ISize pictureSize = getDesiredSize();
-        Camera.Parameters params = getCamera().getParameters();
-        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-            params.setRotation((info.orientation - rotation + 360) % 360);
-        } else {
-            params.setRotation((info.orientation + rotation) % 360);
-        }
-        if (pictureSize != null) {
-            params.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
-        }
-        getCamera().setParameters(params);
-        getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
-
-        // commented the code because auto focus logic is moved as soon as camera previews not on button click
-        /*if (hasAutoFocus()) {
-            getCamera().autoFocus(new Camera.AutoFocusCallback() {
-                public void onAutoFocus(boolean success, Camera camera) {
-
-                    openCamera();
-                	getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
-                    closeCamera();
-                }
-            });
-
-        } else {
-            getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
-        }*/
-        closeCamera();
-    }
-
-    public boolean hasPermission() {
-        boolean res = (PermissionChecker.checkSelfPermission(RhodesActivity.getContext(), Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED);
-        if (!res) {
-            Logger.E(TAG, "Application has no permission to Camera access !!!");
-        }
-        //else {
-        //    Logger.E(TAG, "Application has permission to Camera access !!!");
-        //}
-        return res;
-    }
-
-}