WallyHackenslacker/NxtAR-cam
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Updated version number.

Browse Source
This commit is contained in:
Wally Hackenslacker
2014-06-18 18:28:48 -04:30
parent 14001b3bf0
commit 7afab2de73
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ve.ucv.ciens.ccg.nxtcam" package="ve.ucv.ciens.ccg.nxtcam"
android:versionCode="140404" android:versionCode="140618"
android:versionName="14.04.04" > android:versionName="14.06.18" >
<uses-sdk <uses-sdk
android:minSdkVersion="11" android:minSdkVersion="11"

2
src/ve/ucv/ciens/ccg/nxtcam/MainActivity.java
View File

@@ -87,7 +87,7 @@ public class MainActivity extends Activity implements WifiOnDialogListener, Conn
// Set up gui components. // Set up gui components.
startButton = (Button)findViewById(R.id.startButton); startButton = (Button)findViewById(R.id.startButton);
//startButton.setEnabled(false); startButton.setEnabled(false);
connectButton = (Button)findViewById(R.id.connectButton); connectButton = (Button)findViewById(R.id.connectButton);
// Set up services. // Set up services.

4
src/ve/ucv/ciens/ccg/nxtcam/camera/CameraPreview.java
View File

@@ -116,8 +116,10 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
try{ camera.stopPreview(); }catch (Exception e){ } try{ camera.stopPreview(); }catch (Exception e){ }
Logger.log_d(TAG, CLASS_NAME + ".surfaceChanged(): Request layout.");
requestLayout(); requestLayout();
Logger.log_d(TAG, CLASS_NAME + ".surfaceChanged(): Get parameters.");
camParams = camera.getParameters(); camParams = camera.getParameters();
sizes = camParams.getSupportedPreviewSizes(); sizes = camParams.getSupportedPreviewSizes();
@@ -194,7 +196,7 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
* @param target The ideal preview size. * @param target The ideal preview size.
* @return The size from the list of sizes that better matches the target. Null if sizes is null or empty. * @return The size from the list of sizes that better matches the target. Null if sizes is null or empty.
*/ */
private final Size getOptimalPreviewSize(List<Size> sizes, final Size target) { private Size getOptimalPreviewSize(List<Size> sizes, final Size target) {
final int TARGET_HEIGHT = target.height; final int TARGET_HEIGHT = target.height;
Size optimalSize = null; Size optimalSize = null;
double minDiff = Double.MAX_VALUE; double minDiff = Double.MAX_VALUE;