diff --git a/app/build.gradle b/app/build.gradle index 283fb4594..efb703eb2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,7 +98,7 @@ dependencies { implementation project(':jianpian') implementation project(':forcetech') implementation project(':ijkplayer') - pythonImplementation project(':pyramid') + pythonImplementation project(':chaquo') implementation project(':media-lib-datasource-okhttp') implementation project(':media-lib-datasource-rtmp') implementation project(':media-lib-decoder-av1') diff --git a/pyramid/.gitignore b/chaquo/.gitignore similarity index 100% rename from pyramid/.gitignore rename to chaquo/.gitignore diff --git a/pyramid/build.gradle b/chaquo/build.gradle similarity index 83% rename from pyramid/build.gradle rename to chaquo/build.gradle index 117e6156d..3d5259699 100644 --- a/pyramid/build.gradle +++ b/chaquo/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - namespace 'com.undcover.freedom.pyramid' + namespace 'com.fongmi.chaquo' compileSdk 34 flavorDimensions = ["abi"] @@ -16,7 +16,11 @@ android { version "3.8" pip { install "lxml" + install "ujson" + install "pyquery" install "requests" + install "jsonpath" + install "cachetools" install 'pycryptodome' install 'beautifulsoup4' } diff --git a/chaquo/src/main/AndroidManifest.xml b/chaquo/src/main/AndroidManifest.xml new file mode 100644 index 000000000..c9ed02905 --- /dev/null +++ b/chaquo/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java b/chaquo/src/main/java/com/fongmi/chaquo/Loader.java similarity index 95% rename from pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java rename to chaquo/src/main/java/com/fongmi/chaquo/Loader.java index 53be6d712..d619c9bf4 100644 --- a/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java +++ b/chaquo/src/main/java/com/fongmi/chaquo/Loader.java @@ -1,4 +1,4 @@ -package com.undcover.freedom.pyramid; +package com.fongmi.chaquo; import android.content.Context; diff --git a/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java b/chaquo/src/main/java/com/fongmi/chaquo/Spider.java similarity index 99% rename from pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java rename to chaquo/src/main/java/com/fongmi/chaquo/Spider.java index f08c1cf92..25d366613 100644 --- a/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java +++ b/chaquo/src/main/java/com/fongmi/chaquo/Spider.java @@ -1,4 +1,4 @@ -package com.undcover.freedom.pyramid; +package com.fongmi.chaquo; import android.content.Context; diff --git a/pyramid/src/main/python/app.py b/chaquo/src/main/python/app.py similarity index 100% rename from pyramid/src/main/python/app.py rename to chaquo/src/main/python/app.py diff --git a/pyramid/src/main/python/base/spider.py b/chaquo/src/main/python/base/spider.py similarity index 100% rename from pyramid/src/main/python/base/spider.py rename to chaquo/src/main/python/base/spider.py diff --git a/pyramid/src/main/python/runner.py b/chaquo/src/main/python/runner.py similarity index 100% rename from pyramid/src/main/python/runner.py rename to chaquo/src/main/python/runner.py diff --git a/pyramid/src/main/python/trigger.py b/chaquo/src/main/python/trigger.py similarity index 100% rename from pyramid/src/main/python/trigger.py rename to chaquo/src/main/python/trigger.py diff --git a/pyramid/src/main/AndroidManifest.xml b/pyramid/src/main/AndroidManifest.xml deleted file mode 100644 index c406568a6..000000000 --- a/pyramid/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index cdb02a560..b3f1c78ad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,7 +27,7 @@ include ':app' include ':hook' include ':tvbus' include ':catvod' -include ':pyramid' +include ':chaquo' include ':quickjs' include ':thunder' include ':youtube'