add class MyBuddyEmoticon

Author: anla-xu

demo/mybuddy_emo.py

@@ -0,0 +1,22 @@
+from pymycobot import MyBuddyEmoticon
+import time
+
+file_path = [
+    ['/home/er/emo/look_happy.mp4', 10]
+]
+
+em = MyBuddyEmoticon(file_path, loop=True)
+
+em.start()
+time.sleep(5)
+
+# 暂停
+em.pause()
+
+time.sleep(2)
+
+# 继续播放
+em.run()
+
+# 等待播放结束
+em.join()

docs/README.md

@@ -216,6 +216,15 @@ We support Python2, Python3.5 or later.
     - [set_gpio_mode(pin_no, mode)](#set_gpio_modepin_no-mode)
     - [set_gpio_output(pin, v)](#set_gpio_outputpin-v)
     - [set_gpio_pwm(pin, baud, dc)](#set_gpio_pwmpin-baud-dc)
+- [MyBuddyEmoticon](#mybuddyemoticon)
+  - [MyBuddyEmoticon(file_path: list = [], window_size: tuple = [], loop=False)](#mybuddyemoticonfile_path-list---window_size-tuple---loopfalse)
+    - [add_file_path(path_time: list)](#add_file_pathpath_time-list)
+    - [del_file_path(index: int)](#del_file_pathindex-int)
+    - [file_path](#file_path)
+    - [join()](#join)
+    - [pause()](#pause-1)
+    - [run()](#run)
+    - [start()](#start)
 
 <!-- vim-markdown-toc -->
 </details>
@@ -2406,5 +2415,87 @@ Set GPIO PWM value.
 
   * **dc** – (int) 0 - 100
 
+
+# MyBuddyEmoticon
+
+## MyBuddyEmoticon(file_path: list = [], window_size: tuple = [], loop=False)
+
+API for playing emoticons
+
+* **Parameters**
+  * **file_path** - `[[path, time],...]` The absolute path of facial expression video and the length of time to play.Time in seconds.
+
+  * **window_size** - `(Length, width) `Size of the playback window (default is full screen).
+
+  * **loop** - Loop playback or not (only once by default).
+
+```python
+from pymycobot import MyBuddyEmoticon
+import time
+
+# playlist
+file_path = [
+  ['/home/er/emo/look_happy.mp4', 10],
+]
+# Initialize the object and set it to loop playback
+em = MyBuddyEmoticon(file_path, loop = True)
+# Start playing
+em.start()
+
+# Pause playback after 3 seconds
+# time.sleep(3)
+# em.pause()
+
+# Continue playing
+# em.run()
+
+# The main thread waits for the completion of playback
+em.join()
+```
+
+### add_file_path(path_time: list)
+Add Playback File
+
+
+* **Parameters**
+
+    **path_time** – [path, time] The video address to be added and the running time
+
+
+
+### del_file_path(index: int)
+Delete the element with the specified subscript in the playlist list
+
+
+* **Parameters**
+
+    **index** – The subscript of the element in the playlist to be deleted
+
+
+
+### file_path
+Get Playfile List
+
+
+* **Returns**
+
+    list
+
+
+
+### join()
+Wait for the thread playing the video to finish
+
+
+### pause()
+Pause playback
+
+### run()
+Continue playing
+
+
+### start()
+Start playing
+
 ---
 More demo can go to [here](../demo).

pymycobot/__init__.py

@@ -14,7 +14,7 @@
 from pymycobot.mybuddysocket import MyBuddySocket
 from pymycobot.mira import Mira
 from pymycobot.mybuddybluetooth import MyBuddyBlueTooth
-from pymycobot.mybuddyemoticon import Emoticon
+from pymycobot.mybuddyemoticon import MyBuddyEmoticon
 
 __all__ = [
     "MyCobot",
@@ -29,10 +29,10 @@
     "MyBuddySocket",
     "MyBuddyBlueTooth",
     "Mira",
-    "Emoticon",
+    "MyBuddyEmoticon",
 ]
 
-__version__ = "2.9.7b1"
+__version__ = "2.9.7b2"
 __author__ = "Elephantrobotics"
 __email__ = "[email protected]"
 __git_url__ = "https://github.com/elephantrobotics/pymycobot"

pymycobot/mybuddyemoticon.py

@@ -6,13 +6,14 @@
 import threading
 
 
-class Emoticon:
-    def __init__(self, file_path: list = [], window_size: list = [], loop=False) -> None:
+class MyBuddyEmoticon:
+    def __init__(self, file_path: list = [], window_size: tuple = (), loop=False) -> None:
         """API for playing emoticons
 
         Args:
             file_path(list): `[[path, time]]`The absolute path of facial expression video and the length of time to play.Time in seconds.
-            window_size(list): `[Length, width] `Size of the playback window (default is full screen).
+            window_size(tuple): `(Length, width) `Size of the playback window (default is full screen).
+            loop: Loop playback or not (only once by default).
 
         """
         self.__file_path = file_path
@@ -24,15 +25,27 @@ def __init__(self, file_path: list = [], window_size: list = [], loop=False) ->
 
     @property
     def file_path(self):
-        """Get Playfile List"""
+        """Get Playfile List
+        
+        Return:
+            list
+        """
         return self.__file_path
 
     def add_file_path(self, path_time: list):
-        """Add Playback File"""
+        """Add Playback File
+        
+        Args:
+            path_time: `[path, time]` The video address to be added and the running time
+        """
         self.__file_path.append(path_time)
 
     def del_file_path(self, index: int):
-        """Delete the element with the specified subscript in the playlist list"""
+        """Delete the element with the specified subscript in the playlist list
+        
+        Args:
+            index: The subscript of the element in the playlist to be deleted
+        """
         if index >= len(self.__file_path):
             raise IndexError("list index out of range")
         self.__file_path.pop(index)
@@ -42,7 +55,7 @@ def window_size(self):
         return self.__window_size
 
     @window_size.setter
-    def window_size(self, data):
+    def window_size(self, data: tuple):
         """Set playback window size"""
         self.__window_size = data
 
@@ -70,6 +83,7 @@ def play(self):
             cv.resizeWindow(out_win, self.window_size[0], self.window_size[1])
         t = time.time()
         cv.setMouseCallback(out_win, self.mouse_callback)
+        _exit = False
         while True:
             while time.time() - t < self.__file_path[index][1]:
                 if self.quit:
@@ -86,11 +100,16 @@ def play(self):
                 if time.time() - t >= self.__file_path[index][1]:
                         index += 1
                         if index >= len(self.__file_path):
-                            index = 0
+                            if self.loop:
+                                index = 0
+                            else:
+                                _exit = True
+                                break
                         t = time.time()
                 if cv.waitKey(1) & 0xFF == ord('q') or ret == False:
                     cap = cv.VideoCapture(self.__file_path[index][0])
-                    
+            if _exit or self.quit:
+                break
             if time.time() - t >= self.__file_path[index][1]:
                 index += 1
                 if index >= len(self.__file_path):
@@ -100,8 +119,6 @@ def play(self):
                         break
                 t = time.time()
             cap = cv.VideoCapture(self.__file_path[index][0])
-            if self.quit:
-                break
         cap.release()
         cv.destroyAllWindows()