添加相册集封面自定义功能

- 新增 AlbumCoverDbHelper 数据库类，存储相册集封面路径 - 相册集浏览窗口长按菜单添加"设置为封面"选项 - 封面图片右下角显示封面图标标识 - 主窗口加载时优先使用设置的封面图片 - 修复 Cursor 在 try-with-resources 中的处理问题
2026-04-26 11:27:41 +08:00
parent 3955de100d
commit 5b0bb599bb
7 changed files with 169 additions and 16 deletions
--- a/gallery/build.properties
+++ b/gallery/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Apr 26 11:00:35 CST 2026
+#Sun Apr 26 11:19:12 CST 2026
 stageCount=5
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.4
-buildCount=5
+buildCount=7
 baseBetaVersion=15.0.5
--- a/gallery/src/main/java/cc/winboll/studio/gallery/AlbumActivity.java
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumActivity.java
@@ -55,6 +55,7 @@ public class AlbumActivity extends AppCompatActivity {
        recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
        adapter = new ImageAdapter();
        adapter.setContext(this);
+        adapter.setAlbumPath(albumPath);
        recyclerView.setAdapter(adapter);
        
        fabScrollTop = findViewById(R.id.fab_scroll_top);
--- a/gallery/src/main/java/cc/winboll/studio/gallery/AlbumCoverDbHelper.java
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumCoverDbHelper.java
@@ -0,0 +1,74 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class AlbumCoverDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "AlbumCoverDbHelper";
+    private static final String DB_NAME = "album_cover.db";
+    private static final int DB_VERSION = 1;
+    private static final String TABLE_NAME = "album_covers";
+    private static final String COLUMN_ALBUM_PATH = "album_path";
+    private static final String COLUMN_IMAGE_PATH = "image_path";
+    
+    private static final String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " (" 
+        + COLUMN_ALBUM_PATH + " TEXT PRIMARY KEY, "
+        + COLUMN_IMAGE_PATH + " TEXT)";
+    
+    private static AlbumCoverDbHelper dbHelper;
+    
+    public static AlbumCoverDbHelper getInstance(Context context) {
+        if (dbHelper == null) {
+            dbHelper = new AlbumCoverDbHelper(context.getApplicationContext());
+        }
+        return dbHelper;
+    }
+    
+    public AlbumCoverDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(SQL_CREATE);
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+    
+    public void setCover(String albumPath, String imagePath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_ALBUM_PATH, albumPath);
+        values.put(COLUMN_IMAGE_PATH, imagePath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+        LogUtils.d(TAG, "setCover: album=" + albumPath + ", image=" + imagePath);
+    }
+    
+    public String getCover(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_IMAGE_PATH}, 
+            COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath}, null, null, null);
+        String coverPath = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                coverPath = cursor.getString(0);
+            }
+            cursor.close();
+        }
+        return coverPath;
+    }
+    
+    public void clearCover(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath});
+        LogUtils.d(TAG, "clearCover: " + albumPath);
+    }
+}
--- a/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java
@@ -24,6 +24,8 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
    private int bgType = 0;
    private Preferences prefs;
    private PinnedImageDbHelper pinnedDbHelper;
