登录页面 和 首页 增加 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息 提示

master
hwf452 10 months ago
parent 364c55268a
commit 636e3b14aa

4
.gitignore vendored

@ -7,6 +7,10 @@
/captures
.externalNativeBuild
.idea
/androidslantedtextview/build
/androidpdfviewer/build
androidslantedtextview/build
androidpdfviewer/build
/androidslantedtextview/build/*
/androidpdfviewer/build/*

@ -1,5 +1,5 @@
#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
#Mon Feb 10 14:08:58 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

@ -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="/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_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/>
<attr format="boolean|reference" name="sb_horizontal"/>
</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">
</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">
<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="/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>
<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>

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

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

@ -1,16 +1,16 @@
-- Merging decision tree log ---
manifest
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
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
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
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
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
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
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
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml
INJECTED from /home/admin/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="/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="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="/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">
</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">
<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="/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>
<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>

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

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

@ -1,16 +1,16 @@
-- Merging decision tree log ---
manifest
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
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
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
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
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
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
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
INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml
INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml

@ -2,8 +2,7 @@ package com.rehome.zhdcoa.ui.fragment
import android.app.Activity
import android.content.Intent
import android.text.TextUtils
import android.util.Log
import android.os.Handler
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -130,6 +129,12 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
// showLog(result)
// }
Handler().postDelayed({ // 在指定时间后要执行的代码
//隐藏掉 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息
showLog("隐藏掉 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息")
binding.llTip.visibility=View.GONE;
}, 5000)
}
override fun initData() {

@ -27,7 +27,7 @@
android:layout_width="300px"
android:layout_height="300px"
android:layout_centerHorizontal="true"
android:layout_marginTop="180px"
android:layout_marginTop="150px"
android:src="@drawable/logo" />
<LinearLayout
@ -35,7 +35,7 @@
android:layout_height="500px"
android:layout_below="@id/iv_logo"
android:layout_marginLeft="60px"
android:layout_marginTop="30px"
android:layout_marginTop="20px"
android:layout_marginRight="60px"
android:gravity="center"
android:orientation="vertical">
@ -167,6 +167,30 @@
</RadioGroup>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="100dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#d9524b"
android:text="本平台为非涉密平台,严禁处理、传输"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#d9524b"
android:text="国家秘密、工作秘密、商业秘密、敏感信息"
android:textSize="16sp" />
<!--android:textColor="#c4df3f" android:textColor="#d9524b" -->
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@ -179,6 +203,7 @@
android:id="@+id/text_wjmm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorPrimaryDark"
android:layout_weight="1"
android:gravity="center"
android:text="忘记密码"

@ -243,7 +243,7 @@
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:gravity="center"
android:text="最近10条会议录音历史记录"
android:text="最近20条会议录音历史记录"
android:textColor="@color/black"
android:textSize="28px" />

@ -14,6 +14,25 @@
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="ExtraText">
<LinearLayout
android:id="@+id/ll_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#fffacd"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textColor="#d9524b"
android:text="本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息。"
android:textSize="18sp" />
</LinearLayout>
<ImageView
android:id="@+id/iv"
@ -53,7 +72,6 @@
android:textSize="26px" />
</RelativeLayout>
<com.rehome.zhdcoa.weiget.AutoGridView
android:id="@+id/gv1"
android:visibility="gone"

Loading…
Cancel
Save