From dbff974b067aec3b6acd4e2f6f0a1f7e776a08a8 Mon Sep 17 00:00:00 2001 From: wenfei Date: Tue, 16 Sep 2025 17:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=BC=95=E7=94=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androidpdfviewer/build.gradle | 4 ++-- androidslantedtextview/build.gradle | 4 ++-- .../zhdcoa/ui/activity/ApplyDinnerDetailActivity.java | 2 ++ .../zhdcoa/ui/activity/ApplyVehicleDetailActivity.java | 2 ++ .../java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt | 7 +++++-- app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java | 7 ++++--- .../main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java | 2 ++ autolayout/build.gradle | 6 +++--- calendarview/build.gradle | 6 +++--- gradle/libs.versions.toml | 7 ++++--- litepal/build.gradle | 4 ++-- nohttp/build.gradle | 4 ++-- recorderlib/build.gradle | 4 ++-- tkrefreshlayout/build.gradle | 4 ++-- videocompressor/build.gradle | 4 ++-- zxingLite/build.gradle | 6 +++--- 16 files changed, 42 insertions(+), 31 deletions(-) diff --git a/androidpdfviewer/build.gradle b/androidpdfviewer/build.gradle index 502db57..de5ae3d 100644 --- a/androidpdfviewer/build.gradle +++ b/androidpdfviewer/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.github.barteksc.pdfviewer' diff --git a/androidslantedtextview/build.gradle b/androidslantedtextview/build.gradle index a4e550d..6e56a18 100644 --- a/androidslantedtextview/build.gradle +++ b/androidslantedtextview/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.haozhang.lib' diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java index 7c92017..5ccce15 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java @@ -525,6 +525,8 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply Log.i("app", json); } + showLog("--------json--------"); + showLog(json); return json; } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java index 03198c5..1992a3c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java @@ -359,6 +359,8 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL bean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(bean); } + showLog("--------json--------"); + showLog(json); return json; } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index b8c90ae..0045114 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -219,8 +219,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 -// binding.etUsername.setText("ZHPS_Admin") -// binding.etPassword.setText("Rehome.zhps@996") + binding.etUsername.setText("ZHPS_Admin") + binding.etPassword.setText("Rehome.zhps@996") //公司内网215管理员 @@ -293,6 +293,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("Liu524042*") // binding.etUsername.setText("310126") // binding.etPassword.setText("Ymin1113@") +// binding.etUsername.setText("452559") +// binding.etPassword.setText("Wy9923251008@") } @@ -419,6 +421,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (userInfo.statusMsg == "success") { showLog("--------userHeadUrl----------") showLog(userInfo.userHeadUrl) + showLog("--------token----------") showLog(userInfo.token) //登录成功 diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java index 640aabb..3f40674 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java @@ -148,8 +148,9 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url(),mActivity); -// showLog(credential); -// showLog(new Gson().toJson(request.headers())); + showLog("-----token------",mActivity); + showLog(credential,mActivity); + //showLog(new Gson().toJson(request.headers())); } if(!TextUtils.isEmpty(request.url())){ String url =request.url(); @@ -174,7 +175,7 @@ public class NohttpUtils { String token = App.getInstance().getUserInfo().getToken(); String credential = "Bearer " + token; request.addHeader("Authorization", credential); - showLog(request.url(),mActivity); +// showLog(request.url(),mActivity); // showLog(credential); // showLog(new Gson().toJson(request.headers())); } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java index 26ec3b8..9600a5b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java @@ -55,6 +55,8 @@ public class SaveApplyUtils { String url = Contans.BASE_URL + Contans.APPLY_SAVE_URL; Request request = NoHttp.createStringRequest(url, RequestMethod.POST); String jsonEncrypt = RSAUtils.encryptBASE64Str(builder.json); + showLog("--------jsonEncrypt--------"); + showLog(jsonEncrypt); request.setDefineRequestBodyForJson(jsonEncrypt); NohttpUtils.getInstance().add(mContext, 0, "正在提交数据...", request, new HttpListener() { diff --git a/autolayout/build.gradle b/autolayout/build.gradle index 561e714..67c1514 100644 --- a/autolayout/build.gradle +++ b/autolayout/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.zhy.autolayout' } dependencies { - implementation libs.androidx.appcompat.v120 + implementation libs.androidx.appcompat } \ No newline at end of file diff --git a/calendarview/build.gradle b/calendarview/build.gradle index 8f6c650..d3598d3 100644 --- a/calendarview/build.gradle +++ b/calendarview/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.haibin.calendarview' @@ -12,6 +12,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation libs.androidx.appcompat.v120 + implementation libs.androidx.appcompat implementation libs.androidx.recyclerview.recyclerview } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b0516f2..8e333b5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] agp = "8.10.0" -androidxAppcompat = "1.7.0" androidxRecyclerview = "1.4.0" appupdate = "4.2.6" barcodeScanning = "17.3.0" @@ -20,7 +19,7 @@ comSquareupRetrofit2Retrofit2 = "2.9.0" eclipseOrgEclipsePahoAndroidService = "1.1.1" eclipseOrgEclipsePahoClientMqttv3 = "1.2.4" emojiBundled = "1.1.0" -fragment = "1.8.6" +fragment = "1.8.9" githubCompress = "v3.10.7" githubPictureselector = "v3.10.7" ioGithubJustsonAgentwebCore2 = "v5.1.1-androidx" @@ -44,11 +43,11 @@ tencentCrashreportVersion = "4.1.9.3" xuiVersion = "1.2.1" [libraries] -androidx-appcompat-v120 = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppcompat" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-emoji-bundled = { module = "androidx.emoji:emoji-bundled", version.ref = "emojiBundled" } androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "fragment" } androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" } +#noinspection SimilarGradleDependency androidx-recyclerview-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "androidxRecyclerview" } appupdate = { module = "io.github.azhon:appupdate", version.ref = "appupdate" } baoyachi-stepview = { module = "com.github.baoyachi:StepView", version.ref = "stepviewVersion" } @@ -86,7 +85,9 @@ androidx-constraintlayout = { group = "androidx.constraintlayout", name = "const me-leolin-shortcutbadger = { module = "me.leolin:ShortcutBadger", version.ref = "meShortcutbadgerVersion" } okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "loggingInterceptor" } org-bouncycastle-bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bouncycastleBcpkixJdk15on" } +#noinspection Aligned16KB pdfium-android = { module = "com.github.barteksc:pdfium-android", version.ref = "pdfiumAndroid" } +#noinspection SimilarGradleDependency recyclerview-v140 = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerviewVersion" } recyclerview-v7 = { module = "com.android.support:recyclerview-v7", version.ref = "supportCompat" } support-compat = { module = "com.android.support:support-compat", version.ref = "supportCompat" } diff --git a/litepal/build.gradle b/litepal/build.gradle index f4a269f..946c55e 100644 --- a/litepal/build.gradle +++ b/litepal/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'org.litepal' diff --git a/nohttp/build.gradle b/nohttp/build.gradle index 859d8e9..2b778da 100644 --- a/nohttp/build.gradle +++ b/nohttp/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.yolanda.nohttp' diff --git a/recorderlib/build.gradle b/recorderlib/build.gradle index a2d6570..1f6c997 100644 --- a/recorderlib/build.gradle +++ b/recorderlib/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 } sourceSets.main { jni.srcDirs = []//disable automatic ndk-build call diff --git a/tkrefreshlayout/build.gradle b/tkrefreshlayout/build.gradle index e456e7d..3a12cc4 100644 --- a/tkrefreshlayout/build.gradle +++ b/tkrefreshlayout/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.lcodecore.tkrefreshlayout' diff --git a/videocompressor/build.gradle b/videocompressor/build.gradle index 40c4ea1..058dbeb 100644 --- a/videocompressor/build.gradle +++ b/videocompressor/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.vincent.videocompressor' diff --git a/zxingLite/build.gradle b/zxingLite/build.gradle index 0e38032..07b517c 100644 --- a/zxingLite/build.gradle +++ b/zxingLite/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdk 24 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.king.zxing' @@ -15,5 +15,5 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation files('libs/zixing_core_3.4.1.jar') implementation libs.androidx.fragment - implementation libs.androidx.appcompat.v120 + implementation libs.androidx.appcompat }