Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

# Conflicts:
#	app/src/main/res/layout/fgt_personalcenter_layout.xml

app/src/main/java/com/kfzs/duanduan/fragment/FgtRouser.java

@@ -137,12 +137,17 @@ public class FgtRouser extends BaseCompatFragment {
                 time_tv.setText(item.getContent()+"");
                 if (!TextUtils.isEmpty(item.getImg())) {
                     final String[] images = item.getImg().split(";");
-                    final String[] images1 = new String[3];
+                    String[] images1 = new String[3];
                     if(images.length > 1){
                         if(images.length > 3){
                             for(int i=0;i<3;i++){
                                 images1[i] = images[i];
                             }
+                        }else {
+                            images1 = new String[images.length];
+                            for(int i=0;i<images.length;i++){
+                                images1[i] = images[i];
+                            }
                         }
                         one_img_iv.setVisibility(View.GONE);
                         home_list_gridview_gv.setVisibility(View.VISIBLE);
@@ -157,12 +162,13 @@ public class FgtRouser extends BaseCompatFragment {
                                 return true;
                             }
                         });
+                        final String[] finalImages = images1;
                         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                             @Override
                             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                                 try{
                                     PhotoPreview.builder()
-                                            .setPhotos( new ArrayList<>(Arrays.asList(images1)))
+                                            .setPhotos(new ArrayList<>(Arrays.asList(finalImages)))
                                             .setCurrentItem(position)
                                             .setShowDeleteButton(false)
                                             .start( activity, 101);
@@ -181,7 +187,7 @@ public class FgtRouser extends BaseCompatFragment {
                             public void onClick(View v) {
                                 try{
                                     PhotoPreview.builder()
-                                            .setPhotos( new ArrayList<>(Arrays.asList(images)))
+                                            .setPhotos(new ArrayList<>(Arrays.asList(images)))
                                             .setCurrentItem(holder.getAdapterPosition())
                                             .setShowDeleteButton(false)
                                             .start( activity, 101);

app/src/main/res/layout/fgt_personalcenter_layout.xml

@@ -2,13 +2,13 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_gray"
     android:scrollbars="none">
 
     <LinearLayout
         android:id="@+id/root_4"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/bg_gray"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_marginTop="24dp">