移除过时第三方库

master
修改密码漏洞修复完成 11 months ago
parent 35a0ed1712
commit e2914d76c5

@ -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,10 +1,10 @@
<?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="/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">
<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">
<attr format="color|reference" name="sb_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/>
<attr format="boolean|reference" name="sb_horizontal"/>
</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="debug$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/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/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/debug"/></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/debug"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="ScrollBar">
</declare-styleable></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$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/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/debug/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/debug"/></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/debug"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="ScrollBar">
<attr format="color|reference" name="sb_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/>

@ -1,2 +1,2 @@
<?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="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&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>
<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>

@ -1,2 +1,2 @@
<?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="/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>
<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>

@ -1,2 +1,2 @@
<?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="/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&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>
<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>

@ -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,10 +1,10 @@
<?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="/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">
<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">
<attr format="color|reference" name="sb_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/>
<attr format="boolean|reference" name="sb_horizontal"/>
</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">
</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">
<attr format="color|reference" name="sb_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/>

@ -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

@ -1,5 +1,5 @@
<?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="/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">
<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">
<attr format="dimension" name="slantedTextSize"/>
<attr format="color" name="slantedBackgroundColor"/>
<attr format="string" name="slantedText"/>
@ -15,7 +15,7 @@
<enum name="left_bottom_triangle" value="6"/>
<enum name="right_bottom_triangle" value="7"/>
</attr>
</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="debug$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/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/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/debug"/></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/debug"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SlantedTextView">
</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="debug$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/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/debug/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/debug"/></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/debug"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SlantedTextView">
<attr format="dimension" name="slantedTextSize"/>
<attr format="color" name="slantedBackgroundColor"/>
<attr format="string" name="slantedText"/>

@ -1,2 +1,2 @@
<?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="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&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>
<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>

@ -1,2 +1,2 @@
<?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="/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>
<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>

@ -1,2 +1,2 @@
<?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="/home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&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>
<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>

@ -1,5 +1,5 @@
<?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="/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">
<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">
<attr format="dimension" name="slantedTextSize"/>
<attr format="color" name="slantedBackgroundColor"/>
<attr format="string" name="slantedText"/>
@ -15,7 +15,7 @@
<enum name="left_bottom_triangle" value="6"/>
<enum name="right_bottom_triangle" value="7"/>
</attr>
</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">
</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">
<attr format="dimension" name="slantedTextSize"/>
<attr format="color" name="slantedBackgroundColor"/>
<attr format="string" name="slantedText"/>

@ -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

