tauplatform 1.0.2 → 1.0.3

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

@@ -24,7 +24,7 @@ public class CameraSingletonObject implements ICameraSingletonObject {
     private static final String TAG = CameraSingletonObject.class.getSimpleName();
     public static boolean deprecated_choose_pic;
     private int mId;
-    
+
     static int getCameraIndex(String id) {
         return Integer.valueOf(id.substring(7)).intValue();
     }
@@ -41,7 +41,7 @@ public class CameraSingletonObject implements ICameraSingletonObject {
     public CameraSingletonObject() {
         mId = 0;
     }
-    
+
     @Override
     public String getDefaultID() {
         return getCameraId(mId);
@@ -74,52 +74,74 @@ public class CameraSingletonObject implements ICameraSingletonObject {
 
     @Override
     public void choosePicture(Map<String, String> propertyMap, IMethodResult result) {
-    	if(propertyMap.get("deprecated") == null || propertyMap.get("deprecated").equalsIgnoreCase("false")){   
-    		propertyMap.put("deprecated", "false");
-    		deprecated_choose_pic = false;    	
-    	}
-    	else
-    		deprecated_choose_pic = true;
+        CameraObject.deprecated_take_pic = false;
+        if(propertyMap.get("deprecated") == null || propertyMap.get("deprecated").equalsIgnoreCase("false")){
+            propertyMap.put("deprecated", "false");
+            deprecated_choose_pic = false;
+        }
+        else
+        deprecated_choose_pic = true;
         Intent intent = null;
         String outputFormat = null;
-	if(propertyMap.get("outputFormat") == null){
-	    propertyMap.put("outputFormat", "image");
-	    outputFormat = propertyMap.get("outputFormat");	        	
-	}
-	else{
-	     outputFormat = propertyMap.get("outputFormat");	         
-	}
+        if(propertyMap.get("outputFormat") == null){
+            propertyMap.put("outputFormat", "image");
+            outputFormat = propertyMap.get("outputFormat");
+        }
+        else{
+            outputFormat = propertyMap.get("outputFormat");
+        }
         CameraFactory factory = (CameraFactory)CameraFactorySingleton.getInstance();
         factory.getRhoListener().setMethodResult(result);
         factory.getRhoListener().setActualPropertyMap(propertyMap);
         RhodesActivity ra = RhodesActivity.safeGetInstance();
         intent = new Intent(ra, FileList.class);
+
+        if ( Boolean.parseBoolean(propertyMap.get("useSystemViewfinder")) ) {
+            /*
+            Intent getIntent = new Intent(Intent.ACTION_GET_CONTENT);
+            getIntent.setType("image/*");
+
+            Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+            pickIntent.setType("image/*");
+
+            Intent chooserIntent = Intent.createChooser(getIntent, "Select Image");
+            chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] {pickIntent});
+
+            intent =  chooserIntent;
+            */
+
+            Intent gallery = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+            gallery.setType("image/*");
+            intent =  gallery;
+
+        }
+
         String fileName = null;
-	if(!propertyMap.containsKey("fileName")){
-	   fileName = "/sdcard/DCIM/Camera/";
-	}
-	else{
-	   fileName = propertyMap.get("fileName");
-	}
-	if (fileName != null && fileName.length() > 0) {
-	        if (outputFormat.equalsIgnoreCase("image")) {        	
-	           String tmpPath = getTemporaryLoc(fileName);
-	            if (tmpPath == null) {
-	                throw new RuntimeException("Failed to access shared temporary folder");
-	            }
-	            Uri captureUri = Uri.fromFile(new File(tmpPath));
-	            propertyMap.put("captureUri", captureUri.toString());
-	            intent.putExtra(MediaStore.EXTRA_OUTPUT, captureUri);
-	        }
-	        else 
-	        if(outputFormat.equalsIgnoreCase("dataUri"))
-	        {        	
-	            intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(fileName + ".jpg")));
-	        }        
-	        ra.startActivityForResult(intent, 0);
-	        propertyMap.put("ChoosePicture_Key", "ChoosePicture_Value");
+        if(!propertyMap.containsKey("fileName")){
+            fileName = "/sdcard/DCIM/Camera/";
         }
-         else {        	
+        else{
+            fileName = propertyMap.get("fileName");
+        }
+        if (fileName != null && fileName.length() > 0) {
+            if (outputFormat.equalsIgnoreCase("image")) {
+                String tmpPath = getTemporaryLoc(fileName);
+                if (tmpPath == null) {
+                    throw new RuntimeException("Failed to access shared temporary folder");
+                }
+                Uri captureUri = Uri.fromFile(new File(tmpPath));
+                propertyMap.put("captureUri", captureUri.toString());
+                intent.putExtra(MediaStore.EXTRA_OUTPUT, captureUri);
+            }
+            else
+            if(outputFormat.equalsIgnoreCase("dataUri"))
+            {
+                intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(fileName + ".jpg")));
+            }
+            ra.startActivityForResult(intent, 0);
+            propertyMap.put("ChoosePicture_Key", "ChoosePicture_Value");
+        }
+        else {
             result.setArgError("'fileName' parameter is missed");
         }
     }
@@ -139,9 +161,10 @@ public class CameraSingletonObject implements ICameraSingletonObject {
             return null;
         }
     }
-   /* @Override
+
+    /* @Override
     public void saveImageToDeviceGallery(String pathToImage, IMethodResult result) {
-        // TODO Auto-generated method stub
+    // TODO Auto-generated method stub
 
     }
     */
@@ -151,58 +174,60 @@ public class CameraSingletonObject implements ICameraSingletonObject {
         Logger.T(TAG, "createCameraObject: " + id);
         return new CameraObject(id);
     }
-	@Override
-	public void copyImageToDeviceGallery(String pathToImage,
-			IMethodResult result) {
-		// TODO Auto-generated method stub
-		String imageName = pathToImage.substring(pathToImage.lastIndexOf("/")+1, pathToImage.length());
-		String abspath = copyImageToDesired(pathToImage, imageName);
-	String strUri = null;
-		try {
-			strUri = MediaStore.Images.Media.insertImage(RhodesActivity.getContext().getContentResolver(), abspath, imageName, "Saving Image to Device Gallery through Camera");
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}	
-	}
-	private String copyImageToDesired(String pathToImage, String imageName) {
-		// TODO Auto-generated method stub
-		File oldFile = new File(RhoFileApi.absolutePath(pathToImage));
-		File mediafile  =  new File(RhoFileApi.getDbFilesPath(), imageName);
-	
-		InputStream finput= null;
-		FileOutputStream fout = null;
-		try {
-			finput= RhoFileApi.open(pathToImage);
-			fout = new FileOutputStream(mediafile);
-			byte[] b = new byte[1024];
-			int read = 0;
-			while ((read = finput.read(b)) != -1) {
-				fout.write(b, 0, read);
-			}
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			if(finput != null){
-				try {
-					finput.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-			
-			if(fout != null){
-				try {
-					fout.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		
-		return mediafile.getAbsolutePath();
-	}
+
+    @Override
+    public void copyImageToDeviceGallery(String pathToImage,
+    IMethodResult result) {
+        // TODO Auto-generated method stub
+        String imageName = pathToImage.substring(pathToImage.lastIndexOf("/")+1, pathToImage.length());
+        String abspath = copyImageToDesired(pathToImage, imageName);
+        String strUri = null;
+        try {
+            strUri = MediaStore.Images.Media.insertImage(RhodesActivity.getContext().getContentResolver(), abspath, imageName, "Saving Image to Device Gallery through Camera");
+        } catch (FileNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    private String copyImageToDesired(String pathToImage, String imageName) {
+        // TODO Auto-generated method stub
+        File oldFile = new File(RhoFileApi.absolutePath(pathToImage));
+        File mediafile  =  new File(RhoFileApi.getDbFilesPath(), imageName);
+
+        InputStream finput= null;
+        FileOutputStream fout = null;
+        try {
+            finput= RhoFileApi.open(pathToImage);
+            fout = new FileOutputStream(mediafile);
+            byte[] b = new byte[1024];
+            int read = 0;
+            while ((read = finput.read(b)) != -1) {
+                fout.write(b, 0, read);
+            }
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if(finput != null){
+                try {
+                    finput.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if(fout != null){
+                try {
+                    fout.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return mediafile.getAbsolutePath();
+    }
 
 }

data/lib/commonAPI/mediacapture/ext/platform/wm/Mediacapture.vcproj

@@ -16,7 +16,7 @@
 			Name="Win32"
 		/>
 		<Platform
-			Name="MC3000c50b (ARMV4I)"
+			Name="STANDARDSDK_500 (ARMV4I)"
 		/>
 		<Platform
 			Name="Windows Mobile 6.5.3 Professional DTK (ARMV4I)"
@@ -171,7 +171,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|MC3000c50b (ARMV4I)"
+			Name="Debug|STANDARDSDK_500 (ARMV4I)"
 			OutputDirectory="$(RHO_ROOT)\Platform\wm\Bin\$(PlatformName)\Rhodes\$(ConfigurationName)"
 			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -474,7 +474,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|MC3000c50b (ARMV4I)"
+			Name="Release|STANDARDSDK_500 (ARMV4I)"
 			OutputDirectory="$(RHO_ROOT)\Platform\wm\Bin\$(PlatformName)\Rhodes\$(ConfigurationName)"
 			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			ConfigurationType="4"

data/lib/commonAPI/mediacapture/ext/platform/wp8/src/Camera_impl.cs

@@ -109,7 +109,7 @@ namespace rho
             /// <param name="native"></param>
             public override void setNativeImpl(string strID, long native)
             {
-               
+
                 try
                 {
                     CRhoRuntime.getInstance().logEvent(" Camera class--> setNativeImpl" + strID);
@@ -118,10 +118,10 @@ namespace rho
                 }
                 catch (Exception ex)
                 {
-                    
-                  
+
+
                 }
-            
+
             }
             /// <summary>
             /// Set Basic Camera style like type of camera.
@@ -129,7 +129,7 @@ namespace rho
             /// <param name="strId"> Front or Back camera</param>
             public void InitializeCameraProperties(string strId)
             {
-              
+
                     double WidthofScreen = 0;
                     double HeightofScreen = 0;
 
@@ -214,7 +214,7 @@ namespace rho
                             Rho_Flash_Types.Add(FLASH_RED_EYE, 4);
                             Rho_FlashMode = (FlashMode)(Rho_Flash_Types[FLASH_AUTO]);
                             Rho_Flashmodes.Add("flash_mode", FLASH_AUTO);
-                           
+
                             LayoutGrid = MainPage.LayoutGrid();
 
                         }
@@ -282,8 +282,8 @@ namespace rho
 
 
 
-            
-              
+
+
             }
 
 
@@ -295,9 +295,9 @@ namespace rho
             IMethodResult StoregetCameratypeResult = null;
             public override void getCameraType(IMethodResult oResult)
             {
-              
-                           
-                           
+
+
+
                             CRhoRuntime.getInstance().logEvent("Camera class-> getCameraType");
                             using (PhotoCamera TempCamera = new PhotoCamera((CameraType)Rho_Paramenters["camera_type"]))
                             {
@@ -309,9 +309,9 @@ namespace rho
                                 {
                                     string strmessage = ex.Message;
                                 }
-                               
+
                             }
-                  
+
             }
 
             /// <summary>
@@ -320,7 +320,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void getMaxWidth(IMethodResult oResult)
             {
-               
+
                             CRhoRuntime.getInstance().logEvent("Camera class--> getMaxWidth");
                             try
                             {
@@ -331,7 +331,7 @@ namespace rho
                             {
                                 CRhoRuntime.getInstance().logEvent("Camera class-> getMaxWidth" + ex.Message);
                             }
-                       
+
 
 
             }
@@ -342,7 +342,7 @@ namespace rho
 
             public override void getMaxHeight(IMethodResult oResult)
             {
-               
+
                             CRhoRuntime.getInstance().logEvent("Camera class--> getMaxHeight");
                             try
                             {
@@ -353,7 +353,7 @@ namespace rho
                             {
                                 CRhoRuntime.getInstance().logEvent("Camera class->getMaxHeight" + ex.Message);
                             }
-                       
+
 
 
             }
@@ -364,7 +364,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void getSupportedSizeList(IMethodResult oResult)
             {
-               
+
                             CRhoRuntime.getInstance().logEvent("Camera class--> Entered getSupportedSizeList");
                             using (PhotoCamera TempCamera = new PhotoCamera((CameraType)Rho_Paramenters["camera_type"]))
                             {
@@ -393,7 +393,7 @@ namespace rho
 
                             }
                             CRhoRuntime.getInstance().logEvent("Camera class--> End getSupportedSizeList");
-                       
+
             }
 
             /// <summary>
@@ -403,10 +403,10 @@ namespace rho
 
             public override void getDesiredWidth(IMethodResult oResult)
             {
-               
+
                             CRhoRuntime.getInstance().logEvent("Camera class--> getDesiredWidth");
                             oResult.set(Rho_Paramenters["desired_width"].ToString());
-                        
+
             }
 
             /// <summary>
@@ -416,7 +416,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void setDesiredWidth(int desiredWidth, IMethodResult oResult)
             {
-               
+
                             try
                             {
                                 CRhoRuntime.getInstance().logEvent("Camera class--> setDesiredWidth " + desiredWidth);
@@ -427,7 +427,7 @@ namespace rho
                             {
                                 CRhoRuntime.getInstance().logEvent("Camera class-->setDesiredWidth--> Exception" + ex.ToString());
                             }
-                       
+
             }
             /// <summary>
             /// Get the setted Resolution Height of the Camera Type (Back/Front).
@@ -435,10 +435,10 @@ namespace rho
             /// <param name="oResult"></param>
             public override void getDesiredHeight(IMethodResult oResult)
             {
-                
+
                             CRhoRuntime.getInstance().logEvent("Camera class--> getDesiredHeight");
                             oResult.set(Rho_Paramenters["desired_height"].ToString());
-                        
+
             }
             /// <summary>
             /// Sets the  Height from the avaialble Resolution,if not available then sets to the nearest available Resolution.
@@ -447,7 +447,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void setDesiredHeight(int desiredHeight, IMethodResult oResult)
             {
-               
+
                                try
                                {
                                    CRhoRuntime.getInstance().logEvent("Camera class--> setDesiredHeight" + desiredHeight);
@@ -458,7 +458,7 @@ namespace rho
                                {
                                    CRhoRuntime.getInstance().logEvent("Camera class-->setDesiredHeight--> Exception" + ex.ToString());
                                }
-                          
+
             }
 
             /// <summary>
@@ -467,10 +467,10 @@ namespace rho
             /// <param name="oResult"></param>
             public override void getFileName(IMethodResult oResult)
             {
-               
+
                             CRhoRuntime.getInstance().logEvent("Camera class--> getFileName" + Rho_StringParameters["filename"]);
                             oResult.set(Rho_StringParameters["filename"]);
-                       
+
             }
 
             /// <summary>
@@ -510,7 +510,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void setCompressionFormat(string compressionFormat, IMethodResult oResult)
             {
-                //AS WP8 does not support any other format apart from jpeg, need to check in 8.1 
+                //AS WP8 does not support any other format apart from jpeg, need to check in 8.1
                 // Rho_StringParameters["ImageFormat"] = compressionFormat;
             }
             /// <summary>
@@ -529,7 +529,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void setOutputFormat(string outputFormat, IMethodResult oResult)
             {
-               
+
                             CRhoRuntime.getInstance().logEvent("Camera class->setOutputFormat type");
 
                             try
@@ -589,7 +589,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void getFlashMode(IMethodResult oResult)
             {
-               
+
                             string FlashModeType = FlashMode.Auto.ToString();
                             try
                             {
@@ -606,7 +606,7 @@ namespace rho
                                 CRhoRuntime.getInstance().logEvent("Camera class->invalid getFlashMode " + ex.ToString());
                             }
                             oResult.set(FlashModeType);
-                       
+
             }
 
             /// <summary>
@@ -616,7 +616,7 @@ namespace rho
             /// <param name="oResult"></param>
             public override void setFlashMode(string flashMode, IMethodResult oResult)
             {
-               
+
                             CRhoRuntime.getInstance().logEvent("Camera class--> setFlashMode");
                             try
                             {
@@ -629,7 +629,7 @@ namespace rho
                                 Rho_FlashMode = (FlashMode)(Rho_Flash_Types[FLASH_AUTO]);
                                 CRhoRuntime.getInstance().logEvent("Camera class->invalid setFlashMode " + ex.ToString());
                             }
-                        
+
             }
 
             /// <summary>
@@ -753,6 +753,26 @@ namespace rho
                 // implement this method in C# here
             }
 
+            /// <summary>
+            /// Not supported in WP8.
+            /// </summary>
+            /// <param name="oResult"></param>
+            public override void getUseRealBitmapResize(IMethodResult oResult)
+            {
+                // implement this method in C# here
+            }
+
+            /// <summary>
+            /// Not supported in WP8.
+            /// </summary>
+            /// <param name="useSystemViewfinder"></param>
+            /// <param name="oResult"></param>
+            public override void setUseRealBitmapResize(bool useSystemViewfinder, IMethodResult oResult)
+            {
+                // implement this method in C# here
+            }
+
+
             /// <summary>
             /// Not supported in WP8.
             /// </summary>
@@ -1266,8 +1286,8 @@ namespace rho
 
                     }
                 }
-               
-                
+
+
                 StorageFile storageFile = await localFolder.CreateFileAsync(fileName, CreationCollisionOption.ReplaceExisting);
                 Task<Stream> outputStreamTask = storageFile.OpenStreamForWriteAsync();
                 Stream outputStream = outputStreamTask.Result;
@@ -1511,7 +1531,7 @@ namespace rho
 
                     //Create a desired Camera Object.
                     Rho_StillCamera = new Microsoft.Devices.PhotoCamera((CameraType)Rho_Camera_selected);
-                    //Create a Video Brush for painting in Canvas.  
+                    //Create a Video Brush for painting in Canvas.
                     Rho_PhotoCameraBrush = new VideoBrush();
                     //Create a Camera Rotaion Object.
                     Rho_Camera_Rotation = new CompositeTransform();
@@ -1534,7 +1554,7 @@ namespace rho
                     SetCameraRotation(Rho_MainPage.Orientation);
                     //Set Desired camera as a child for Camera Brush.
                     Rho_PhotoCameraBrush.SetSource(Rho_StillCamera);
-                    //Add Camera Brush as background to the Canvas.            
+                    //Add Camera Brush as background to the Canvas.
                     Rho_PhotoCameraCanvas.Background = Rho_PhotoCameraBrush;
 
                     //Add canvas to the Main screen object.
@@ -1710,7 +1730,7 @@ namespace rho
             /// <param name="e"></param>
             void photoChooserTask_Completed(object sender, PhotoResult e)
             {
-                
+
                        CRhoRuntime.getInstance().logEvent("Camera class-->photoChooserTask_Completed");
                        try
                        {
@@ -1798,7 +1818,7 @@ namespace rho
                            m_StorechoosePictureResult.set(m_choosePicture_output);
                        }
 
-                  
+
             }
             /// <summary>
             /// Stores file in its own virtual drive rho\apps\app
@@ -1875,7 +1895,7 @@ namespace rho
                     }
                 }
 
-                
+
                 StorageFile storageFile = await localFolder.CreateFileAsync(fileName, CreationCollisionOption.ReplaceExisting);
                 Task<Stream> outputStreamTask = storageFile.OpenStreamForWriteAsync();
                 Stream outputStream = outputStreamTask.Result;
@@ -1926,7 +1946,7 @@ namespace rho
                     return storecamera;
                 }
             }
-           
+
         }
         #endregion
     }