From 69b18343c9997ee78095c9bb7409df317486d1ca Mon Sep 17 00:00:00 2001
From: LaizyBoy <laizyboy@winboll.cc>
Date: Sun, 10 May 2026 05:20:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(libappbase):=20=E5=BC=BA=E5=88=B6Java=207?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为libappbase模块添加compileOptions配置，确保源码和目标字节码均为Java 7
- 修复BackupUtils.java中HashMap<>泛型简写语法，改为完整类型声明new HashMap<String, String>()，兼容Java 7编译器
---
 libappbase/build.gradle                                   | 4 ++++
 .../cc/winboll/studio/libappbase/utils/BackupUtils.java   | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index ba8a8ff..2e7654e 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -18,6 +18,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
 }
 
 dependencies {
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
index 7530abb..dcbe80a 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
@@ -62,11 +62,11 @@ public class BackupUtils {
 
         // 核心修改：入参Map非空且非空集合时，使用入参初始化；否则内部new HashMap()
         this.mDataDirFileMap = (dataDirFileMap != null && !dataDirFileMap.isEmpty()) 
-			? new HashMap<>(dataDirFileMap) // 新建Map避免外部篡改内部数据
-			: new HashMap<>();
+			? new HashMap<String, String>(dataDirFileMap)
+			: new HashMap<String, String>();
         this.mSdcardFileMap = (sdcardFileMap != null && !sdcardFileMap.isEmpty())
-			? new HashMap<>(sdcardFileMap) // 深拷贝，隔离外部引用
-			: new HashMap<>();
+			? new HashMap<String, String>(sdcardFileMap)
+			: new HashMap<String, String>();
 
         LogUtils.d(TAG, "BackupUtils初始化完成 → SFTP服务器：" + ftpAuthModel.getFtpServer() + ":" + ftpAuthModel.getFtpPort() + " | 上传目录：" + mFtpTargetDir);
         LogUtils.d(TAG, "SDCard Map基础根目录：" + (mAppExternalFilesDir == null ? "获取失败" : mAppExternalFilesDir.getAbsolutePath()));