android studio 升级到 2024.2.2

androidpdfviewer/build.gradle

@@ -11,6 +11,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-compat:28.0.0'
-    api 'com.github.barteksc:pdfium-android:1.9.0'
+    implementation libs.support.compat
+    api libs.pdfium.android
 }

androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Jan 09 15:41:33 CST 2025
+#Thu Jan 16 15:52:30 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

androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Jan 09 15:41:33 CST 2025
+#Thu Jan 16 15:53:13 CST 2025
 com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_bottom.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_bottom.xml
 com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_left.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_left.xml
 com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_right.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_right.xml

androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Jan 09 15:41:36 CST 2025
+#Thu Jan 16 15:52:30 CST 2025

androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Jan 09 15:41:36 CST 2025
+#Thu Jan 16 15:53:14 CST 2025

app/build.gradle

@@ -1,8 +1,10 @@
+
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
 }
 
+
 android {
     namespace 'com.rehome.zhdcoa'
     compileSdk 35
@@ -43,7 +45,6 @@ android {
                 abortOnError false
             }
             minifyEnabled false //开启代码混淆，防止反编译查看源代码
-            zipAlignEnabled true // 对齐zip
             debuggable false // 是否debug
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             //修改生成的apk名字
@@ -62,8 +63,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 
@@ -75,10 +76,18 @@ dependencies {
     implementation files('libs/MiPush_SDK_Client_3_4_3.jar')
     implementation files('libs/badgeview.jar')
     implementation files('libs/TbsFileSdk_base_arm64_release_1.0.5.6000030.20231109143447.aar')
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+//    implementation 'androidx.appcompat:appcompat:1.6.1'
+//    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
 
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    implementation libs.androidx.activity
+    implementation libs.androidx.constraintlayout
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 
 
 
@@ -144,7 +153,7 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
     implementation 'com.github.huangyanbin:SmartTable:2.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+//    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.github.xuexiangjys:XUI:1.1.5'
@@ -160,10 +169,10 @@ dependencies {
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
     implementation files('../libs/poi-3.9-20121203.jar')
     implementation files('../libs/poi-scratchpad-3.9-20121203.jar')
-    implementation 'androidx.activity:activity:1.8.0'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+//    implementation 'androidx.activity:activity:1.8.0'
+//    testImplementation 'junit:junit:4.13.1'
+//    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     //第三方库图片选择器
     // PictureSelector basic (Necessary)
     implementation 'io.github.lucksiege:pictureselector:v3.10.7'

app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhxcDetaliFragment.java

@@ -26,8 +26,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
-
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.Ajhxcjs;
 import com.rehome.zhdcoa.DBModel.Ajhxzrwqy;

app/src/main/java/com/rehome/zhdcoa/ui/activity/JsFragment.java

@@ -24,9 +24,7 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.rehome.zhdcoa.App;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.Qy;
 import com.rehome.zhdcoa.DBModel.XwaqgcJh;

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

@@ -170,8 +170,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         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管理员
 //            binding.etUsername.setText("ZHPS_Admin")

app/src/main/java/com/rehome/zhdcoa/ui/activity/TmdyActivity.java

@@ -31,7 +31,6 @@ import androidx.core.content.FileProvider;
 
 import com.orhanobut.logger.Logger;
 import com.rehome.zhdcoa.App;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.R;
 import com.rehome.zhdcoa.adapter.TmdyAdapter;

app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java

@@ -85,7 +85,6 @@ import com.luck.picture.lib.utils.SandboxTransformUtils;
 import com.luck.picture.lib.utils.StyleUtils;
 import com.luck.picture.lib.utils.ToastUtils;
 import com.luck.picture.lib.widget.MediumBoldTextView;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.Listener.GlideEngine;
 import com.rehome.zhdcoa.Listener.ImageLoaderUtils;

app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java

@@ -98,7 +98,6 @@ import com.luck.picture.lib.utils.SandboxTransformUtils;
 import com.luck.picture.lib.utils.StyleUtils;
 import com.luck.picture.lib.utils.ToastUtils;
 import com.luck.picture.lib.widget.MediumBoldTextView;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.Listener.GlideEngine;
 import com.rehome.zhdcoa.Listener.ImageLoaderUtils;

app/src/main/java/com/rehome/zhdcoa/ui/activity/XcjsFragment.java

@@ -21,9 +21,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-
 import com.rehome.zhdcoa.App;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.XcjsInfo;
 import com.rehome.zhdcoa.DBModel.XfDjjhRwqy;

app/src/main/java/com/rehome/zhdcoa/ui/activity/XlyxcDetaliActivity.java

@@ -24,21 +24,15 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
-
 import com.rehome.zhdcoa.App;
-;
-import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.LyXcjsInfo;
 import com.rehome.zhdcoa.DBModel.LyxcXm;
 import com.rehome.zhdcoa.DBModel.LyxcXmJg;
 import com.rehome.zhdcoa.DBModel.Lyxcrwqy;
 import com.rehome.zhdcoa.R;
 import com.rehome.zhdcoa.base.BaseActivity2;
-import com.rehome.zhdcoa.utils.SPUtils;
 import com.rehome.zhdcoa.utils.UiUtlis;
-
 import org.litepal.crud.DataSupport;
-
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

app/src/main/java/com/rehome/zhdcoa/ui/activity/XwaqgcxgJsFragment.java

@@ -23,7 +23,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.Qy;
 import com.rehome.zhdcoa.DBModel.XwaqgcJh;

app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java

@@ -13,7 +13,6 @@ import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 
 import com.rehome.zhdcoa.App;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.Ajhjh;
 import com.rehome.zhdcoa.DBModel.AjhjhxzrwList;

app/src/main/java/com/rehome/zhdcoa/ui/activity/YhpcFragment.java

@@ -22,7 +22,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import com.orhanobut.logger.Logger;
 import com.rehome.zhdcoa.App;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.Ajhxzrwqy;
 import com.rehome.zhdcoa.DBModel.YhpcInfo;

app/src/main/java/com/rehome/zhdcoa/ui/activity/YhpclrActivity.java

@@ -25,7 +25,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.orhanobut.logger.Logger;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.DBModel.Qy;
 import com.rehome.zhdcoa.DBModel.YhpcInfo;

app/src/main/java/com/rehome/zhdcoa/ui/activity/YsAndPzFragment.java

@@ -27,7 +27,6 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import com.orhanobut.logger.Logger;
 import com.rehome.zhdcoa.App;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.R;
 import com.rehome.zhdcoa.adapter.CommonAdapter;

app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxcjsFragment.java

@@ -20,7 +20,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-;
 import com.rehome.zhdcoa.App;
 import com.rehome.zhdcoa.R;
 import com.rehome.zhdcoa.base.BaseFragment;

app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java

@@ -46,7 +46,6 @@ import com.luck.picture.lib.entity.LocalMedia;
 import com.luck.picture.lib.interfaces.OnKeyValueResultCallbackListener;
 import com.luck.picture.lib.interfaces.OnResultCallbackListener;
 import com.rehome.zhdcoa.App;
-;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.Listener.GlideEngine;
 import com.rehome.zhdcoa.R;

autolayout/build.gradle

@@ -11,5 +11,5 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation libs.androidx.appcompat.v170
 }