sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
9,050 Commits 9 Branches 0 Tags 274 MiB
5a25d1a06f
Commit Graph

225 Commits

Author SHA1 Message Date
LmeSzinc
75333193ea Fix: [ALAS] insert_swipe() may return a length=1 list after deleting nearing points 2024-05-01 23:40:17 +08:00
LmeSzinc
741fc1c247 Chore: Remove debug loggers 2024-04-30 18:13:48 +08:00
LmeSzinc
107f88a275 Merge remote-tracking branch 'origin/dev' into sync_test 2024-04-30 17:43:32 +08:00
LmeSzinc
0fb6a96691 Refactor: Make MaaTouch inputs synchronous 2024-04-30 17:42:52 +08:00
LmeSzinc
152f5b596a Chore: [ALAS] Patch uiautomator2 loggers so they can be logged in Alas 2024-04-30 00:06:40 +08:00
LmeSzinc
57d42a14ae Chore: [ALAS] Add method uninstall_uiautomator2 2024-04-30 00:06:33 +08:00
LmeSzinc
4cff3e6283 Fix: [ALAS] Patch u2.init.appdir in runtime 2024-04-30 00:06:25 +08:00
LmeSzinc
a4f8bde695 Merge branch 'master' into dev 2024-04-23 01:13:02 +08:00
LmeSzinc
55b68d1f12 Fix: [ALAS] Old minitouch conn does not response to inputs after adb restarted 2024-04-23 00:16:29 +08:00
LmeSzinc
1ddc7d9365 Fix: [ALAS] _minitouch_client is not default value 2024-04-22 00:15:44 +08:00
LmeSzinc
bf52e6954a Fix: [ALAS] Touch builders have no retries if called directly 2024-04-21 23:36:47 +08:00
LmeSzinc
3757510ecd Fix: [ALAS] Re-init MaaTouch when orientation changed 2024-04-21 23:36:31 +08:00
LmeSzinc
54ff40588c Fix: [ALAS] Touch builders have no retries if called directly 2024-04-19 01:54:03 +08:00
LmeSzinc
00926388c8 Fix: site-packages detection on manual package builds 2024-04-19 01:52:51 +08:00
LmeSzinc
68b1af661f Merge branch 'src_sync' into dev 2024-04-15 19:21:18 +08:00
LmeSzinc
8376d62843 Sync: [ALAS] Minitouch multi-finger support 2024-04-15 19:17:18 +08:00
LmeSzinc
31da8d42a1 Opt: Early init minitouch and MaaTouch for faster startup 2024-04-15 03:48:37 +08:00
LmeSzinc
3e585ab8e7 Fix: Mark nemu_ipc unavailable if emulator instance not found 2024-04-14 01:06:04 +08:00
LmeSzinc
ac8000b753 Opt: Capture std only when having errors 2024-04-13 22:41:53 +08:00
LmeSzinc
5835289178 Opt: Increase nemu_ipc timeout to 0.15s for slow PCs 2024-04-13 01:41:54 +08:00
LmeSzinc
024b7f3143 Fix: ev_run_sync timeout now does not include std capturing 2024-04-10 21:28:44 +08:00
LmeSzinc
e34b19d625 Fix: duped std was opened twice 2024-04-09 21:28:20 +08:00
LmeSzinc
840014f039 Fix: [ALAS] DroidCast image orientation on MuMu12 2024-04-09 00:35:56 +08:00
LmeSzinc
22618fe46c Fix: Failed to init nemu_ipc on empty emulator path (#3616) 2024-04-08 22:04:33 +08:00
LmeSzinc
6bae27cacc Fix: File descriptor leak in nested CaptureNemuIpc call 2024-04-08 21:56:23 +08:00
LmeSzinc
65c826a70f Opt: Release nemu_ipc connection during wait 2024-04-08 05:23:14 +08:00
LmeSzinc
2ebe71b774 Add: NemuIpc method 2024-04-08 04:04:35 +08:00
LmeSzinc
06cd62f3ee Opt: [ALAS] Reuse image array to improve memory performance 2024-03-21 21:35:51 +08:00
LmeSzinc
f076ba12ed Add: [ALAS] Proxy element props 2024-03-16 16:02:07 +08:00
LmeSzinc
f6c56e1940 Fix: Log unexpected droidcast response 2023-09-30 17:04:36 +08:00
LmeSzinc
0dcdab461e Fix: Wait DroidCast server startup 2023-09-26 21:50:29 +08:00
Torther
69df0c26e4
Upd: Screenshot method DroidCast_raw update (#2881) 
* Upd: Screenshot method DroidCast_raw update

* Opt: Refactor module/device/method/droidcast.py for improved functionality

The module/device/method/droidcast.py has been refactored to improve its functionality and remove unnecessary code. Here are the key changes:

- Removed the unnecessary droidcast_raw_port attribute.
- Updated the droidcast_url method to use '/preview' as the default URL for DroidCast.
- Rename droidcast_init and droidcast_raw_init to droidcast_start and droidcast_raw_start.
- Add droidcast_init to reuse the common parts of droidcast_start and droidcast_raw_start.
- Removed the droidcast_raw_wait_startup method as it is no longer needed.
- Updated the droidcast_uninstall method to remove the deletion of DroidCast APK.

These changes aim to simplify the DroidCast class and improve its overall functionality.

* Opt: Refactor module/device/method/droidcast.py for improved functionality

The module/device/method/droidcast.py has been refactored to improve its functionality and remove unnecessary code. Here are the key changes:

- Removed the unnecessary droidcast_raw_port attribute.
- Updated the droidcast_url method to use '/preview' as the default URL for DroidCast.
- Rename droidcast_init and droidcast_raw_init to droidcast_start and droidcast_raw_start.
- Add droidcast_init to reuse the common parts of droidcast_start and droidcast_raw_start.
- Removed the droidcast_raw_wait_startup method as it is no longer needed.
- Updated the droidcast_uninstall method to remove the deletion of DroidCast APK.

These changes aim to simplify the DroidCast class and improve its overall functionality.

* Fix: Droidcast cannot start due to port occupation
 2023-09-25 18:51:56 +08:00
LmeSzinc
33bcd116a8 Fix: No orientation handle in MaaTouch 2023-08-01 19:28:36 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
LmeSzinc
3a9db10d70 Fix: Handle bugs in adbutils>=1.0 2023-05-23 00:09:39 +08:00
LmeSzinc
250145fd7f Fix: Prevent MaaTouch stream from being deleted 2023-05-23 00:09:25 +08:00
LmeSzinc
f59ac5885f Fix: Compatible with old and new adbutils 2023-05-16 23:41:00 +08:00
LmeSzinc
eb8c948198 Opt: Screenshot method fallback to auto if ascreencap unavailable 2023-04-04 03:07:12 +08:00
LmeSzinc
e295f08811 Fix: Missing init() call in uiautomator2 retries (#2424) 2023-03-31 00:48:35 +08:00
xausky
6c6511db60 Fix: Fix lanuch game in no physical keys device 2023-03-05 12:04:32 +08:00
LmeSzinc
61f2f4013d Fix: Handle empty cmdline in proc_list_uiautomator2() 2023-03-01 18:13:49 +08:00
LmeSzinc
45aab15ed5 Opt: Add DroidCast_raw link 2023-02-11 15:20:28 +08:00
LmeSzinc
bfb5004dc1 Fix: Catch ReadTimeout in DroidCast_raw 2023-02-08 01:54:22 +08:00
LmeSzinc
278077f5b9 Opt: Faster resolution_uiautomator2() 2023-02-08 01:53:04 +08:00
LmeSzinc
3d174b19cb Opt: Auto-select the fastest screenshot method 2023-02-08 01:42:04 +08:00
LmeSzinc
8d06ce4987 Fix: Handle Runtime error raised by uiautoamtor2 2023-02-07 19:20:16 +08:00
LmeSzinc
36e1f01cb7 Add: Control method MaaTouch 2023-02-02 01:47:48 +08:00
LmeSzinc
cdff9f61fc Fix: Mumu6 failed on ADB screenshot 2023-01-26 21:47:53 +08:00
LmeSzinc
5693f2499e Fix: Add minimal delay to ADB click 2023-01-25 01:36:54 +08:00
LmeSzinc
a5c0b2abb9 Merge branch 'master' into dev 2023-01-25 00:21:30 +08:00
LmeSzinc
965c46f800 Add: Screenshot method DroidCast_raw 2023-01-25 00:21:07 +08:00
LmeSzinc
a0fe83699a Upd: Tips for pure black screenshots from MuMu X 2023-01-18 17:32:42 +08:00
LmeSzinc
21fe98d2f5 Refactor: Catching truncated image 2023-01-18 01:05:54 +08:00
LmeSzinc
29758051dd Refactor: Abstract resolution_check_uiautomator2() 2023-01-18 00:33:32 +08:00
SarContDeli
15d80175d3
Add: Start app by adb shell am start (#2124) 2023-01-16 22:32:55 +08:00
LmeSzinc
81106a4dda Fix: Resolution check for scrcpy 2023-01-07 02:43:52 +08:00
LmeSzinc
9963f4f4e2 Fix: Missing retry_sleep import in DroidCast 2023-01-04 17:33:29 +08:00
LmeSzinc
264a34683f Merge branch 'bug_fix' into dev 2023-01-03 03:19:36 +08:00
LmeSzinc
b727752e45 Fix: Set timeout on socket objects 2023-01-03 03:18:58 +08:00
LmeSzinc
9efc45ed32 Opt: Change Mumu X screenshot tips to scrcpy 2023-01-03 02:47:18 +08:00
LmeSzinc
332f6b87d3 Merge branch 'master' into dev 2023-01-01 17:17:53 +08:00
LmeSzinc
82917619e9 Fix: Typo in 63ad648f 2023-01-01 17:16:56 +08:00
LmeSzinc
63ad648ff6 Fix: Disable u2 float window (#2059) 2023-01-01 15:32:53 +08:00
LmeSzinc
37e0d70e0d Opt: Stop scrcpy server during wait 2023-01-01 02:36:28 +08:00
LmeSzinc
2285b716cf Refactor: Faster device retrying 2022-12-29 19:22:55 +08:00
LmeSzinc
1d96582c1f Fix: Catch _scrcpy_stream_loop_thread died 2022-12-29 18:57:04 +08:00
LmeSzinc
b3d8fd4f1a Fix: Locking scrcpy screenshot and control 2022-12-29 18:20:09 +08:00
LmeSzinc
d18b13d760 Fix: Catch av import error 2022-12-29 13:37:49 +08:00
LmeSzinc
a3604d8100 Add: Screenshot method scrcpy 
Control via scrcpy is supported but not exposed because swipes ended at the middle
 2022-12-29 12:49:11 +08:00
LmeSzinc
c51350caac Add: DroidCast screenshot 2022-12-04 23:53:43 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
LmeSzinc
4dd2a5a8b5 Refactor: Move del_cached_property to module.base.decorator 2022-09-25 00:31:42 +08:00
LmeSzinc
d17a39ebae Fix: Optimizations for NC screenshot methods broke the non-NCs 2022-09-02 21:56:51 +08:00
LmeSzinc
3c108303e5 Opt: Faster remove_shell_warning() and lower CPU usage in *_nc screenshot methods 2022-09-01 23:03:06 +08:00
Quadro
db169546a9
Fix: Clear shell warnings with loose match (#1454) 
* Update adb.py

* Update utils.py

* Update adb.py

* Update utils.py

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2022-07-31 23:03:56 +08:00
LmeSzinc
d32856cb90 Fix: Remove shell warnings (#1425) 2022-07-30 01:51:26 +08:00
LmeSzinc
7d14b5c446 Fix: Restart minitouch service at every startup 
- Remove `-p` argument in screencap when connect over http
 2022-07-04 00:44:53 +08:00
LmeSzinc
a80fbb45e4 Fix: Coordinate calculation when orientation==1 and device over http 
- Fix RuntimeError: There is no current event loop in thread
 2022-07-04 00:44:53 +08:00
LmeSzinc
591a1a9535 Add: Minitouch over 2022-07-04 00:44:53 +08:00
LmeSzinc
ec66a28bbd Add: adb shell over atx agent 2022-07-04 00:44:52 +08:00
LmeSzinc
620e6510bc Refactor: Split out ConnectionAttr and refactor minitouch command builder 
- Upgrade uiautomator2 to 2.16.17 to fix bugs
- Use numpy.frombuffer() since numpy.fromstring() is deprecated
 2022-07-04 00:44:44 +08:00
LmeSzinc
a9d3cc2743 Fix: Wait minitouch initialized (#1244) 2022-06-26 01:03:41 +08:00
LmeSzinc
ef82bb801e Opt: Faster is_port_using() on startup 
From 1s to almost 0ms
 2022-06-22 19:31:33 +08:00
n0k0m3
23ca75d15e Rename ascreencap dist 2022-06-20 13:57:53 -04:00
n0k0m3
f41f2458c3 Add ascreencap for android 8 (oreo) and 9 (pie) 2022-06-20 11:47:15 -04:00
LmeSzinc
96012c4333 Fix: *_nc methods on virtual network (#1202) 2022-06-12 01:05:45 +08:00
LmeSzinc
27212529c0 Opt: Log unexpected ascreencap screenshots 2022-06-07 23:02:12 +08:00
LmeSzinc
25a4162d27 Fix: Add LDPlayer serial auto switching 
- Opt: Show help text for wrong serial
 2022-06-05 06:38:43 +08:00
LmeSzinc
2555588740 Opt: Show unexpected screenshot in ascreencap 2022-06-03 01:29:38 +08:00
LmeSzinc
d9332a7325 Add: Hierarchy button support 2022-05-01 22:10:40 +08:00
LmeSzinc
49a2ec6519 Fix: Handle AdbError: unknown host service 2022-04-23 22:24:27 +08:00
LmeSzinc
618fa52bcb Opt: Merge Emulator.PackageName and Emulator.Server into one dropdown 2022-04-19 01:00:07 +08:00
LmeSzinc
beabf938fc Opt: Add auto device detection and auto package detection, should be foolproof 
- Add: Real-time server change
 2022-04-19 01:00:07 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
hgjazhgj
867d3d2bbd Fix: Add timeout to ADB and aScreencap screenshot 2022-04-14 11:12:08 +08:00
hgjazhgj
0f96eb3bbc Fix: add [at]wraps to retry_wrapper 
to display actual function name in benchmark log output
 2022-04-13 16:53:37 +08:00
LmeSzinc
c251ef98b3 Opt: Show possible devices and packages when user had a wrong input 2022-04-12 20:17:24 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
hgjazhgj
4ebfa21873 Fix: reconnect when device offline 2022-04-09 01:20:48 +08:00
LmeSzinc
5ba2f5c5ac Add: Faster screenshot methods ADB_nc and aScreenCap_nc 
- Allow config names when creating Device instances
- Add "Ultra Fast" level in performance test
 2022-03-23 21:27:08 +08:00
SarContDeli
4785c361f6 Fix: Improved the logic of getting package name on WSA 2022-03-19 00:39:00 +08:00
SarContDeli
b12edf27ca Fix:a A hint when trying to use '127.0.0.1:58526' but not 'wsa-0' as serial 2022-03-18 23:25:39 +08:00
SarContDeli
86bacf6243 Fix:StopIteration detection of get_main_activity_name is added 
Fix:Display detection of wsa-0 has been improved
 2022-03-17 19:45:33 +08:00
SarContDeli
357b5cb1c9 Fix:display_resize_wsa has an argument(display) of the wrong type: str -> int 2022-03-17 18:00:00 +08:00
saicatedoan
12fe5d9a92 Modified the way to realize the WSA solution 
Fix：A rare situation caused the game to shut down during restart in WSA solution
 2022-03-17 14:06:33 +08:00
saicatedoan
ebf0bc45b6 Add: WSA solution on display 0 (experimental) 2022-03-17 14:06:13 +08:00
LmeSzinc
1ad23dbe90 Fix: Watch device orientate when starting app 
- Opt: Skip screen size check at the first screenshot when game is not started
 2022-03-06 19:18:35 +08:00
LmeSzinc
022acd336a Fix: Handle BrokenPipeError in minitouch 
- Fix: Remove cached session globally when disconnecting to ADB
- Fix: Typo in del_cached_property()
 2022-03-06 15:01:57 +08:00
LmeSzinc
d586e5563a Fix: Handle screen rotation 2022-03-05 13:33:24 +08:00
LmeSzinc
be8269b555 Fix: Stuck in minitouch init 
- Fix: Handle AdbError(closed)
 2022-03-05 09:22:45 +08:00
LmeSzinc
bf87a69c17 Fix: Deleting a cached property will calculate it 2022-03-05 09:22:45 +08:00
Ala
42d345a70c render annotations in english 2022-02-20 15:23:31 +08:00
Ala
2eda0a66a6 适配 vmos pro 的adb截图 2022-02-20 10:09:38 +08:00
LmeSzinc
27a666daab Fix: Safely delete minitouch_builder 2022-02-10 02:28:43 +08:00
LmeSzinc
8bd650d02c Fix: Handle errors of error handling in device connection 2022-02-07 22:53:43 +08:00
LmeSzinc
1916d8b1e1 Fix: Handle AdbTimeout 2022-02-06 18:57:24 +08:00
LmeSzinc
b3e1715d04 Fix: ADB Image pre-process on MuMu (#920) 2022-02-06 17:32:19 +08:00
LmeSzinc
3a35df69fd Fix: Minor issues when running Alas on AidLux+VMOS 
- Redundant "" in pip_install
- Hide Hermit after accessibility service turned on
 2022-02-06 01:29:17 +08:00
LmeSzinc
df310b9d09 Opt: Remove unnecessary use of drags, fallback to swipe+click if drag is a must 2022-02-01 21:49:57 +08:00
LmeSzinc
7c4dfd8948 Fix: Accessibility service handing in different languages 2022-01-30 22:52:07 +08:00
LmeSzinc
e95a145653 Add: Hermit, another control method 
- Add: Dump hierarchy via ADB and uiautomator2
- Fix: Device screenshot saving
 2022-01-27 16:57:25 +08:00
LmeSzinc
25076cf5e5 Fix: Not enough values to unpack in app_current_adb() 2022-01-25 21:47:39 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
bb68096cfc Fix: Handle adb disconnect, add delay between retries 2022-01-22 23:02:03 +08:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods 
- Better screenshot and control retries, handle common exceptions
 2022-01-22 17:42:47 +08:00