remotedroid 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99592d4ac1baaef0d04b87d8bb9dd6cfcbdfc5572dacc39c6fabbd5a960f85f3
-  data.tar.gz: a5fbd36d797423dd183dccbb2351736ac58f706acf3b88932ae737d43e55a8e9
+  metadata.gz: df5d8ff42bcaa56e29104adb4e802afc9fea9df24e54e3861268f8120c59d754
+  data.tar.gz: 83c8653599215e33d641b414fc6dcfa4a7ad1711b462d098ccf8dbbcd654001c
 SHA512:
-  metadata.gz: 893732ed1fb124c982bdcd6b55d4d2f54acd9a32256d707cde13a13d86fb9547a9b126ab6200b98ed211ae739cf42e95136c5fe444fbd435646607b6e8fda9a7
-  data.tar.gz: a651dd655ab1dcb59549d7abd5d32a948f4fbf04ec134f9c35ff104ff7f9def9308a8f8acf9751e7cefa27e7ca4517af7e310a5603de6ab6a196271a1ca54b5c
+  metadata.gz: 2808afc3086dac37cf72544b2445ebe7b0dbcea42709a318e7b08c3da683f8353b893ea8048d05c69c0ddc78e7456e2f644a0bf158212335e150178b5bed16c2
+  data.tar.gz: d5852dade61330d9c16f498750f76100cd6517f51e04eef403945719031726a161ea610a3133b0e755c2e599068d3af0787515d4f63039ec34bf7f40da309d5c

data/lib/remotedroid.rb

@@ -197,6 +197,47 @@ m: stay awake off
 t: webhook
 a: stay awake off
 
+m: Launch Google Play Music
+t: webhook
+a: Launch Google Play Music
+
+
+m: Media Next
+t: webhook
+a:
+  Media Next
+    Simulate Media Button (Google Play Music)
+    
+m: Media Pause
+t: webhook
+a:
+  Media Pause
+    Simulate Media Button (Google Play Music)
+    
+m: Media Play
+t: webhook
+a:
+  Media Play
+    Simulate Media Button (Google Play Music)
+    
+m: Media Play Pause
+t: webhook
+a:
+  Media Play/Pause
+    Simulate Media Button (Google Play Music)
+
+m: Media Previous
+t: webhook
+a:
+  Media Previous
+    Simulate Media Button (Google Play Music)
+    
+m: Media Stop
+t: webhook
+a:
+  Media Stop
+    Simulate Media Button (Google Play Music)    
+    
 m: Share location
 t: 
   WebHook
@@ -276,9 +317,12 @@ m: Power connected
 t: Power Connected: Any
 a: webhook
 
-m: screen on off
+m: Screen on
 t: screen on
-a: webhook
+a:
+  webhook
+    identifier: screen_on_off
+    screen_on: true
 
 m: Power Button Toggle3
 t: Power Button Toggle (3)
@@ -421,15 +465,8 @@ a:
     identifier: flip_device
     facedown: false    
 EOF
-s="
-    
 
 
-
-   
-
-"
-
 module RemoteDroid
   
   class Server
@@ -483,18 +520,17 @@ module RemoteDroid
         context, json = msg.split(/:\s+/,2)
         category, action = context.split('/',2)
         
-        if action == 'force_macro_run' then
+        h = JSON.parse(json, symbolize_names: true)
+        
+        if action == 'force_macro_run' and h[:serverside] then
           
-          self.notice 'macrodroid2: fmr'
-          a = @remote.run_macro(JSON.parse(json, symbolize_names: true))
-
-          a.each do |msg|
-            self.notice 'macrodroid/action: ' + msg
-          end
+          a = @remote.run_macro(h)
+          a.each {|msg| self.notice 'macrodroid/action: ' + msg }
 
         else
-          @remote.control.method(action.to_sym)\
-            .call(JSON.parse(json, symbolize_names: true))
+          
+          @remote.control.method(action.to_sym).call(h)
+          
         end
         
       end

data/lib/remotedroid/client.rb

@@ -60,6 +60,10 @@ module RemoteDroid
       query.cell_tower
     end
     
+    def control_media(option='Play/Pause')
+      control.control_media({option: option})
+    end    
+    
     def disable(macro)
       control.disable macro
     end
@@ -70,7 +74,13 @@ module RemoteDroid
     
     def hotspot(state=nil)      
       control.hotspot state
-    end    
+    end
+
+    def launch_activity(app='')
+      control.launch_activity(app)
+    end
+    
+    alias launch launch_activity
     
     def location()
       query.location
@@ -98,11 +108,31 @@ module RemoteDroid
       end
       
     end
+
+    def next()
+      control_media(option='Next')
+    end
+    
+    def pause()
+      control_media(option='Pause')
+    end    
+
+    def play()
+      control_media(option='Play')
+    end    
+    
+    def play_pause()
+      control_media(option='Play/Pause')
+    end
     
     def photo()
       take_picture
     end
     
+    def previous()
+      control_media(option='Previous')
+    end    
+    
     def say(text)
       control.speak_text text
     end
@@ -133,6 +163,10 @@ module RemoteDroid
       control.stay_awake_off
     end
     
+    def stop()
+      control_media(option='Stop')
+    end
+    
     def take_picture(ftp_src: nil, fileout: '.')
       
       #screen.on

data/lib/remotedroid/control.rb

@@ -16,13 +16,21 @@ module RemoteDroid
       http_exec 'camera-flash-light', options
     end
     
+    def control_media(options={})      
+      http_exec 'media-' + options[:option].downcase.gsub(/\W/,'-')
+    end
+    
     def disable(macro)
       http_exec 'disable-macro', {name: macro}
     end
     
     def enable(macro)
       http_exec 'enable-macro', {name: macro}
-    end    
+    end
+    
+    def force_macro_run(options={})
+      http_exec option[:macro_name].downcase.gsub(/ /,'-')
+    end
     
     def hotspot(state=nil)      
       
@@ -65,6 +73,11 @@ module RemoteDroid
       
     end
     
+    def launch_activity(options={})
+      app = options[:app].downcase.gsub(/ /,'-')
+      http_exec 'launch-' + app
+    end
+    
     def location(options={})
       http_exec 'location'
     end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotedroid
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   io3WPRDjULC924M5S8wbrus31v2AUjqFBPvmHr7caf/VHErWypV482xcDhWt1eif
   0G2k2ptozXcBS9odsqGUTb5N
   -----END CERTIFICATE-----
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onedrb