+    private AlbumCoverDbHelper coverDbHelper;
+    private String albumPath;
    
    private int getBgRes() {
        switch (bgType) {
@@ -85,6 +87,11 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
        prefs = new Preferences(context);
        bgType = prefs.getBgType();
        pinnedDbHelper = PinnedImageDbHelper.getInstance(context);
+        coverDbHelper = AlbumCoverDbHelper.getInstance(context);
+    }
+    
+    public void setAlbumPath(String albumPath) {
+        this.albumPath = albumPath;
    }
    
    public void refreshBg() {
@@ -107,17 +114,24 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(view.getContext());
        builder.setTitle("Image");
        boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(imagePath);
-        String[] items = isPinned ? new String[]{"取消置顶"} : new String[]{"置顶"};
+        String[] items = isPinned ? new String[]{"取消置顶", "设置为封面"} : new String[]{"置顶", "设置为封面"};
        builder.setItems(items, new android.content.DialogInterface.OnClickListener() {
            @Override
            public void onClick(android.content.DialogInterface dialog, int which) {
-                if (pinnedDbHelper != null && which == 0) {
-                    if (isPinned) {
-                        pinnedDbHelper.unpinImage(imagePath);
-                    } else {
-                        pinnedDbHelper.pinImage(imagePath);
+                if (which == 0) {
+                    if (pinnedDbHelper != null) {
+                        if (isPinned) {
+                            pinnedDbHelper.unpinImage(imagePath);
+                        } else {
+                            pinnedDbHelper.pinImage(imagePath);
+                        }
+                        refreshPinned();
+                    }
+                } else if (which == 1) {
+                    if (coverDbHelper != null && albumPath != null) {
+                        coverDbHelper.setCover(albumPath, imagePath);
+                        notifyDataSetChanged();
                    }
-                    refreshPinned();
                }
            }
        });
@@ -148,6 +162,9 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
        boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(imagePath);
        holder.pinIcon.setVisibility(isPinned ? View.VISIBLE : View.GONE);
        
+        boolean isCover = coverDbHelper != null && albumPath != null && imagePath.equals(coverDbHelper.getCover(albumPath));
+        holder.coverIcon.setVisibility(isCover ? View.VISIBLE : View.GONE);
+        
        holder.itemView.setOnClickListener(new OnClickListener() {
            @Override
            public void onClick(View v) {
@@ -174,10 +191,12 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
    static class ViewHolder extends RecyclerView.ViewHolder {
        ImageView imageView;
        ImageView pinIcon;
+        ImageView coverIcon;
        ViewHolder(View itemView) {
            super(itemView);
            imageView = itemView.findViewById(R.id.image);
            pinIcon = itemView.findViewById(R.id.pin_icon);
+            coverIcon = itemView.findViewById(R.id.cover_icon);
        }
    }
 }
--- a/gallery/src/main/java/cc/winboll/studio/gallery/MainActivity.java
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/MainActivity.java
@@ -159,7 +159,7 @@ public class MainActivity extends AppCompatActivity {
        }
    }

-    private void loadAlbums() {
+private void loadAlbums() {
        LogUtils.d(TAG, "loadAlbums");
        String folderPath = prefs.getFolderPath();
        File baseFolder = new File(folderPath);
@@ -176,6 +176,7 @@ public class MainActivity extends AppCompatActivity {
            }
        }
        
+        AlbumCoverDbHelper coverDbHelper = AlbumCoverDbHelper.getInstance(this);
        ArrayList<Album> albums = new ArrayList<>();
        
        FileFilter directoryFilter = new FileFilter() {
@@ -189,11 +190,26 @@ public class MainActivity extends AppCompatActivity {
        if (subfolders != null) {
            for (File subfolder : subfolders) {
                LogUtils.d(TAG, "scanning folder: " + subfolder.getName());
-                ArrayList<Uri> images = getImagesInFolder(subfolder.getAbsolutePath());
-                if (!images.isEmpty()) {
-                    Uri latestImage = images.get(0);
-                    albums.add(new Album(subfolder.getName(), subfolder.getAbsolutePath(), latestImage, images.size()));
-                    LogUtils.d(TAG, "album added: " + subfolder.getName() + ", " + images.size() + " images");
+                String albumPath = subfolder.getAbsolutePath();
+                String coverPath = coverDbHelper.getCover(albumPath);
+                Uri coverUri = null;
+                if (coverPath != null) {
+                    coverUri = getUriFromPath(coverPath);
+                }
+                if (coverUri == null) {
+                    ArrayList<Uri> images = getImagesInFolder(albumPath);
+                    if (!images.isEmpty()) {
+                        coverUri = images.get(0);
+                    }
+                }
+                ArrayList<Uri> allImages = getImagesInFolder(albumPath);
+                if (coverUri != null || !allImages.isEmpty()) {
+                    if (coverUri == null && !allImages.isEmpty()) {
+                        coverUri = allImages.get(0);
+                    }
+                    int imageCount = allImages.size();
+                    albums.add(new Album(subfolder.getName(), albumPath, coverUri, imageCount));
+                    LogUtils.d(TAG, "album added: " + subfolder.getName() + ", " + imageCount + " images");
                }
            }
        }
@@ -205,7 +221,24 @@ public class MainActivity extends AppCompatActivity {
        adapter.setData(albums);
        LogUtils.d(TAG, "Loaded " + albums.size() + " albums");
    }
-
+    
+    private Uri getUriFromPath(String path) {
+        String[] projection = { MediaStore.Images.Media._ID };
+        String selection = MediaStore.Images.Media.DATA + " = ?";
+        String[] selectionArgs = { path };
+        try (Cursor cursor = getContentResolver().query(
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                projection, selection, selectionArgs, null)) {
+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    long id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID));
+                    return Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, String.valueOf(id));
+                }
+            }
+        }
+        return null;
+    }
+    
    private ArrayList<Uri> getImagesInFolder(String folderPath) {
        ArrayList<Uri> imageUrls = new ArrayList<>();
        ContentResolver contentResolver = getContentResolver();
--- a/gallery/src/main/res/drawable/ic_cover.xml
+++ b/gallery/src/main/res/drawable/ic_cover.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M21,3H3C1.9,3 1,3.9 1,5v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V5C23,3.9 22.1,3 21,3zM21,19H3V5h18V19z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M9,12l2,2l4,-4l1.5,1.5L11,17l-3,-3z"/>
+</vector>
--- a/gallery/src/main/res/layout/item_gallery.xml
+++ b/gallery/src/main/res/layout/item_gallery.xml
@@ -25,4 +25,17 @@
        app:tint="@color/black"
        xmlns:app="http://schemas.android.com/apk/res-auto"/>

+    <ImageView
+        android:id="@+id/cover_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="4dp"
+        android:background="@drawable/bg_circle_white"
+        android:padding="4dp"
+        android:src="@drawable/ic_cover"
+        android:visibility="gone"
+        app:tint="@color/black"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
+
 </FrameLayout>