Browse Source

已修改 .idea/workspace.xml

已修改        util/Cv2Utils.py
tags/V2.7.7^2^2
chenyukun 1 year ago
parent
commit
5813e4ad26
3 changed files with 21 additions and 19 deletions
  1. +3
    -2
      .idea/workspace.xml
  2. +2
    -1
      concurrency/IntelligentRecognitionProcess.py
  3. +16
    -16
      test/路径/Test.py

+ 3
- 2
.idea/workspace.xml View File

@@ -6,7 +6,8 @@
<component name="ChangeListManager">
<list default="true" id="4f7dccd9-8f92-4a6e-90cc-33890d102263" name="Changes" comment="Changes">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/dsp_application.json" beforeDir="false" afterPath="$PROJECT_DIR$/config/dsp_application.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/concurrency/IntelligentRecognitionProcess.py" beforeDir="false" afterPath="$PROJECT_DIR$/concurrency/IntelligentRecognitionProcess.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/路径/Test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/路径/Test.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -532,7 +533,7 @@
<workItem from="1687997778160" duration="3792000" />
<workItem from="1688021144565" duration="1972000" />
<workItem from="1688083600084" duration="65000" />
<workItem from="1688083679443" duration="1216000" />
<workItem from="1688083679443" duration="2398000" />
</task>
<servers />
</component>

+ 2
- 1
concurrency/IntelligentRecognitionProcess.py View File

@@ -74,6 +74,7 @@ class IntelligentRecognitionProcess(Process):
self._analyse_type = param.analyse_type
self._enable_add_water = bool(self._context["video"]["video_add_water"])
self.start_proccess_time = time.time()
self._logo = None
if self._enable_add_water:
self._logo = self._msg.get("logo_url")
if self._logo:
@@ -1442,7 +1443,7 @@ class ScreenRecordingProcess(Process):
hb = None
try:
# 程序开始时间
init_log(self._context)
init_log(self._base_dir)
pullThread = self.start_pull_stream_thread()
cv2tool = Cv2Util(orFilePath=self._orFilePath, requestId=self._msg.get("request_id"))
hb = self.start_hb_thread()

+ 16
- 16
test/路径/Test.py View File

@@ -1,16 +1,16 @@
import os
import sys
from util import RWUtils, LogUtils
from loguru import logger
print(os.getcwd())
print(os.path.relpath(__file__))
base_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
content = YmlUtils.getConfigs(base_dir + "/../../")
LogUtils.init_log(content)
try:
2/0
except Exception as e:
logger.exception("异常信息:{}", e)
# import os
# import sys
#
# from util import RWUtils, LogUtils
# from loguru import logger
# print(os.getcwd())
#
# print(os.path.relpath(__file__))
# base_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
# content = YmlUtils.getConfigs(base_dir + "/../../")
# LogUtils.init_log(content)
#
# try:
# 2/0
# except Exception as e:
# logger.exception("异常信息:{}", e)

Loading…
Cancel
Save