diff --git a/.idea/dictionaries/w9jds.xml b/.idea/dictionaries/w9jds.xml new file mode 100644 index 0000000..ec033c4 --- /dev/null +++ b/.idea/dictionaries/w9jds.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9bddcfb..33c4588 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -19,6 +19,7 @@ + @@ -87,18 +88,70 @@ - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -107,46 +160,30 @@ - - + + - - - - + - - + + - - - - - - - - - - - - - - - - + + + - - + + - - + + @@ -186,15 +223,15 @@ - @@ -800,83 +683,50 @@ - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + - - + + - - - - - - - - - + + + - - + + - - + + + - + - - + + @@ -887,118 +737,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1013,220 +751,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - - - - - - - - - + + - - + + - + - - + + - + + + + - - - - - - - - - + - - + + - + - - + + - + - - - + + + + + + + - + - - + + - + - - + + - - + + - - - - + - - - - - - - - - + - - + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 58d8c9c..1cb1e26 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="21" + android:versionName="0.5.2-beta"> @@ -25,6 +25,9 @@ android:allowBackup="true" android:label="@string/app_name" > + + - + diff --git a/Gallery4Glass.apk b/Gallery4Glass.apk index 3947c4c..b512e24 100644 Binary files a/Gallery4Glass.apk and b/Gallery4Glass.apk differ diff --git a/out/production/Gallery4Glass/Gallery4Glass.apk b/out/production/Gallery4Glass/Gallery4Glass.apk index 8b60289..1cb4d24 100644 Binary files a/out/production/Gallery4Glass/Gallery4Glass.apk and b/out/production/Gallery4Glass/Gallery4Glass.apk differ diff --git a/out/production/Gallery4Glass/Gallery4Glass.unaligned.apk b/out/production/Gallery4Glass/Gallery4Glass.unaligned.apk index 8e42a82..e078b39 100644 Binary files a/out/production/Gallery4Glass/Gallery4Glass.unaligned.apk and b/out/production/Gallery4Glass/Gallery4Glass.unaligned.apk differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1$1.class index 3ea6e44..732fd48 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1$1.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1$1.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1.class index 98dc842..308ae10 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2$1.class index d84c981..8347cf2 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2$1.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2$1.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2.class index 386f9cf..2b4198d 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$3.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$3.class index 7b4ab4d..327474c 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$3.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$3.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$4.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$4.class index 38184ae..b436c2b 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$4.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$4.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$5.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$5.class deleted file mode 100644 index 2fba8b2..0000000 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$5.class and /dev/null differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$6.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$6.class index 9beef89..a1d345d 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$6.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$6.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$7.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$7.class new file mode 100644 index 0000000..4023c19 Binary files /dev/null and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$7.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$8.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$8.class new file mode 100644 index 0000000..ff76f53 Binary files /dev/null and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$8.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$SavePhotoTask.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$SavePhotoTask.class index 3241840..004b4b3 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$SavePhotoTask.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$SavePhotoTask.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity.class index 5a0ca0d..fd82b80 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$1.class index 1646733..74198e8 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$1.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$1.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$2.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$2.class index 37fcc2f..869eb13 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$2.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$2.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3$1.class index 1a70b46..ca84bac 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3$1.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3$1.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3.class index 8246e7e..c76b764 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$3.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$4.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$4.class index 2330080..12c015d 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$4.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$4.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask$1.class index 66cf39c..1f30278 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask$1.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask$1.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask.class index 62fa305..2a701b3 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity$ImageUploaderTask.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity.class index fa596e9..b2f387c 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity.class differ diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/Services/LiveCardService.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/Services/LiveCardService.class index aebbb7d..d6e99bc 100644 Binary files a/out/production/Gallery4Glass/com/w9jds/gallery4glass/Services/LiveCardService.class and b/out/production/Gallery4Glass/com/w9jds/gallery4glass/Services/LiveCardService.class differ diff --git a/out/production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView.class b/out/production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView.class index 3163c67..f2a7b1b 100644 Binary files a/out/production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView.class and b/out/production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView.class differ diff --git a/src/com/w9jds/gallery4glass/CameraActivity.java b/src/com/w9jds/gallery4glass/CameraActivity.java index 6b4de9a..99174c3 100755 --- a/src/com/w9jds/gallery4glass/CameraActivity.java +++ b/src/com/w9jds/gallery4glass/CameraActivity.java @@ -12,7 +12,9 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; +import android.os.FileObserver; import android.os.Handler; +import android.provider.MediaStore; import android.util.Log; import android.view.KeyEvent; import android.view.Menu; @@ -22,6 +24,7 @@ import com.google.analytics.tracking.android.EasyTracker; import com.google.analytics.tracking.android.MapBuilder; +import com.google.android.glass.media.CameraManager; import com.google.android.glass.media.Sounds; import com.google.android.glass.touchpad.Gesture; import com.google.android.glass.touchpad.GestureDetector; @@ -46,18 +49,18 @@ public class CameraActivity extends Activity implements CameraBridgeViewBase.CvC { public static final String ACTION_WINK = "com.google.glass.action.EYE_GESTURE"; - - public static String msColorEffect = Camera.Parameters.EFFECT_NONE; + private boolean inSettings = false; + private Camera.Parameters mcpParams; //create an adapter for the cardscrollviewer private csaAdapter mcvAdapter; // Declare a new Gesture Detector - private GestureDetector mGestureDetector; + private GestureDetector mCameraGestureDetector; // Declare a new Camera Preview Surface private OpenCVSurface mPreviewSurface; //create an audio manager for sounds private AudioManager maManager; // Zoom level of the camera - private int mnZoom = 0; +// private int mnZoom = 0; @Override public void onCreate(Bundle bSavedInstanceState) @@ -70,7 +73,7 @@ public void onCreate(Bundle bSavedInstanceState) OpenCVLoader.initDebug(); // Turn on Gestures - mGestureDetector = createGestureDetector(this); + mCameraGestureDetector = createCameraGestureDetector(this); //create audio manager maManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); @@ -94,20 +97,16 @@ public boolean onCreateOptionsMenu(Menu menu) public boolean onOptionsItemSelected(android.view.MenuItem iItem) { CardScrollView csvCardsView; - final Camera cCamera; - Camera.Parameters params; switch (iItem.getItemId()) { case R.id.scene_menu_item: - - cCamera = mPreviewSurface.getCamera(); - - params = cCamera.getParameters(); + //disable preview + inSettings = true; mPreviewSurface.disableView(); //add a card to the card scroll view for each supported Scenes that is available - final List lsScenes = params.getSupportedSceneModes(); + final List lsScenes = mcpParams.getSupportedSceneModes(); //create a new card scroll viewer for this context csvCardsView = new CardScrollView(this); @@ -135,13 +134,11 @@ public void run() { Camera cCamera = mPreviewSurface.getCamera(); - Camera.Parameters cParams = cCamera.getParameters(); + mcpParams.setSceneMode(lsScenes.get(position)); - cParams.setSceneMode(lsScenes.get(position)); - - cCamera.setParameters(cParams); + cCamera.setParameters(mcpParams); } - }, 2000); + }, 200); } }); @@ -153,13 +150,10 @@ public void run() case R.id.white_balance_menu_item: - cCamera = mPreviewSurface.getCamera(); - - params = cCamera.getParameters(); + inSettings = true; mPreviewSurface.disableView(); //add a card to the card scroll view for each supported White Balances that is available - final List lsWhites = params.getSupportedWhiteBalance(); - + final List lsWhites = mcpParams.getSupportedWhiteBalance(); //create a new card scroll viewer for this context csvCardsView = new CardScrollView(this); @@ -186,13 +180,11 @@ public void run() { Camera cCamera = mPreviewSurface.getCamera(); - Camera.Parameters cParams = cCamera.getParameters(); + mcpParams.setWhiteBalance(lsWhites.get(position)); - cParams.setWhiteBalance(lsWhites.get(position)); - - cCamera.setParameters(cParams); + cCamera.setParameters(mcpParams); } - }, 2000); + }, 200); } }); @@ -206,11 +198,11 @@ public void run() // // cCamera = mPreviewSurface.getCamera(); // -// params = cCamera.getParameters(); +// mcpParams = cCamera.getParameters(); // mPreviewSurface.disableView(); // // //add a card to the card scroll view for each supported Scenes that is available -// final List lsEffects = params.getSupportedColorEffects(); +// final List lsEffects = mcpParams.getSupportedColorEffects(); // // //create a new card scroll viewer for this context // csvCardsView = new CardScrollView(this); @@ -238,15 +230,11 @@ public void run() // { // Camera cCamera = mPreviewSurface.getCamera(); // -// Camera.Parameters cParams = cCamera.getParameters(); -// -// cParams.setColorEffect(lsEffects.get(position)); -// -// cCamera.setParameters(cParams); -// cCamera.startPreview(); +// mcpParams.setColorEffect(lsEffects.get(position)); // +// cCamera.setParameters(mcpParams); // } -// }, 1000); +// }, 200); // // } // }); @@ -255,7 +243,7 @@ public void run() // setContentView(csvCardsView); // // return true; - +// default: return super.onOptionsItemSelected(iItem); } @@ -279,6 +267,9 @@ public void onStop() private void setPreviewSurface() { + if (inSettings) + inSettings = false; + setContentView(R.layout.opencvpreview_layout); mPreviewSurface = (OpenCVSurface) findViewById(R.id.camera_preview_opencv); @@ -314,7 +305,7 @@ protected void onPause() mPreviewSurface.disableView(); } - private GestureDetector createGestureDetector(final Context cContext) + private GestureDetector createCameraGestureDetector(final Context cContext) { GestureDetector gestureDetector = new GestureDetector(cContext); @@ -329,12 +320,6 @@ public boolean onGesture(Gesture gGesture) { if (gGesture == Gesture.TAP) { - EasyTracker.getInstance(getApplicationContext()).send(MapBuilder.createEvent( - "Camera", - "Taken", - "picture_taken", - null).build()); - // Play the tap sound maManager.playSoundEffect(Sounds.TAP); // Get the camera from the preview surface @@ -350,36 +335,43 @@ else if (gGesture == Gesture.SWIPE_DOWN) { // Play the dismiss sound maManager.playSoundEffect(Sounds.DISMISSED); - // If the preview surface isn't null release the camera - if (mPreviewSurface != null) - mPreviewSurface.disableView(); - // Close activity - finish(); + + if (!inSettings) + { + // If the preview surface isn't null release the camera + if (mPreviewSurface != null) + mPreviewSurface.disableView(); + // Close activity + finish(); + } + else + setPreviewSurface(); + + return true; + } - else if (gGesture == Gesture.SWIPE_RIGHT) - { -// // Get the camera from the preview surface -// Camera cCamera = mPreviewSurface.getCamera(); -// -// if ((mnZoom + 5) < cCamera.getParameters().getMaxZoom()) +// else if (gGesture == Gesture.SWIPE_RIGHT) +// { +// if ((mnZoom + 5) < mcpParams.getMaxZoom()) // { -// // Zoom the camera in 5 -// Camera.Parameters camParms = cCamera.getParameters(); -// camParms.setZoom(mnZoom += 5); -// cCamera.setParameters(camParms); +// // Get the camera from the preview surface +// Camera cCamera = mPreviewSurface.getCamera(); +// +// mcpParams.setZoom(mnZoom += 5); +// cCamera.setParameters(mcpParams); // } - } +// } - else if (gGesture == Gesture.SWIPE_LEFT) - { +// else if (gGesture == Gesture.SWIPE_LEFT) +// { // // Get the camera from the preview surface // Camera cCamera = mPreviewSurface.getCamera(); // // if (mnZoom != 0) // //zoom the camera out 5 // cCamera.startSmoothZoom(mnZoom -= 1); - } +// } else if (gGesture == Gesture.TWO_SWIPE_RIGHT) { @@ -410,13 +402,15 @@ public void onShutter() final transient private Camera.PictureCallback jpgPictureCallback = new Camera.PictureCallback() { - /** - * After taking picture, onPictureTaken() will be called where image - * will be saved. - */ @Override public void onPictureTaken(final byte[] data, final Camera camera) { + EasyTracker.getInstance(getApplicationContext()).send(MapBuilder.createEvent( + "Camera", + "Taken", + "picture_taken", + null).build()); + new SavePhotoTask().execute(data); setPreviewSurface(); } @@ -425,8 +419,8 @@ public void onPictureTaken(final byte[] data, final Camera camera) @Override public boolean onGenericMotionEvent(MotionEvent event) { - if (mGestureDetector != null) - return mGestureDetector.onMotionEvent(event); + if (mCameraGestureDetector != null) + return mCameraGestureDetector.onMotionEvent(event); return false; } @@ -446,7 +440,6 @@ public boolean onKeyDown(int keyCode, KeyEvent event) return true; } - else return super.onKeyDown(keyCode, event); } @@ -500,7 +493,31 @@ public void onDestroy() @Override public void onCameraViewStarted(int width, int height) { + if (mcpParams != null) + { + new Handler().postDelayed(new Runnable() + { + @Override + public void run() + { + Camera cCamera = mPreviewSurface.getCamera(); + cCamera.setParameters(mcpParams); + } + }, 200); + } + else + { + new Handler().postDelayed(new Runnable() + { + @Override + public void run() + { + Camera cCamera = mPreviewSurface.getCamera(); + mcpParams = cCamera.getParameters(); + } + }, 200); + } } @Override diff --git a/src/com/w9jds/gallery4glass/Classes/StorageService.java b/src/com/w9jds/gallery4glass/Classes/StorageService.java index 2cfc839..4ed23b4 100755 --- a/src/com/w9jds/gallery4glass/Classes/StorageService.java +++ b/src/com/w9jds/gallery4glass/Classes/StorageService.java @@ -42,7 +42,7 @@ public StorageService(Context context) mContext = context; try { - + mTableContainers = mClient.getTable("blobcontainers"); mTableBlobs = mClient.getTable("blobs"); } diff --git a/src/com/w9jds/gallery4glass/MainActivity.java b/src/com/w9jds/gallery4glass/MainActivity.java index 2f7b60a..57cdd93 100755 --- a/src/com/w9jds/gallery4glass/MainActivity.java +++ b/src/com/w9jds/gallery4glass/MainActivity.java @@ -6,9 +6,11 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.ServiceConnection; import android.database.Cursor; import android.media.AudioManager; import android.net.ConnectivityManager; @@ -16,6 +18,7 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; +import android.os.IBinder; import android.provider.MediaStore; import android.util.Log; import android.view.Menu; @@ -47,6 +50,8 @@ import com.google.analytics.tracking.android.EasyTracker; +import static com.google.android.gms.common.GooglePlayServicesUtil.isGooglePlayServicesAvailable; + @SuppressLint("DefaultLocale") public class MainActivity extends Activity { @@ -83,7 +88,7 @@ public class MainActivity extends Activity // mliveCardService = null; // } // }; - +// // private void bindService() // { // bindService(new Intent(this, LiveCardService.class), serviceConnection, Context.BIND_AUTO_CREATE); @@ -98,7 +103,7 @@ public class MainActivity extends Activity // mIsBound = false; // } // } - +// // private void startService() // { // startService(new Intent(this, LiveCardService.class)); diff --git a/src/com/w9jds/gallery4glass/Services/LiveCardService.java b/src/com/w9jds/gallery4glass/Services/LiveCardService.java index 899fed8..e178280 100755 --- a/src/com/w9jds/gallery4glass/Services/LiveCardService.java +++ b/src/com/w9jds/gallery4glass/Services/LiveCardService.java @@ -74,14 +74,14 @@ private boolean serviceStart() return true; } -// private boolean servicePause() -// { -// return true; -// } -// private boolean serviceResume() -// { -// return true; -// } + private boolean servicePause() + { + return true; + } + private boolean serviceResume() + { + return true; + } private boolean serviceStop() {