移除过时第三方库
parent
35a0ed1712
commit
e2914d76c5
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
#Thu Jan 16 15:52:30 CST 2025
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_bottom.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_bottom.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_left.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_left.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_right.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_right.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_top.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_top.xml
|
||||
#Sat Jan 18 02:24:51 CST 2025
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_bottom.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_bottom.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_left.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_left.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_right.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_right.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_top.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_top.xml
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/jniLibs"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/jniLibs"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/shaders"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/shaders"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/jniLibs"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/jniLibs"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/shaders"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/shaders"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet></merger>
|
||||
@ -1,5 +1,5 @@
|
||||
#Thu Jan 16 15:53:13 CST 2025
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_bottom.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_bottom.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_left.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_left.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_right.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_right.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_top.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_top.xml
|
||||
#Sat Jan 18 02:33:28 CST 2025
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_bottom.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_bottom.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_left.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_left.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_right.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_right.xml
|
||||
com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_top.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_top.xml
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
package
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69
|
||||
uses-sdk
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
|
||||
package
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69
|
||||
uses-sdk
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
#Thu Jan 16 15:52:30 CST 2025
|
||||
#Sat Jan 18 02:24:51 CST 2025
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/jniLibs"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/jniLibs"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/shaders"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/shaders"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/jniLibs"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/jniLibs"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/shaders"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/shaders"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet></merger>
|
||||
@ -1 +1 @@
|
||||
#Thu Jan 16 15:53:14 CST 2025
|
||||
#Sat Jan 18 02:33:28 CST 2025
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
package
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69
|
||||
uses-sdk
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
|
||||
package
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69
|
||||
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69
|
||||
uses-sdk
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
|
||||
|
||||
Binary file not shown.
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.scwang.smartrefresh.header.MaterialHeader xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue