From 5419fad1cfe00aa6c4c5b22315f325b9bf03514d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 25 Mar 2026 19:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=80=9A=E7=94=A8FTP?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BA=94=E7=94=A8=E6=95=B0=E6=8D=AE=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +- .../winboll/studio/appbase/MainActivity.java | 39 +- appbase/src/main/res/layout/activity_main.xml | 12 - libappbase/build.properties | 4 +- .../activities/FTPBackupsActivity.java | 262 ------------ .../dialogs/SFTPBackupsSettingsDialog.java | 372 ------------------ .../main/res/layout/activity_ftp_backups.xml | 30 -- .../layout/dialog_sftp_backup_settings.xml | 163 -------- 8 files changed, 5 insertions(+), 881 deletions(-) delete mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/activities/FTPBackupsActivity.java delete mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/SFTPBackupsSettingsDialog.java delete mode 100644 libappbase/src/main/res/layout/activity_ftp_backups.xml delete mode 100644 libappbase/src/main/res/layout/dialog_sftp_backup_settings.xml diff --git a/appbase/build.properties b/appbase/build.properties index feaaf1c..d93efe1 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 31 13:02:06 GMT 2026 +#Wed Mar 25 11:45:40 GMT 2026 stageCount=12 libraryProject=libappbase baseVersion=15.15 publishVersion=15.15.11 -buildCount=29 +buildCount=35 baseBetaVersion=15.15.12 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index 76f82c9..75a19bd 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -10,16 +10,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toolbar; import cc.winboll.studio.appbase.R; +import cc.winboll.studio.appbase.model.TestBean; import cc.winboll.studio.libappbase.LogActivity; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; -import cc.winboll.studio.libappbase.activities.FTPBackupsActivity; -import cc.winboll.studio.libappbase.dialogs.SFTPBackupsSettingsDialog; -import cc.winboll.studio.libappbase.models.SFTPAuthModel; -import java.util.HashMap; -import android.os.Environment; -import java.io.File; -import cc.winboll.studio.appbase.model.TestBean; /** * @Author ZhanGSKen @@ -164,36 +158,5 @@ public class MainActivity extends Activity { Intent aboutIntent = new Intent(getApplicationContext(), AboutActivity.class); startActivity(aboutIntent); } - - public void onFTPBackupsActivity(View view) { - LogUtils.d(TAG, "onFTPBackupsActivity() 调用"); - SFTPBackupsSettingsDialog dlg = new SFTPBackupsSettingsDialog(this); - SFTPAuthModel authModel = SFTPBackupsSettingsDialog.getSFTPAuthModelFromSP(this); - if (authModel == null) { - dlg.show(); - } else { - // 1. 构建应用Data目录待备份文件Map - HashMap dataFileMap = new HashMap<>(); - // 存入文件:key=唯一标识,value=应用Data目录下的相对路径 - dataFileMap.put(TestBean.class.getName() + ".json", - getTestBeanRelativePath()); - // 构建SDCard目录待备份文件Map(与BackupUtils的SdcardMap泛型一致:String-String) - HashMap sdcardFileMap = new HashMap<>(); - // 存入文件:key=唯一标识,value=应用专属外部文件目录下的相对路径 - sdcardFileMap.put(TestBean.class.getName() + ".json", - getTestBeanRelativePath()); - - // 2. 构建Intent,指定跳转到FTPBackupsActivity - Intent ftpBackupsIntent = new Intent(getApplicationContext(), FTPBackupsActivity.class); - // 3. 序列化传递Map参数(使用FTPBackupsActivity中定义的常量,避免硬编码) - ftpBackupsIntent.putExtra(FTPBackupsActivity.EXTRA_DATA_DIR_FILE_MAP, dataFileMap); - ftpBackupsIntent.putExtra(FTPBackupsActivity.EXTRA_SDCARD_DIR_FILE_MAP, sdcardFileMap); - // 传递FTP上传目标目录参数,路径为/WinBoLLStudio/APPBackups/WinBoLL - ftpBackupsIntent.putExtra(FTPBackupsActivity.EXTRA_FTP_TARGET_DIR, "/WinBoLLStudio/APPBackups/WinBoLL"); - - // 4. 启动Activity,参数自动透传 - startActivity(ftpBackupsIntent); - } - } } diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml index ad407ab..de7b3bf 100644 --- a/appbase/src/main/res/layout/activity_main.xml +++ b/appbase/src/main/res/layout/activity_main.xml @@ -59,18 +59,6 @@ android:onClick="onToastUtilsTest" android:layout_margin="10dp"/> -