KAA-493: Music and photo player improvements

kaaproject · Apr 25, 2015 · 65398df · 65398df
1 parent 974d3d1
commit 65398df
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 18 deletions.
diff --git a/examples/iotworld/source/musicplayer/java/build.xml b/examples/iotworld/source/musicplayer/java/build.xml
@@ -29,6 +29,7 @@
         <mkdir dir="src/build/jar"/>
         <javac srcdir="src" destdir="src/build/classes" classpathref="classpath"/>
         <jar destfile="build/jar/MusicPlayer.jar">
+            <fileset file="res/album.png" />
             <fileset file="res/logback.xml" />
             <fileset dir="src/build/classes">
                 <include name="**/*.class"/>

diff --git a/...e/musicplayer/java/src/org/kaaproject/kaa/demo/iotworld/music/MusicPlayerApplication.java b/...e/musicplayer/java/src/org/kaaproject/kaa/demo/iotworld/music/MusicPlayerApplication.java
@@ -45,8 +45,6 @@ public class MusicPlayerApplication implements DeviceEventClassFamily.Listener,
 
     private static final String STATE_FILE_NAME = "player.state";
 
-    private static final String DEFAULT_DEVICE_NAME = "Raspbery Pi 2 Music Player";
-
     private static final int UPDATE_INTERVAL = 1000;
 
     private static final String DEFAULT_DIR = "E:\\music\\";
@@ -68,7 +66,6 @@ public class MusicPlayerApplication implements DeviceEventClassFamily.Listener,
 
     private volatile Mp3Player player;
     private volatile StatusUpdateThread statusUpdateThread;
-    private volatile String deviceName = DEFAULT_DEVICE_NAME;
 
     private volatile PlaybackStatus pendingStatus = PlaybackStatus.STOPPED;
     private Map<String, PlaybackStatusUpdate> lastUpdates = new ConcurrentHashMap<String, PlaybackStatusUpdate>();
