忽略文件调整

master
admin-pc\admin 1 year ago
parent 0eeef338da
commit 38e9030032

3
.gitignore vendored

@ -8,7 +8,8 @@
.externalNativeBuild .externalNativeBuild
.idea .idea
/androidslantedtextview/build/*
/androidpdfviewer/build/*
/autolayout/build/* /autolayout/build/*
/calendarview/build/* /calendarview/build/*
/litepal/build/* /litepal/build/*

@ -1,5 +1,5 @@
#Sat Sep 28 12:00:27 CST 2024 #Sat Oct 12 15:23:48 CST 2024
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_bottom.xml=C\:\\Users\\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=/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_left.xml=C\:\\Users\\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=/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_right.xml=C\:\\Users\\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=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_top.xml com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_top.xml=C\:\\Users\\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"?> <?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="C:\Users\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="C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\res"><file name="default_scroll_handle_bottom" path="C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\res\drawable\default_scroll_handle_bottom.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_left" path="C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\res\drawable\default_scroll_handle_left.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_right" path="C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\res\drawable\default_scroll_handle_right.xml" qualifiers="" type="drawable"/><file name="default_scroll_handle_top" path="C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\res\drawable\default_scroll_handle_top.xml" qualifiers="" type="drawable"/><file path="C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="ScrollBar">
<attr format="color|reference" name="sb_handlerColor"/> <attr format="color|reference" name="sb_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/> <attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/> <attr format="color|reference" name="sb_indicatorTextColor"/>
<attr format="boolean|reference" name="sb_horizontal"/> <attr format="boolean|reference" name="sb_horizontal"/>
</declare-styleable></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="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></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="C:\Users\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="C:\Users\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="C:\Users\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="C:\Users\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_handlerColor"/>
<attr format="color|reference" name="sb_indicatorColor"/> <attr format="color|reference" name="sb_indicatorColor"/>
<attr format="color|reference" name="sb_indicatorTextColor"/> <attr format="color|reference" name="sb_indicatorTextColor"/>

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

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

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

@ -180,13 +180,13 @@ public class App extends LitePalApplication {
@Override @Override
public void onInitialized() public void onInitialized()
{ {
Log.i("app", "loadEmojiFromBundled()->onInitialized()"); //Log.i("app", "loadEmojiFromBundled()->onInitialized()");
} }
@Override @Override
public void onFailed(@Nullable Throwable throwable) public void onFailed(@Nullable Throwable throwable)
{ {
Log.e("app", "loadEmojiFromBundled()->onFailed()", throwable); //Log.e("app", "loadEmojiFromBundled()->onFailed()", throwable);
} }
}); });

@ -170,8 +170,22 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) { if (isApkInDebug(context)) {
// 管理员 // 管理员
// binding.etUsername.setText("ZHPS_Admin") binding.etUsername.setText("ZHPS_Admin")
// binding.etPassword.setText("Rehome.zhps@996") binding.etPassword.setText("Rehome.zhps@996")
binding.etUsername.setText("310353")
binding.etPassword.setText("Zhps1382.")
// binding.etUsername.setText("990001")
// binding.etPassword.setText("Bwfb@123")
// binding.etUsername.setText("310295")
// binding.etPassword.setText("Whk363521!")
// binding.etUsername.setText("310675")
// binding.etPassword.setText("Mj12345_")
//吴云强 //吴云强
// binding.etUsername.setText("310430") // binding.etUsername.setText("310430")
@ -190,6 +204,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etPassword.setText("ZHPs@040909") // binding.etPassword.setText("ZHPs@040909")
//谭添欢 //谭添欢
// binding.etUsername.setText("310273") // binding.etUsername.setText("310273")
// binding.etPassword.setText("#Tth8680004") // binding.etPassword.setText("#Tth8680004")

@ -207,9 +207,9 @@ class MainActivity : BaseActivityOaToolbarViewBinding<ActivityMainBinding>() {
val request = NoHttp.createStringRequest(url, RequestMethod.GET) val request = NoHttp.createStringRequest(url, RequestMethod.GET)
NohttpUtils.getInstance().addNoProgress(this, 0, request, object : HttpListener<String?> { NohttpUtils.getInstance().addNoProgress(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) { override fun onSucceed(what: Int, response: Response<String?>?) {
Log.i("app", "----------------") showLog( "----------------")
val jsonResult = response?.get() val jsonResult = response?.get()
Log.i("app", jsonResult ?: "jsonResult is null") showLog( jsonResult ?: "jsonResult is null")
val bean = GsonUtils.GsonToBean(jsonResult, AboutMeBean::class.java) val bean = GsonUtils.GsonToBean(jsonResult, AboutMeBean::class.java)
if (bean != null) { if (bean != null) {
if (bean.total != "0") { if (bean.total != "0") {
@ -324,16 +324,16 @@ class MainActivity : BaseActivityOaToolbarViewBinding<ActivityMainBinding>() {
TbsFileInterfaceImpl.setLicenseKey(Contans.TBS_LICENSE_KEY) TbsFileInterfaceImpl.setLicenseKey(Contans.TBS_LICENSE_KEY)
val callback: ITbsReaderCallback = val callback: ITbsReaderCallback =
ITbsReaderCallback { actionType, args, result -> ITbsReaderCallback { actionType, args, result ->
Log.i("app", "actionType=" + actionType + "args=" + args + "result=" + result); showLog( "actionType=" + actionType + "args=" + args + "result=" + result);
if (ITbsReader.OPEN_FILEREADER_ASYNC_LOAD_READER_ENTRY_CALLBACK == actionType) { if (ITbsReader.OPEN_FILEREADER_ASYNC_LOAD_READER_ENTRY_CALLBACK == actionType) {
ret = args?.toString()?.toInt() ?: -1 ret = args?.toString()?.toInt() ?: -1
if (ret == 0) { if (ret == 0) {
// 初始化成功 // 初始化成功
//Toast.makeText(applicationContext, "腾讯浏览服务初始化Engine成功", Toast.LENGTH_SHORT).show() //Toast.makeText(applicationContext, "腾讯浏览服务初始化Engine成功", Toast.LENGTH_SHORT).show()
Log.i("app", "腾讯浏览服务初始化Engine成功") showLog( "腾讯浏览服务初始化Engine成功")
} else { } else {
// 初始化失败 // 初始化失败
Log.i("app", "腾讯浏览服务初始化Engine失败 ret = $ret") showLog( "腾讯浏览服务初始化Engine失败 ret = $ret")
//Toast.makeText(applicationContext,"腾讯浏览服务初始化Engine失败请连接到公网环境下使用 ret = $ret",Toast.LENGTH_SHORT).show() //Toast.makeText(applicationContext,"腾讯浏览服务初始化Engine失败请连接到公网环境下使用 ret = $ret",Toast.LENGTH_SHORT).show()
} }
} }

@ -59,7 +59,9 @@ public class XsBackLogActivity extends BaseActivity2 {
public void onSucceed(int what, Response<String> response) { public void onSucceed(int what, Response<String> response) {
try { try {
XsJhListBean xsJhListBean = GsonUtils.GsonToBean(response.get(), XsJhListBean.class); String result = response.get();
showLog(result);
XsJhListBean xsJhListBean = GsonUtils.GsonToBean(result, XsJhListBean.class);
if (xsJhListBean != null) { if (xsJhListBean != null) {
if (xsJhListBean.getState() == 1) { if (xsJhListBean.getState() == 1) {
// showToast(xsJhListBean.getMsg()); // showToast(xsJhListBean.getMsg());

@ -84,15 +84,24 @@ public class XscbqyActivity extends BaseActivity2 {
public void onSucceed(int what, Response<String> response) { public void onSucceed(int what, Response<String> response) {
try { try {
String json = response.get(); String result = response.get();
XsjhQyBean xsjhQyBean = GsonUtils.GsonToBean(response.get(), XsjhQyBean.class); showLog(result);
XsjhQyBean xsjhQyBean = GsonUtils.GsonToBean(result, XsjhQyBean.class);
if (xsjhQyBean != null) { if (xsjhQyBean != null) {
if (xsjhQyBean.getState() == 1) { if (xsjhQyBean.getState() == 1) {
qys.clear(); qys.clear();
qys.addAll(xsjhQyBean.getData()); qys.addAll(xsjhQyBean.getData());
if(qys!=null&&qys.size()>0){
for(XsjhQyBean.DataBeanX item : qys){
showLog(GsonUtils.GsonString(item));
showLog(item.getQybh());
showLog(item.getQymc());
}
}
setAdapter(); setAdapter();
} }
} else { } else {

@ -778,9 +778,9 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
what: Int, what: Int,
response: com.yolanda.nohttp.rest.Response<String?>? response: com.yolanda.nohttp.rest.Response<String?>?
) { ) {
Log.i("app", "----------------") showLog( "----------------")
val jsonResult = response?.get() val jsonResult = response?.get()
Log.i("app", jsonResult ?: "jsonResult is null") showLog( jsonResult ?: "jsonResult is null")
val bean = GsonUtils.GsonToBean( val bean = GsonUtils.GsonToBean(
jsonResult, jsonResult,
AttendanceCheckBean::class.java AttendanceCheckBean::class.java

@ -1,11 +1,15 @@
package com.rehome.zhdcoa.utils; package com.rehome.zhdcoa.utils;
import android.Manifest;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.location.LocationManager; import android.location.LocationManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import androidx.core.app.ActivityCompat;
import java.util.List; import java.util.List;
/** /**
@ -65,6 +69,16 @@ public class NetworkAvailableUtils {
.getSystemService(Context.CONNECTIVITY_SERVICE); .getSystemService(Context.CONNECTIVITY_SERVICE);
TelephonyManager mgrTel = (TelephonyManager) context TelephonyManager mgrTel = (TelephonyManager) context
.getSystemService(Context.TELEPHONY_SERVICE); .getSystemService(Context.TELEPHONY_SERVICE);
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return false;
}
return ((mgrConn.getActiveNetworkInfo() != null && mgrConn return ((mgrConn.getActiveNetworkInfo() != null && mgrConn
.getActiveNetworkInfo().getState() == NetworkInfo.State.CONNECTED) || mgrTel .getActiveNetworkInfo().getState() == NetworkInfo.State.CONNECTED) || mgrTel
.getNetworkType() == TelephonyManager.NETWORK_TYPE_UMTS); .getNetworkType() == TelephonyManager.NETWORK_TYPE_UMTS);

@ -38,6 +38,7 @@ public class MaterialProgressDrawable extends Drawable implements Animatable {
private static final Interpolator MATERIAL_INTERPOLATOR = new FastOutSlowInInterpolator(); private static final Interpolator MATERIAL_INTERPOLATOR = new FastOutSlowInInterpolator();
private static final float FULL_ROTATION = 1080.0f; private static final float FULL_ROTATION = 1080.0f;
//@Retention(RetentionPolicy.SOURCE)
@Retention(RetentionPolicy.CLASS) @Retention(RetentionPolicy.CLASS)
@IntDef({LARGE, DEFAULT}) @IntDef({LARGE, DEFAULT})
public @interface ProgressDrawableSize {} public @interface ProgressDrawableSize {}

Loading…
Cancel
Save