|
|
@@ -1,17 +1,12 @@
|
|
|
package com.usai.redant.raimage.PhotoList;
|
|
|
|
|
|
-import android.content.Context;
|
|
|
+
|
|
|
import android.content.Intent;
|
|
|
import android.graphics.Bitmap;
|
|
|
import android.graphics.BitmapFactory;
|
|
|
import android.support.v7.app.ActionBar;
|
|
|
import android.support.v7.app.AppCompatActivity;
|
|
|
import android.os.Bundle;
|
|
|
-import android.support.v7.widget.DefaultItemAnimator;
|
|
|
-import android.support.v7.widget.GridLayoutManager;
|
|
|
-import android.support.v7.widget.RecyclerView;
|
|
|
-import android.util.AttributeSet;
|
|
|
-import android.util.Log;
|
|
|
import android.view.LayoutInflater;
|
|
|
import android.view.MenuItem;
|
|
|
import android.view.View;
|
|
|
@@ -22,12 +17,7 @@ import android.widget.Button;
|
|
|
import android.widget.GridView;
|
|
|
import android.widget.ImageButton;
|
|
|
import android.widget.ImageView;
|
|
|
-import android.widget.RelativeLayout;
|
|
|
-import android.widget.SimpleAdapter;
|
|
|
-import android.widget.Toast;
|
|
|
-
|
|
|
import com.usai.redant.raimage.R;
|
|
|
-
|
|
|
import java.io.File;
|
|
|
import java.io.Serializable;
|
|
|
import java.util.ArrayList;
|
|
|
@@ -41,6 +31,10 @@ public class PhotoGridActivity extends AppCompatActivity {
|
|
|
private Button deleteBtn;
|
|
|
private ArrayList<HashMap<String,String>> photoDic;
|
|
|
|
|
|
+ private static int land_col = 5;
|
|
|
+ private static int portrait_col = 3;
|
|
|
+ private int col;
|
|
|
+
|
|
|
@Override
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
|
super.onCreate(savedInstanceState);
|
|
|
@@ -87,6 +81,13 @@ public class PhotoGridActivity extends AppCompatActivity {
|
|
|
int w = getWindowManager().getDefaultDisplay().getWidth();
|
|
|
|
|
|
|
|
|
+ if (w > h) {
|
|
|
+ col = land_col;
|
|
|
+ } else {
|
|
|
+ col = portrait_col;
|
|
|
+ }
|
|
|
+ gridView.setNumColumns(col);
|
|
|
+
|
|
|
|
|
|
// 设置Adapter
|
|
|
gridView.setAdapter(adapter = new GridViewAdapter());
|
|
|
@@ -205,7 +206,7 @@ public class PhotoGridActivity extends AppCompatActivity {
|
|
|
String path = item.get("path");
|
|
|
|
|
|
|
|
|
- Bitmap bitmap = scaleImage(path,200,200);
|
|
|
+ Bitmap bitmap = scaleImage(path,500,500);
|
|
|
|
|
|
holder.photoView.setImageBitmap(bitmap);
|
|
|
|
|
|
@@ -244,7 +245,7 @@ public class PhotoGridActivity extends AppCompatActivity {
|
|
|
|
|
|
|
|
|
/**解决Item被拉伸压缩*/
|
|
|
- int itemWidth = (int)(getResources().getDisplayMetrics().widthPixels - 4 * 10) / 3;
|
|
|
+ int itemWidth = (int)(getResources().getDisplayMetrics().widthPixels - (col + 1) * 10) / col;
|
|
|
int itemHeight = itemWidth;
|
|
|
|
|
|
AbsListView.LayoutParams param = (AbsListView.LayoutParams) cell.getLayoutParams();
|