@@ -147,13 +144,13 @@ private void stop() {
     @Override
     public void onEvent(DeviceInfoRequest event, String originator) {
         LOG.info("Receieved info request {}", event);
-        deviceECF.sendEvent(new DeviceInfoResponse(new DeviceInfo(deviceName, "UK")), originator);
+        deviceECF.sendEvent(new DeviceInfoResponse(new DeviceInfo(state.getDeviceName(), "UK")), originator);
     }
 
     @Override
     public void onEvent(DeviceChangeNameRequest event, String originator) {
-        deviceName = event.getName();
+        state.setDeviceName(event.getName());
-        deviceECF.sendEventToAll(new DeviceInfoResponse(new DeviceInfo(deviceName, "UK")));
+        deviceECF.sendEventToAll(new DeviceInfoResponse(new DeviceInfo(state.getDeviceName(), "UK")));
     }
 
     @Override

diff --git a/...musicplayer/java/src/org/kaaproject/kaa/demo/iotworld/music/storage/MusicPlayerState.java b/...musicplayer/java/src/org/kaaproject/kaa/demo/iotworld/music/storage/MusicPlayerState.java
@@ -25,6 +25,10 @@ public class MusicPlayerState {
     private static final String LISTENERS_PROP_NAME = "listeners";
     private static final String LISTENERS_PROP_DEFAULT = "";
     private static final String LISTENERS_PROP_DELIMITER = ",";
+
+    private static final String DEVICE_PROP_NAME = "device.name"; 
+    private static final String DEFAULT_DEVICE_NAME = "Raspbery Pi 2 Photo Player";
+
 
     private static final Logger LOG = LoggerFactory.getLogger(MusicPlayerApplication.class);
 
@@ -106,6 +110,15 @@ public void addStatusListener(String originator) {
             persist();
         }
     }
+
+    public String getDeviceName() {
+        return properties.getProperty(DEVICE_PROP_NAME, DEFAULT_DEVICE_NAME);
+    }
+
+    public void setDeviceName(String deviceName) {
+        properties.setProperty(DEVICE_PROP_NAME, deviceName);
+        persist();
+    }
 
     public Set<String> getListeners() {
         return listeners;

diff --git a/...e/photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/PhotoPlayerApplication.java b/...e/photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/PhotoPlayerApplication.java
@@ -44,8 +44,6 @@ public class PhotoPlayerApplication implements DeviceEventClassFamily.Listener,
 
     private static final String STATE_FILE_NAME = "player.state";
 
-    private static final String DEFAULT_DEVICE_NAME = "Raspbery Pi 2 Photo Player";
-
     private static final String DEFAULT_DIR = "H:\\photos\\";
 
     private static final String DEFAULT_ACCESS_CODE = "DUMMY_ACCESS_CODE";
@@ -65,8 +63,6 @@ public class PhotoPlayerApplication implements DeviceEventClassFamily.Listener,
 
     private final SlideShowFrame frame;
 
-    private volatile String deviceName = DEFAULT_DEVICE_NAME;
-
     private volatile SlideShow player;
 
     private volatile SlideShowStatus pendingStatus = SlideShowStatus.PAUSED;
@@ -154,13 +150,13 @@ private void stop() {
     @Override
     public void onEvent(DeviceInfoRequest event, String originator) {
         LOG.info("Receieved info request {}", event);
-        deviceECF.sendEvent(new DeviceInfoResponse(new DeviceInfo(deviceName, "UK")), originator);
+        deviceECF.sendEvent(new DeviceInfoResponse(new DeviceInfo(state.getDeviceName(), "UK")), originator);
     }
 
     @Override
     public void onEvent(DeviceChangeNameRequest event, String originator) {
-        deviceName = event.getName();
+        state.setDeviceName(event.getName());
-        deviceECF.sendEventToAll(new DeviceInfoResponse(new DeviceInfo(deviceName, "UK")));
+        deviceECF.sendEventToAll(new DeviceInfoResponse(new DeviceInfo(state.getDeviceName(), "UK")));
     }
 
     @Override
@@ -211,6 +207,11 @@ public void onEvent(PauseSlideShowRequest event, String originator) {
     @Override
     public void onEvent(DeleteUploadedPhotosRequest event, String originator) {
         LOG.info("Receieved delete uploaded photos request {} from {}", event, originator);
+        if(player != null && player.getAlbumId().equals(library.getUploadsAlbumId())){
+            player.stop();
+        }
+        library.deleteUploadsAlbum();
+        photoECF.sendEvent(new PhotoAlbumsResponse(library.buildAlbumInfoList()), originator);
     }
 
     @Override

diff --git a/...rce/photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/library/PhotoLibrary.java b/...rce/photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/library/PhotoLibrary.java
@@ -134,7 +134,7 @@ public List<PhotoAlbumInfo> buildAlbumInfoList() {
     }
 
     public String upload(PhotoUploadRequest event) {
-        String uploadAlbumPath = rootPath + File.separator + UPLOADS_ALBUM_NAME;
+        String uploadAlbumPath = getUploadsAlbumId();
         File uploadAlbumFile = new File(uploadAlbumPath);
         if (!uploadAlbumFile.exists()) {
             LOG.info("Creating upload album");
@@ -157,6 +157,10 @@ public String upload(PhotoUploadRequest event) {
         }
         return album.getAlbumId();
     }
+
+    public String getUploadsAlbumId() {
+        return rootPath + File.separator + UPLOADS_ALBUM_NAME;
+    }
 
     private void generateThumbnails(Collection<PhotoAlbum> albums) {
         for(PhotoAlbum album : albums){
@@ -211,4 +215,18 @@ private static byte[] toByteArray(ByteBuffer bb) {
     public PhotoAlbum getAlbum(String albumId) {
         return albums.get(albumId);
     }
+
+    public void deleteUploadsAlbum() {
+        String uploadDirPath = getUploadsAlbumId();
+        File uploadDir = new File(uploadDirPath);
+        for(File child : uploadDir.listFiles()){
+            if(!child.delete()){
+                LOG.warn("Failed to delete {} {}", child.getAbsolutePath(), child.isDirectory() ? "dir" : "file");
+            }
+        }
+        if(!uploadDir.delete()){
+            LOG.warn("Failed to delete {}", uploadDir.getAbsolutePath());
+        }
+        albums.remove(uploadDirPath);
+    }
 }
diff --git a/...urce/photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/slideshow/SlideShow.java b/...urce/photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/slideshow/SlideShow.java
@@ -43,6 +43,8 @@ public class SlideShow implements PreviewGenerationListener {
     private volatile boolean initialized;
     private volatile int currentIndex;
     private volatile SlideShowStatus status;
+
+    private volatile SlideShowPanel panel;
 
     private final ExecutorService pool = Executors.newSingleThreadExecutor();
 
@@ -68,6 +70,9 @@ public void pause() {
     }
 
     public void stop() {
+        if(panel != null){
+            frame.remove(panel);
+        }
         thread.stopped = true;
         thread.interrupt();
     }
@@ -147,7 +152,6 @@ private class SlideShowThread extends Thread {
 
         private static final int ALPHA_STEP = 20;
         private static final int WAIT_FOR_PREVIEW_SLEEP_TIME = 50;
-        private SlideShowPanel panel;
         private volatile boolean started;
         private volatile boolean paused;
         private volatile boolean stopped;
@@ -217,7 +221,7 @@ private int getNextIndex() {
         }
 
         private void changeAlpha(int from, int to, int step, long duration, final BufferedImage current, final BufferedImage next) throws InterruptedException {
-            final SlideShowPanel panel = this.panel;
+            final SlideShowPanel panel = SlideShow.this.panel;
             if (to == from) {
                 return;
             }

diff --git a/...photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/storage/PhotoPlayerState.java b/...photoplayer/java/src/org/kaaproject/kaa/demo/iotworld/photo/storage/PhotoPlayerState.java
@@ -19,14 +19,17 @@
 
 public class PhotoPlayerState {
 
+    private static final Logger LOG = LoggerFactory.getLogger(PhotoPlayerApplication.class);
+
     private static final String ALBUM_ID_PROP_NAME = "album.id";
     private static final String GEO_FENCING_PROP_NAME = "geofencing.position";
     private static final String OPERATION_MODE_PROP_NAME = "operation.mode";
     private static final String LISTENERS_PROP_NAME = "listeners";
     private static final String LISTENERS_PROP_DEFAULT = "";
     private static final String LISTENERS_PROP_DELIMITER = ",";
-
+
-    private static final Logger LOG = LoggerFactory.getLogger(PhotoPlayerApplication.class);
+    private static final String DEVICE_PROP_NAME = "device.name"; 
+    private static final String DEFAULT_DEVICE_NAME = "Raspbery Pi 2 Photo Player";
 
     private final String fileName;
     private final Properties properties;
@@ -106,6 +109,15 @@ public void addStatusListener(String originator) {
             persist();
         }
     }
+
+    public String getDeviceName() {
+        return properties.getProperty(DEVICE_PROP_NAME, DEFAULT_DEVICE_NAME);
+    }
+
+    public void setDeviceName(String deviceName) {
+        properties.setProperty(DEVICE_PROP_NAME, deviceName);
+        persist();
+    }
 
     public Set<String> getListeners() {
         return listeners;