master
hwf452 10 months ago
parent 3aec934c7b
commit b237d6df52

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/jniLibs"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/shaders"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/shaders"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/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:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet></merger>

@ -1,5 +1,5 @@
#Sat Jan 18 02:33:28 CST 2025 #Wed Feb 12 16:31:02 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_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=/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_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=/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_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=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_top.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

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res"><file name="default_scroll_handle_left" path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_left.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_bottom" path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_bottom.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_right" path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_right.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_top" path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_top.xml" qualifiers="" type="drawable"/><file path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/values/attrs.xml" qualifiers=""><declare-styleable name="ScrollBar"> <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res"><file path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/values/attrs.xml" qualifiers=""><declare-styleable name="ScrollBar">
<attr format="color|reference" name="sb_handlerColor"/> <attr format="color|reference" name="sb_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/> <attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/> <attr format="color|reference" name="sb_indicatorTextColor"/>
<attr format="boolean|reference" name="sb_horizontal"/> <attr format="boolean|reference" name="sb_horizontal"/>
</declare-styleable></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/generated/res/resValues/release"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="ScrollBar"> </declare-styleable></file><file name="default_scroll_handle_right" path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_right.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_top" path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_top.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_left" path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_left.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_bottom" path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/res/drawable/default_scroll_handle_bottom.xml" qualifiers="" type="drawable"/></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/generated/res/resValues/release"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="ScrollBar">
<attr format="color|reference" name="sb_handlerColor"/> <attr format="color|reference" name="sb_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/> <attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/> <attr format="color|reference" name="sb_indicatorTextColor"/>

@ -1,16 +1,16 @@
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12 ADDED from /home/admin/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 INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12
package package
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
xmlns:android xmlns:android
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69 ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69
uses-sdk uses-sdk
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml reason: use-sdk injection requested INJECTED from /home/admin/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 /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
android:targetSdkVersion android:targetSdkVersion
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
android:minSdkVersion android:minSdkVersion
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/jniLibs"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/shaders"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/shaders"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/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:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet></merger>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res"><file path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res/values/dimens.xml" qualifiers=""/><file path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res/values/attr.xml" qualifiers=""><declare-styleable name="SlantedTextView"> <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res"><file path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res/values/attr.xml" qualifiers=""><declare-styleable name="SlantedTextView">
<attr format="dimension" name="slantedTextSize"/> <attr format="dimension" name="slantedTextSize"/>
<attr format="color" name="slantedBackgroundColor"/> <attr format="color" name="slantedBackgroundColor"/>
<attr format="string" name="slantedText"/> <attr format="string" name="slantedText"/>
@ -15,7 +15,7 @@
<enum name="left_bottom_triangle" value="6"/> <enum name="left_bottom_triangle" value="6"/>
<enum name="right_bottom_triangle" value="7"/> <enum name="right_bottom_triangle" value="7"/>
</attr> </attr>
</declare-styleable></file><file path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">Libary</string></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/generated/res/resValues/release"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SlantedTextView"> </declare-styleable></file><file path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">Libary</string></file><file path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/res/values/dimens.xml" qualifiers=""/></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/build/generated/res/resValues/release"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SlantedTextView">
<attr format="dimension" name="slantedTextSize"/> <attr format="dimension" name="slantedTextSize"/>
<attr format="color" name="slantedBackgroundColor"/> <attr format="color" name="slantedBackgroundColor"/>
<attr format="string" name="slantedText"/> <attr format="string" name="slantedText"/>

@ -1,16 +1,16 @@
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12 ADDED from /home/admin/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 INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12
package package
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
xmlns:android xmlns:android
ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69 ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69
uses-sdk uses-sdk
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml reason: use-sdk injection requested INJECTED from /home/admin/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 /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
android:targetSdkVersion android:targetSdkVersion
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
android:minSdkVersion android:minSdkVersion
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml

@ -21,9 +21,12 @@
#-renamesourcefileattribute SourceFile #-renamesourcefileattribute SourceFile
-keep class org.xmlpull.v1.** { *;} -keep class org.xmlpull.v1.** { *;}
-dontwarn org.xmlpull.v1.** -dontwarn org.xmlpull.v1.**
-keep class com.rehome.zhdcoa.App -keep class com.rehome.zhdcoa.App
#-keep class com.rehome.zhdcoa.Contans #-keep class com.rehome.zhdcoa.Contans
@ -68,14 +71,15 @@
-keepattributes Signature -keepattributes Signature
-keepattributes SourceFile,LineNumberTable -keepattributes SourceFile,LineNumberTable
#记录生成的日志数据,gradle build时在本项目根目录输出apk 包内所有 class 的内部结构 #记录生成的日志数据,gradle build时在本项目根目录输出apk 包内所有 class 的内部结构
-dump class_files.txt #-dump class_files.txt
#未混淆的类和成员 ##未混淆的类和成员
-printseeds seeds.txt #-printseeds seeds.txt
#列出从 apk 中删除的代码 ##列出从 apk 中删除的代码
-printusage unused.txt #-printusage unused.txt
#混淆前后的映射 ##混淆前后的映射
-printmapping mapping.txt #-printmapping mapping.txt
#</基本指令> #</基本指令>
#<基础> #<基础>
@ -261,4 +265,7 @@
-keep class com.luck.lib.camerax.** { *; } -keep class com.luck.lib.camerax.** { *; }
-dontwarn com.yalantis.ucrop** -dontwarn com.yalantis.ucrop**
-keep class com.yalantis.ucrop** { *; } -keep class com.yalantis.ucrop** { *; }
-keep interface com.yalantis.ucrop** { *; } -keep interface com.yalantis.ucrop** { *; }
#-ignorewarnings
#-libraryjars libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar

Loading…
Cancel
Save