Skip to content

Commit 3513a47

Browse files
authored
Merge pull request #159 from Integration-Automation/dev
Dev
2 parents e726343 + 3847052 commit 3513a47

23 files changed

+701
-620
lines changed

.github/workflows/dev_python3_10.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
run: python ./test/unit_test/screen/screen_test.py
3131
- name: Test Screenshot
3232
run: python ./test/unit_test/screen/screenshot_test.py
33+
- name: Test Screen Get Pixel
34+
run: python ./test/unit_test/screen/get_pixel_test.py
3335
- name: Save Screenshot Image
3436
uses: actions/upload-artifact@v4
3537
with:

.github/workflows/dev_python3_11.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
run: python ./test/unit_test/screen/screen_test.py
3131
- name: Test Screenshot
3232
run: python ./test/unit_test/screen/screenshot_test.py
33+
- name: Test Screen Get Pixel
34+
run: python ./test/unit_test/screen/get_pixel_test.py
3335
- name: Save Screenshot Image
3436
uses: actions/upload-artifact@v4
3537
with:

.github/workflows/dev_python3_12.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
run: python ./test/unit_test/screen/screen_test.py
3131
- name: Test Screenshot
3232
run: python ./test/unit_test/screen/screenshot_test.py
33+
- name: Test Screen Get Pixel
34+
run: python ./test/unit_test/screen/get_pixel_test.py
3335
- name: Save Screenshot Image
3436
uses: actions/upload-artifact@v4
3537
with:

.github/workflows/jekyll-gh-pages.yml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/stable_python3_10.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
run: python ./test/unit_test/screen/screen_test.py
3131
- name: Test Screenshot
3232
run: python ./test/unit_test/screen/screenshot_test.py
33+
- name: Test Screen Get Pixel
34+
run: python ./test/unit_test/screen/get_pixel_test.py
3335
- name: Save Screenshot Image
3436
uses: actions/upload-artifact@v4
3537
with:

.github/workflows/stable_python3_11.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
run: python ./test/unit_test/screen/screen_test.py
3131
- name: Test Screenshot
3232
run: python ./test/unit_test/screen/screenshot_test.py
33+
- name: Test Screen Get Pixel
34+
run: python ./test/unit_test/screen/get_pixel_test.py
3335
- name: Save Screenshot Image
3436
uses: actions/upload-artifact@v4
3537
with:

.github/workflows/stable_python3_12.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
run: python ./test/unit_test/screen/screen_test.py
3131
- name: Test Screenshot
3232
run: python ./test/unit_test/screen/screenshot_test.py
33+
- name: Test Screen Get Pixel
34+
run: python ./test/unit_test/screen/get_pixel_test.py
3335
- name: Save Screenshot Image
3436
uses: actions/upload-artifact@v4
3537
with:

.idea/workspace.xml

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
66

77
[project]
88
name = "je_auto_control_dev"
9-
version = "0.0.122"
9+
version = "0.0.126"
1010
authors = [
1111
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
1212
]

je_auto_control/__init__.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
from je_auto_control.utils.cv2_utils.screen_record import ScreenRecorder
1111
# utils cv2_utils
1212
from je_auto_control.utils.cv2_utils.screenshot import pil_screenshot
13+
# Recording
14+
from je_auto_control.utils.cv2_utils.video_recording import RecordingThread
1315
from je_auto_control.utils.exception.exceptions import \
1416
AutoControlActionException
1517
from je_auto_control.utils.exception.exceptions import \
@@ -74,6 +76,8 @@
7476
# timeout
7577
from je_auto_control.utils.timeout.multiprocess_timeout import \
7678
multiprocess_timeout
79+
# Windows
80+
from je_auto_control.windows.window import windows_window_manage
7781
from je_auto_control.wrapper.auto_control_image import locate_all_image
7882
from je_auto_control.wrapper.auto_control_image import locate_and_click
7983
from je_auto_control.wrapper.auto_control_image import locate_image_center
@@ -85,29 +89,26 @@
8589
from je_auto_control.wrapper.auto_control_keyboard import keyboard_keys_table
8690
from je_auto_control.wrapper.auto_control_keyboard import press_keyboard_key
8791
from je_auto_control.wrapper.auto_control_keyboard import release_keyboard_key
92+
from je_auto_control.wrapper.auto_control_keyboard import send_key_event_to_window
8893
from je_auto_control.wrapper.auto_control_keyboard import type_keyboard
8994
from je_auto_control.wrapper.auto_control_keyboard import write
90-
from je_auto_control.wrapper.auto_control_keyboard import send_key_event_to_window
9195
# import mouse
9296
from je_auto_control.wrapper.auto_control_mouse import click_mouse
9397
from je_auto_control.wrapper.auto_control_mouse import get_mouse_position
9498
from je_auto_control.wrapper.auto_control_mouse import mouse_keys_table
9599
from je_auto_control.wrapper.auto_control_mouse import mouse_scroll
96100
from je_auto_control.wrapper.auto_control_mouse import press_mouse
97101
from je_auto_control.wrapper.auto_control_mouse import release_mouse
102+
from je_auto_control.wrapper.auto_control_mouse import send_mouse_event_to_window
98103
from je_auto_control.wrapper.auto_control_mouse import set_mouse_position
99104
from je_auto_control.wrapper.auto_control_mouse import special_mouse_keys_table
100-
from je_auto_control.wrapper.auto_control_mouse import send_mouse_event_to_window
101105
# test_record
102106
from je_auto_control.wrapper.auto_control_record import record
103107
from je_auto_control.wrapper.auto_control_record import stop_record
104108
# import screen
105109
from je_auto_control.wrapper.auto_control_screen import screen_size
106110
from je_auto_control.wrapper.auto_control_screen import screenshot
107-
# Recording
108-
from je_auto_control.utils.cv2_utils.video_recording import RecordingThread
109-
# Windows
110-
from je_auto_control.windows.window import windows_window_manage
111+
from je_auto_control.wrapper.auto_control_screen import get_pixel
111112

112113
__all__ = [
113114
"click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
@@ -124,5 +125,6 @@
124125
"generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
125126
"generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
126127
"callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
127-
"RecordingThread", "send_key_event_to_window", "send_mouse_event_to_window", "windows_window_manage"
128+
"RecordingThread", "send_key_event_to_window", "send_mouse_event_to_window", "windows_window_manage",
129+
"ScreenRecorder", "get_pixel"
128130
]

0 commit comments

Comments
 (0)