arm64 fix, notificationCompat and extra #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

thedude61636 wants to merge 32 commits into iammert:master from thedude61636:master

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,5 @@
  
    # RadioPlayerService

    [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-RadioPlayerService-green.svg?style=flat)](http://android-arsenal.com/details/1/2168)

    Android service library which uses AAC Player. Ready to use Radio Player Service. (Android Background Player Service)

    @@ -41,7 +41,7 @@ repositories {
  
    ```

    dependencies {

        compile 'com.github.iammert:RadioPlayerService:efe3b5420b'

            compile 'com.github.thedude61636:RadioPlayerService:1.5'

    }

    ```

    @@ -69,6 +69,10 @@ mRadioManager.connect();
  
    //Invoke it #onDestroy

    mRadioManager.disconnect();

    ```

    ```java

    //Cancel notification and stop the player

    mRadioManager.cancelNotification();

    ```

    Play and pause radio like 

    ```java

    @@ -113,8 +117,6 @@ RadioManager.with(getActivity()).unregisterListener(this);
  
    Demo project will help you to understand implementation.

    ## Error Case Solutions ##

    If you get UnsatisfiedLinkError on some android devices, please go through the [link](https://medium.com/mobiwise-blog/unsatisfiedlinkerror-problem-on-some-android-devices-b77f2f83837d#.c1vlmowal) that I explained how to solve it.

    ## TODO LIST##

app/build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,13 +1,13 @@
  
    apply plugin: 'com.android.application'

    android {

        compileSdkVersion 22

        buildToolsVersion "23.0.1"

        compileSdkVersion 23

        buildToolsVersion "23.0.3"

        defaultConfig {

            applicationId "co.mobiwise.myapplication"

            minSdkVersion 16

            targetSdkVersion 22

            minSdkVersion 15

            targetSdkVersion 23

            versionCode 1

            versionName "1.0"

    @@ -29,5 +29,4 @@ repositories {
  
    dependencies {

        compile fileTree(dir: 'libs', include: ['*.jar'])

        compile project(':library')

        //compile 'com.github.iammert:RadioPlayerService:9a0cc8dc94'

    }

build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ buildscript { @@
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:1.2.3'
+            classpath 'com.android.tools.build:gradle:2.1.0'
             // NOTE: Do not place your application dependencies here; they belong
             // in the individual module build.gradle files
@@ Expand Down @@

library/build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,18 +1,15 @@
  
    apply plugin: 'com.android.library'

    android {

        compileSdkVersion 22

        buildToolsVersion "22.0.1"

        compileSdkVersion 23

        buildToolsVersion "23.0.3"

        defaultConfig {

            minSdkVersion 16

            targetSdkVersion 22

            minSdkVersion 15

            targetSdkVersion 23

            versionCode 1

            versionName "1.0"

            ndk {

                abiFilters "armeabi-v7a", "x86", "armeabi", "mips"

            }

        }

        buildTypes {

    @@ -25,6 +22,6 @@ android {
  
    dependencies {

        compile fileTree(dir: 'libs', include: ['*.jar'])

        compile 'com.android.support:appcompat-v7:22.2.0'

        compile 'com.android.support:appcompat-v7:23.3.0'

        compile files('libs/aacdecoder-android-0.8.jar')

    }

library/libs/aacdecoder-android-0.8.jar

Binary file not shown.

library/src/main/java/co/mobiwise/library/media/MediaManager.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,150 +16,159 @@ @@
      */
     public class MediaManager {
-      /**
-       * Context
-       */
-      private Context mContext;
-      /**
-       * MediaPlayerService
-       */
-      private static MediaPlayerService mService;
-      /**
-       * Boolean check for service connection
-       */
-      private boolean isServiceConnected = false;
-      /**
-       * Listeners wil lbe added here if
-       * service is not connected yet.
-       * After service connected, we will empty this queue
-       * by adding them to service listeners list.
-       */
-      private List<MediaListener> mMediaListenerQueue;
-      /**
-       * MediaManager
-       */
-      private static MediaManager instance = null;
-      /**
-       * if play requested before service connection, we set this value as true.
-       */
-      private boolean isPlayRequested = false;
-      /**
-       * current stream URL
-       */
-      private String mStreamURL;
-      /**
-       * private construtor
-       */
-      private MediaManager(Context mContext) {
-        this.mContext = mContext;
-        mMediaListenerQueue = new ArrayList<>();
-      }
-      /**
-       * Singleton instance
-       *
-       * @return
-       */
-      public static MediaManager with(Context context) {
-        if (instance == null)
-          instance = new MediaManager(context);
-        return instance;
-      }
-      public static MediaPlayerService getService() {
-        return mService;
-      }
-      public void play(String mStreamURL) {
-        this.mStreamURL = mStreamURL;
-        if (isServiceConnected) {
-          mService.play(mStreamURL);
-        } else {
-          isPlayRequested = true;
+        /**
+         * Context
+         */
+        private Context mContext;
+        /**
+         * MediaPlayerService
+         */
+        private static MediaPlayerService mService;
+        /**
+         * Boolean check for service connection
+         */
+        private boolean isServiceConnected = false;
+        /**
+         * Listeners wil lbe added here if
+         * service is not connected yet.
+         * After service connected, we will empty this queue
+         * by adding them to service listeners list.
+         */
+        private List<MediaListener> mMediaListenerQueue;
+        /**
+         * MediaManager
+         */
+        private static MediaManager instance = null;
+        /**
+         * if play requested before service connection, we set this value as true.
+         */
+        private boolean isPlayRequested = false;
+        /**
+         * current stream URL
+         */
+        private String mStreamURL;
+        /**
+         * private construtor
+         */
+        private MediaManager(Context mContext) {
+            this.mContext = mContext;
+            mMediaListenerQueue = new ArrayList<>();
         }
-      }
-      public void pause() {
-        if (isServiceConnected)
-          mService.pause();
-      }
-      public void seekTo(int duration) {
-        if (isServiceConnected)
-          mService.seekTo(duration);
-      }
-      public boolean isPlaying() {
-        if (isServiceConnected)
-          return mService.isPlaying();
-        return false;
-      }
-      public void updateNotification(String singerName, String songName, int smallArt, int bigArt) {
-        if (mService != null)
-          mService.updateNotification(singerName, songName, smallArt, bigArt);
-      }
-      public void updateNotification(String singerName, String songName, int smallArt, Bitmap bigArt) {
-        if (mService != null)
-          mService.updateNotification(singerName, songName, smallArt, bigArt);
-      }
-      public void registerListener(MediaListener mediaListener) {
-        if (isServiceConnected)
-          mService.registerMediaListener(mediaListener);
-        else
-          mMediaListenerQueue.add(mediaListener);
-      }
-      /**
-       * Connect service
-       */
-      public void connect() {
-        Intent intent = new Intent(mContext, MediaPlayerService.class);
-        mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
-      }
-      /**
-       * Disconnect service
-       */
-      public void disconnect() {
-        mContext.unbindService(mServiceConnection);
-      }
-      /**
-       * Connection
-       */
-      private ServiceConnection mServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName arg0, IBinder binder) {
-          Log.v("TEST", "SERVICE CONNECTED.");
-          mService = ((MediaPlayerService.LocalBinder) binder).getService();
-          isServiceConnected = true;
-          if (isPlayRequested) {
-            play(mStreamURL);
-            isPlayRequested = false;
-          }
-          if (!mMediaListenerQueue.isEmpty()) {
-            for (MediaListener mediaListener : mMediaListenerQueue)
-              registerListener(mediaListener);
-          }
+        /**
+         * Singleton instance
+         *
+         * @return
+         */
+        public static MediaManager with(Context context) {
+            if (instance == null)
+                instance = new MediaManager(context);
+            return instance;
+        }
+        public static MediaPlayerService getService() {
+            return mService;
+        }
+        public void play(String mStreamURL) {
+            this.mStreamURL = mStreamURL;
+            if (isServiceConnected) {
+                mService.play(mStreamURL);
+            } else {
+                isPlayRequested = true;
+            }
+        }
+        public void pause() {
+            if (isServiceConnected)
+                mService.pause();
+        }
+        public void seekTo(int duration) {
+            if (isServiceConnected)
+                mService.seekTo(duration);
+        }
+        public boolean isPlaying() {
+            if (isServiceConnected)
+                return mService.isPlaying();
+            return false;
+        }
+        public void updateNotification(String singerName, String songName, int smallArt, int bigArt) {
+            if (mService != null)
+                mService.updateNotification(singerName, songName, smallArt, bigArt);
+        }
+        public void updateNotification(String singerName, String songName, int smallArt, Bitmap bigArt) {
+            if (mService != null)
+                mService.updateNotification(singerName, songName, smallArt, bigArt);
         }
-        @Override
-        public void onServiceDisconnected(ComponentName arg0) {
+        public void cancelNotification(){
+            if (mService!=null){
+                mService.cancelNotification();
+            }
         }
-      };
+        public void registerListener(MediaListener mediaListener) {
+            if (isServiceConnected)
+                mService.registerMediaListener(mediaListener);
+            else
+                mMediaListenerQueue.add(mediaListener);
+        }
+        /**
+         * Connect service
+         */
+        public void connect() {
+            Intent intent = new Intent(mContext, MediaPlayerService.class);
+            mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
+        }
+        /**
+         * Disconnect service
+         */
+        public void disconnect() {
+            mContext.unbindService(mServiceConnection);
+        }
+        /**
+         * Connection
+         */
+        private ServiceConnection mServiceConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName arg0, IBinder binder) {
+                Log.v("TEST", "SERVICE CONNECTED.");
+                mService = ((MediaPlayerService.LocalBinder) binder).getService();
+                isServiceConnected = true;
+                if (isPlayRequested) {
+                    play(mStreamURL);
+                    isPlayRequested = false;
+                }
+                if (!mMediaListenerQueue.isEmpty()) {
+                    for (MediaListener mediaListener : mMediaListenerQueue)
+                        registerListener(mediaListener);
+                }
+            }
+            @Override
+            public void onServiceDisconnected(ComponentName arg0) {
+            }
+        };
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

arm64 fix, notificationCompat and extra #22

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

arm64 fix, notificationCompat and extra #22

Are you sure you want to change the base?

Uh oh!

arm64 fix, notificationCompat and extra #22

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!