库引用调整

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'

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'

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;
     }
 

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;
     }
 

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -219,8 +219,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         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")
 
 
             //公司内网215管理员
@@ -293,6 +293,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            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<ActivityLoginBinding>() {
                         if (userInfo.statusMsg == "success") {
                             showLog("--------userHeadUrl----------")
                             showLog(userInfo.userHeadUrl)
+                            showLog("--------token----------")
                             showLog(userInfo.token)
 
                             //登录成功

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("-----token------",mActivity);
-//            showLog(new Gson().toJson(request.headers()));
+            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()));
         }

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<String> 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<String>() {
 

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
 }

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
 }

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" }

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'

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'

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

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'

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'

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
 }