LingxinMeng 7 mēneši atpakaļ
vecāks
revīzija
9494ce1058

+ 2 - 2
src/python2/pjibot_delivery/2callback-pjibot_delivery.py

@@ -67,14 +67,14 @@ if __name__ == '__main__':
                                 file5 = True
                             if '/scenario_orig.mp4' in str(obj2.key):
                                 file7 = True
-                            if '/simulation.xosc' or '/scenario.xosc' in str(obj2.key):
+                            if '/simulation.xosc' in str(obj2.key) or '/scenario.xosc' in str(obj2.key):
                                 file8 = True
                             if '/trajectory_pji.csv' in str(obj2.key):
                                 file9 = True
                         if not file1 or not file2 or not file3 or not file4 or not file5 or not file7 or not file8 or not file9:
                             continue
                         time.sleep(1)
-                        logging.info("发送:%s", str(obj1.key))
+                        logging.info("发送:%s", prefix)
                         # 1 获取json内容
                         json_content = bucket.get_object(str(obj1.key)).read()
                         # 2 获取token

+ 2 - 2
src/python2/pjibot_delivery/callback-pjibot_delivery.py

@@ -67,14 +67,14 @@ if __name__ == '__main__':
                                 file5 = True
                             if '/scenario_orig.mp4' in str(obj2.key):
                                 file7 = True
-                            if '/simulation.xosc' or '/scenario.xosc' in str(obj2.key):
+                            if '/simulation.xosc' in str(obj2.key) or '/scenario.xosc' in str(obj2.key):
                                 file8 = True
                             if '/trajectory_pji.csv' in str(obj2.key):
                                 file9 = True
                         if not file1 or not file2 or not file3 or not file4 or not file5 or not file7 or not file8 or not file9:
                             continue
                         time.sleep(1)
-                        logging.info("发送:%s", str(obj1.key))
+                        logging.info("发送:%s", prefix)
                         # 1 获取json内容
                         json_content = bucket.get_object(str(obj1.key)).read()
                         # 2 获取token