diff --git a/.gitignore b/.gitignore index 2c90bc2..24421ce 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,10 @@ /captures .externalNativeBuild .idea +/androidslantedtextview/build +/androidpdfviewer/build +androidslantedtextview/build +androidpdfviewer/build /androidslantedtextview/build/* /androidpdfviewer/build/* diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat index cc45347..e334d32 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat index 2483d6d..e100c11 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat index f8f8702..252684c 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat index c192b9b..6bc4743 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 6bce05c..1694d09 100644 --- a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -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 diff --git a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 4484e5f..5ff0fdd 100644 --- a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,10 +1,10 @@ - + - + diff --git a/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index d4ef047..000c800 100644 --- a/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidpdfviewer/build/intermediates/incremental/mergeDebugShaders/merger.xml b/androidpdfviewer/build/intermediates/incremental/mergeDebugShaders/merger.xml index 7034c6f..fae6518 100644 --- a/androidpdfviewer/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/merger.xml b/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/merger.xml index 0a89583..71268bd 100644 --- a/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidpdfviewer/build/outputs/logs/manifest-merger-debug-report.txt b/androidpdfviewer/build/outputs/logs/manifest-merger-debug-report.txt index a60201b..9a35050 100644 --- a/androidpdfviewer/build/outputs/logs/manifest-merger-debug-report.txt +++ b/androidpdfviewer/build/outputs/logs/manifest-merger-debug-report.txt @@ -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 diff --git a/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 1a531a7..b5dfeb8 100644 Binary files a/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 8356274..7cda067 100644 --- a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Sat Jan 18 02:24:51 CST 2025 +#Mon Feb 10 14:08:58 CST 2025 diff --git a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 296a83f..212eacf 100644 --- a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - Libary + Libary diff --git a/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index e90e860..f1bb334 100644 --- a/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidslantedtextview/build/intermediates/incremental/mergeDebugShaders/merger.xml b/androidslantedtextview/build/intermediates/incremental/mergeDebugShaders/merger.xml index 496d7cb..0f60cf4 100644 --- a/androidslantedtextview/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/merger.xml b/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/merger.xml index ec9c260..231b2fa 100644 --- a/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidslantedtextview/build/outputs/logs/manifest-merger-debug-report.txt b/androidslantedtextview/build/outputs/logs/manifest-merger-debug-report.txt index fe83577..1c68210 100644 --- a/androidslantedtextview/build/outputs/logs/manifest-merger-debug-report.txt +++ b/androidslantedtextview/build/outputs/logs/manifest-merger-debug-report.txt @@ -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 diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index 320561d..893291d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -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() { // showLog(result) // } + Handler().postDelayed({ // 在指定时间后要执行的代码 + //隐藏掉 本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息 + showLog("隐藏掉 本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息") + binding.llTip.visibility=View.GONE; + }, 5000) + } override fun initData() { diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index e43547d..e89f9f2 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -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" /> @@ -167,6 +167,30 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 9a41c5c..c70c9a7 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -14,6 +14,25 @@ android:layout_height="match_parent" android:orientation="vertical" tools:ignore="ExtraText"> + + + + -