@ -73,7 +73,7 @@ dependencies {
implementation files('libs/pdf.aar')
implementation files('libs/ZSDK_API.jar')
implementation files('libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar')
implementation files('libs/MiPush_SDK_Client_3_4_3.jar')
// implementation files('libs/MiPush_SDK_Client_3_4_3.jar')
implementation files('libs/badgeview.jar')
implementation files('libs/TbsFileSdk_base_arm64_release_1.0.5.6000030.20231109143447.aar')
// implementation 'androidx.appcompat:appcompat:1.6.1'
@ -119,6 +119,9 @@ dependencies {
implementation project(':videocompressor')
//wavmp3
implementation project(':recorderlib')
//
// implementation project(':refreshheader')
// implementation project(':refreshlayout')
@ -160,15 +163,15 @@ dependencies {
implementation 'com.github.baoyachi:StepView:1.9'
implementation 'io.github.azhon:appupdate:4.2.6'
implementation 'com.tencent.bugly:crashreport:3.2.1'
implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-header:1.1.5'
implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-layout:1.1.5'
// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-header:1.1.5'
// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-layout:1.1.5'
//implementation 'com.just.agentweb:agentweb:4.1.4'
//
implementation 'io.github.justson:agentweb-core:v5.1.1-androidx'
//implementation 'com.lcodecorex:tkrefreshlayout:1.0.7'
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
implementation files('../libs/poi-3.9-20121203.jar')
implementation files('../libs/poi-scratchpad-3.9-20121203.jar')
// implementation files('../libs/poi-3.9-20121203.jar')
// implementation files('../libs/poi-scratchpad-3.9-20121203.jar')
// implementation 'androidx.activity:activity:1.8.0'
// testImplementation 'junit:junit:4.13.1'
// androidTestImplementation 'androidx.test.ext:junit:1.1.2'

@ -28,9 +28,6 @@ import com.rehome.zhdcoa.utils.SPUtils;
//import com.squareup.leakcanary.LeakCanary;
//import com.squareup.leakcanary.RefWatcher;
import com.tencent.bugly.crashreport.CrashReport;
import com.xiaomi.channel.commonutils.logger.LoggerInterface;
import com.xiaomi.mipush.sdk.Logger;
import com.xiaomi.mipush.sdk.MiPushClient;
import com.xuexiang.xui.XUI;
import com.yolanda.nohttp.NoHttp;
import com.zhy.autolayout.config.AutoLayoutConifg;
@ -93,21 +90,6 @@ public class App extends LitePalApplication {
XUI.init(this); //初始化UI框架
CrashReport.initCrashReport(getApplicationContext(), "13d735012a", true);
loadEmojiFromBundled();
LoggerInterface newLogger = new LoggerInterface() {
@Override
public void setTag(String tag) {
}
@Override
public void log(String content, Throwable t) {
}
@Override
public void log(String content) {
}
};
Logger.setLogger(this, newLogger);
//BuildConfig.DEBUG

@ -21,7 +21,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener;
import com.rehome.zhdcoa.utils.RSAAndroid;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
@ -44,7 +43,6 @@ import javax.net.ssl.SSLSocketFactory;
public class ActivityFactoryMemberStatistics extends BaseActivity {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
ClearEditText etSearch;
LinearLayout lv_member_tile;
LinearLayout lv_member_nodata;
@ -61,7 +59,7 @@ public class ActivityFactoryMemberStatistics extends BaseActivity {
private void findView(){
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
//refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
lv_member_tile = findViewById(R.id.lv_member_tile);
lv_member_nodata = findViewById(R.id.lv_member_nodata);
@ -115,8 +113,8 @@ public class ActivityFactoryMemberStatistics extends BaseActivity {
public void initData() {
authenticationLoginAI();
//getMemberInfoList();
refreshLayout.setOnRefreshListener(refreshLayout -> getMemberInfoList());
getMemberInfoList();
}
public void authenticationLoginAI(){
@ -184,7 +182,7 @@ public class ActivityFactoryMemberStatistics extends BaseActivity {
lv_member_nodata.setVisibility(View.VISIBLE);
}
}
refreshLayout.finishRefresh(true);
//refreshLayout.finishRefresh(true);
}
@Override

@ -21,7 +21,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener;
import com.rehome.zhdcoa.utils.RSAAndroid;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
@ -44,7 +43,6 @@ import javax.net.ssl.SSLSocketFactory;
public class ActivityFactoryWorkerInfoGroup extends BaseActivity {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
ClearEditText etSearch;
LinearLayout lv_member_nodata;
@ -60,7 +58,6 @@ public class ActivityFactoryWorkerInfoGroup extends BaseActivity {
private void findView(){
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
lv_member_nodata = findViewById(R.id.lv_member_nodata);
}
@ -113,7 +110,7 @@ public class ActivityFactoryWorkerInfoGroup extends BaseActivity {
@Override
public void initData() {
authenticationLoginAI();
refreshLayout.setOnRefreshListener(refreshLayout -> getFactoryWorkerInfoList());
getFactoryWorkerInfoList();
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(ActivityFactoryWorkerInfoGroup.this, ActivityFactoryWorkerInfoGroupMember.class);
intent.putExtra("company", item.getCompany());
@ -193,7 +190,6 @@ public class ActivityFactoryWorkerInfoGroup extends BaseActivity {
lv_member_nodata.setVisibility(View.VISIBLE);
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -21,7 +21,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener;
import com.rehome.zhdcoa.utils.RSAAndroid;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
@ -43,7 +42,6 @@ import javax.net.ssl.SSLSocketFactory;
*/
public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
ClearEditText etSearch;
LinearLayout lv_member_nodata;
@ -60,7 +58,6 @@ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity {
private void findView(){
recyclerView = findViewById(R.id.recycler_view);
lv_member_nodata = findViewById(R.id.lv_member_nodata);
refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
}
@ -114,7 +111,7 @@ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity {
public void initData() {
authenticationLoginAI();
//getFactoryWorkerInfoList();
refreshLayout.setOnRefreshListener(refreshLayout -> getFactoryWorkerInfoList());
getFactoryWorkerInfoList();
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(ActivityFactoryWorkerInfoGroupMember.this, ActivityFactoryMemberTrack.class);
intent.putExtra("card_no", item.getCardId());
@ -192,7 +189,6 @@ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity {
lv_member_nodata.setVisibility(View.VISIBLE);
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -23,7 +23,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener;
import com.rehome.zhdcoa.utils.RSAAndroid;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
@ -45,7 +44,6 @@ import javax.net.ssl.SSLSocketFactory;
public class ActivityFactoryWorkerInfoStatistics extends BaseActivity {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
ClearEditText etSearch;
LinearLayout lv_member_nodata;
@ -57,7 +55,6 @@ public class ActivityFactoryWorkerInfoStatistics extends BaseActivity {
private void findView(){
recyclerView = findViewById(R.id.recycler_view);
lv_member_nodata = findViewById(R.id.lv_member_nodata);
refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
}
@ -114,8 +111,7 @@ public class ActivityFactoryWorkerInfoStatistics extends BaseActivity {
@Override
public void initData() {
authenticationLoginAI();
//getFactoryWorkerInfoList();
refreshLayout.setOnRefreshListener(refreshLayout -> getFactoryWorkerInfoList());
getFactoryWorkerInfoList();
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(ActivityFactoryWorkerInfoStatistics.this, ActivityFactoryMemberTrack.class);
intent.putExtra("card_no", item.getIdNumber());
@ -185,7 +181,6 @@ public class ActivityFactoryWorkerInfoStatistics extends BaseActivity {
lv_member_nodata.setVisibility(View.VISIBLE);
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -29,7 +29,6 @@ import com.rehome.zhdcoa.bean.UserInfoBean
import com.rehome.zhdcoa.databinding.ActivityLoginBinding
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself
import com.rehome.zhdcoa.utils.*
import com.xiaomi.mipush.sdk.MiPushClient
import com.yolanda.nohttp.NoHttp
import com.yolanda.nohttp.RequestMethod
import com.yolanda.nohttp.rest.Response
@ -359,11 +358,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
usernameLogin
)
) {
MiPushClient.setAlias(
context,
binding.etUsername.text.toString(),
null
)
SPUtils.put(
context,
Contans.SP.OLD_PWD,

@ -15,7 +15,6 @@ import com.rehome.zhdcoa.bean.ResultBean;
import com.rehome.zhdcoa.bean.SqBean;
import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import java.util.ArrayList;
import java.util.List;
import retrofit2.Call;
@ -25,14 +24,13 @@ public class SqActivity extends BaseActivity {
ClearEditText etSearch;
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
private List<SqBean.RowsBean> datas;
private SqAdapter mAdapter;
private void findView() {
etSearch = findViewById(R.id.et_search);
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
//refreshLayout = findViewById(R.id.refreshLayout);
}
@Override
@ -56,7 +54,7 @@ public class SqActivity extends BaseActivity {
datas = new ArrayList<>();
GetData();
refreshLayout.setOnRefreshListener(refreshLayout -> GetData());
//refreshLayout.setOnRefreshListener(refreshLayout -> GetData());
recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext()));
recyclerView.setItemAnimator(new DefaultItemAnimator());
@ -119,7 +117,7 @@ public class SqActivity extends BaseActivity {
mAdapter.refresh(datas);
}
}
refreshLayout.finishRefresh(true);
//refreshLayout.finishRefresh(true);
}
@Override

@ -34,7 +34,6 @@ import com.rehome.zhdcoa.utils.TimeUtils
import com.rehome.zhdcoa.utils.UiUtlis
import com.rehome.zhdcoa.weiget.AuditDialog
import com.rehome.zhdcoa.weiget.ListYXDialog
import com.xiaomi.mipush.sdk.MiPushClient
import com.yolanda.nohttp.NoHttp
import com.yolanda.nohttp.RequestMethod
import retrofit2.Call

@ -26,7 +26,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils
import com.rehome.zhdcoa.utils.RSAUtils
import com.rehome.zhdcoa.utils.SPUtils
import com.rehome.zhdcoa.utils.UiUtlis
import com.xiaomi.mipush.sdk.MiPushClient
import com.yolanda.nohttp.NoHttp
import com.yolanda.nohttp.RequestMethod
import okhttp3.FormBody

@ -12,7 +12,6 @@ import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.XfscxBean;
import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.DefaultItemAnimator;
@ -24,12 +23,10 @@ import retrofit2.Response;
public class XfssqActivity extends BaseActivity {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
ClearEditText etSearch;
private void findView() {
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
}
@ -79,7 +76,6 @@ public class XfssqActivity extends BaseActivity {
public void initData() {
GetData();
refreshLayout.setOnRefreshListener(refreshLayout -> GetData());
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(XfssqActivity.this, XfsinfoActivity.class);
intent.putExtra("id", datas.get(position).getId());
@ -100,7 +96,6 @@ public class XfssqActivity extends BaseActivity {
mAdapter.refresh(datas);
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -18,7 +18,6 @@ import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.rehome.zhdcoa.weiget.DateTimePickDialog;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@ -37,7 +36,6 @@ public class YXCZCWActivity extends BaseActivity {
TextView tvEt;
ClearEditText etSearch;
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
private List<YXczcwBean.DataBean> datas;
@ -46,7 +44,6 @@ public class YXCZCWActivity extends BaseActivity {
private void findView() {
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
tvSt = findViewById(R.id.tv_st);
tvEt = findViewById(R.id.tv_et);
@ -109,7 +106,6 @@ public class YXCZCWActivity extends BaseActivity {
tvEt.setText(df.format(new Date()));
GetData();
refreshLayout.setOnRefreshListener(refreshLayout -> GetData());
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(YXCZCWActivity.this, YXCZCWInfoActivity.class);
intent.putExtra("id", datas.get(position).getId());
@ -148,7 +144,6 @@ public class YXCZCWActivity extends BaseActivity {
showToast("无数据");
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -16,7 +16,6 @@ import com.rehome.zhdcoa.entity.YxSbInfoDataBean;
import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -29,7 +28,6 @@ import retrofit2.Response;
public class YXSBSSSJActivity extends BaseActivity {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
ClearEditText etSearch;
private List<YxSbInfoDataBean.DataBean> datas;
@ -39,7 +37,6 @@ public class YXSBSSSJActivity extends BaseActivity {
private void findView() {
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
}
@ -85,7 +82,6 @@ public class YXSBSSSJActivity extends BaseActivity {
public void initData() {
initdatas = new ArrayList<>();
GetData();
refreshLayout.setOnRefreshListener(refreshLayout -> GetData());
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(YXSBSSSJActivity.this, BaseWebActivity.class);
intent.putExtra("id", datas.get(position).getId());
@ -108,7 +104,6 @@ public class YXSBSSSJActivity extends BaseActivity {
initdatas.addAll(datas);
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -18,7 +18,6 @@ import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.weiget.ClearEditText;
import com.rehome.zhdcoa.weiget.DateTimePickDialog;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@ -34,7 +33,6 @@ import retrofit2.Response;
public class YXSBSSSJHisActivity extends BaseActivity {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
ClearEditText etSearch;
TextView tvSt;
TextView tvEt;
@ -45,7 +43,6 @@ public class YXSBSSSJHisActivity extends BaseActivity {
private void findView() {
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
etSearch = findViewById(R.id.et_search);
tvSt = findViewById(R.id.tv_st);
tvEt = findViewById(R.id.tv_et);
@ -98,7 +95,6 @@ public class YXSBSSSJHisActivity extends BaseActivity {
tvSt.setText(df.format(calendar.getTime()));
tvEt.setText(df.format(new Date()));
GetData();
refreshLayout.setOnRefreshListener(refreshLayout -> GetData());
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(YXSBSSSJHisActivity.this, YXSBSSSJHisInfoActivity.class);
@ -134,7 +130,6 @@ public class YXSBSSSJHisActivity extends BaseActivity {
initdatas.addAll(datas);
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -8,8 +8,6 @@ import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.XfscxBean;
import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.DefaultItemAnimator;
@ -21,7 +19,6 @@ import retrofit2.Response;
public class YcryglActivity extends BaseActivity implements View.OnClickListener {
RecyclerView recyclerView;
SmartRefreshLayout refreshLayout;
private List<XfscxBean.RowsBean> datas;
private XfscxDataAdapter mAdapter;
@ -29,7 +26,6 @@ public class YcryglActivity extends BaseActivity implements View.OnClickListener
private void findView() {
recyclerView = findViewById(R.id.recycler_view);
refreshLayout = findViewById(R.id.refreshLayout);
}
@ -74,7 +70,6 @@ public class YcryglActivity extends BaseActivity implements View.OnClickListener
public void initData() {
GetData();
refreshLayout.setOnRefreshListener(refreshLayout -> GetData());
mAdapter.setOnItemClickListener((itemView, item, position) -> {
Intent intent = new Intent(YcryglActivity.this, XfsinfoActivity.class);
intent.putExtra("id", datas.get(position).getId());
@ -95,7 +90,6 @@ public class YcryglActivity extends BaseActivity implements View.OnClickListener
mAdapter.refresh(datas);
}
}
refreshLayout.finishRefresh(true);
}
@Override

@ -17,32 +17,25 @@
android:layout_height="match_parent"
android:paddingStart="15dp"
android:paddingEnd="15dp">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F2F2"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
android:background="#F2F2F2"
android:overScrollMode="never" />
<LinearLayout
android:id="@+id/lv_member_nodata"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无数据"/>
android:text="暂无数据" />
</LinearLayout>
</FrameLayout>
</LinearLayout>

@ -8,38 +8,32 @@
<include layout="@layout/layout_base" />
<include layout="@layout/search_view" android:visibility="gone"/>
<include
layout="@layout/search_view"
android:visibility="gone" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#E7F1F7"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#E7F1F7"
android:overScrollMode="never" />
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<LinearLayout
android:id="@+id/lv_member_nodata"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无数据"/>
android:text="暂无数据" />
</LinearLayout>
</FrameLayout>
</LinearLayout>

@ -13,24 +13,13 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#E7F1F7"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<LinearLayout
android:id="@+id/lv_member_nodata"
android:layout_width="match_parent"

@ -9,21 +9,11 @@
<include layout="@layout/search_view" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F2F2"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>

@ -9,21 +9,11 @@
<include layout="@layout/search_view" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F2F2"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>

@ -8,21 +8,11 @@
<include layout="@layout/layout_base" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F2F2"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>

@ -36,22 +36,10 @@
android:text="点击选择结束时间"
android:textSize="24px" />
</LinearLayout>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F2F2"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>

@ -11,22 +11,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp" />
<!-- <com.scwang.smartrefresh.layout.SmartRefreshLayout-->
<!-- android:id="@+id/refreshLayout"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- app:srlEnableAutoLoadMore="false"-->
<!-- app:srlEnableLoadMore="true"-->
<!-- app:srlEnableNestedScrolling="true">-->
<!-- <include layout="@layout/include_refresh_head" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/recycler_view"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="#F2F2F2"-->
<!-- android:overScrollMode="never" />-->
<!-- </com.scwang.smartrefresh.layout.SmartRefreshLayout>-->
</LinearLayout>

@ -9,15 +9,6 @@
<include layout="@layout/search_view" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
@ -25,5 +16,5 @@
android:layout_height="match_parent"
android:background="#F2F2F2"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>

@ -38,21 +38,11 @@
</LinearLayout>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableAutoLoadMore="false"
app:srlEnableLoadMore="true"
app:srlEnableNestedScrolling="true">
<include layout="@layout/include_refresh_head" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F2F2"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>

@ -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" />

@ -15,6 +15,7 @@ activity = "1.8.0"
constraintlayout = "2.1.4"
supportCompat = "28.0.0"
pdfiumAndroid = "1.9.0"
annotationJvm = "1.9.1"
[libraries]
androidx-appcompat-v120 = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppcompat" }
@ -33,6 +34,7 @@ pdfium-android = { module = "com.github.barteksc:pdfium-android", version.ref =
recyclerview-v7 = { module = "com.android.support:recyclerview-v7", version.ref = "supportCompat" }
support-compat = { module = "com.android.support:support-compat", version.ref = "supportCompat" }
support-v4 = { module = "com.android.support:support-v4", version.ref = "supportCompat" }
androidx-annotation-jvm = { group = "androidx.annotation", name = "annotation-jvm", version.ref = "annotationJvm" }
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }

Binary file not shown.
Loading…
Cancel
Save