1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 02:29:29 +08:00
Commit Graph

133 Commits

Author SHA1 Message Date
Zuosizhu
898f69f097 Merge branch 'LmeSzinc:master' into 20230309 2024-04-10 23:18:34 +08:00
LmeSzinc
024b7f3143 Fix: ev_run_sync timeout now does not include std capturing 2024-04-10 21:28:44 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme'
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
2024-04-10 12:22:40 +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
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +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
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LmeSzinc
f6c56e1940 Fix: Log unexpected droidcast response 2023-09-30 17:04:36 +08:00
Zuosizhu
e59ae7d732 Fix: Droidcast_raw no longer has a separate apk. 2023-09-30 13:12:52 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme'
# Conflicts:
#	module/device/method/droidcast.py
2023-09-28 18:09:13 +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
Zuosizhu
d7e225ea87 Fix: try to catch adb error in mumu12 2023-09-19 19:54:20 +08:00
Zuosizhu
6f37d69031 Opt: Restart emulator in some cases 2023-09-16 16:29:12 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature
# Conflicts:
#	module/config/i18n/zh-TW.json
2023-08-28 18:12:08 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
33bcd116a8 Fix: No orientation handle in MaaTouch 2023-08-01 19:28:36 +08:00
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
LmeSzinc
294f72023b Merge branch 'master' into feature 2023-06-01 22:26:40 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
Zuosizhu
72e5e200ed Merge branch 'master_lme'
# Conflicts:
#	README.md
2023-05-26 00:26:23 +08:00
Zuosizhu
dba6d7e4e4 Merge branch 'LmeSzinc:master' into 20230309 2023-05-25 13:54:56 +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
4404a9bd16 Merge branch 'master' into feature 2023-05-22 12:18:32 +08:00
LmeSzinc
f59ac5885f Fix: Compatible with old and new adbutils 2023-05-16 23:41:00 +08:00
LmeSzinc
89d3d82925 Merge branch 'master' into feature 2023-04-12 13:01:56 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LmeSzinc
eb8c948198 Opt: Screenshot method fallback to auto if ascreencap unavailable 2023-04-04 03:07:12 +08:00
Zuosizhu
32c09b1e0a Merge branch 'master_lme' 2023-04-03 09:32:47 +08:00
LmeSzinc
e295f08811 Fix: Missing init() call in uiautomator2 retries (#2424) 2023-03-31 00:48:35 +08:00
LmeSzinc
c1656dd273 Refactor: Use new emulator module in easy install 2023-03-23 20:37:44 +08:00
Zuosizhu
2728b60d28 Merge branch 'LmeSzinc:master' into master 2023-03-09 00:54:24 +08:00
xausky
6c6511db60 Fix: Fix lanuch game in no physical keys device 2023-03-05 12:04:32 +08:00
Zuosizhu
9c91fe2e59 Merge branch 'LmeSzinc:master' into master 2023-03-01 18:54:34 +08:00
LmeSzinc
61f2f4013d Fix: Handle empty cmdline in proc_list_uiautomator2() 2023-03-01 18:13:49 +08:00
梦念逍遥
7905315780 Merge branch 'LmeSzinc:master' into master 2023-02-12 15:50:28 +08:00
LmeSzinc
45aab15ed5 Opt: Add DroidCast_raw link 2023-02-11 15:20:28 +08:00
梦念逍遥
f3c61ddcd6 Merge branch 'LmeSzinc:master' into master 2023-02-08 13:53:20 +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