Auto stash before merge of "master" and "origin/master"

@@ -35,6 +35,10 @@ public class StudyTimeXrcAdapter extends RecyclerView.Adapter<StudyTimeXrcAdapte
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(context).inflate(R.layout.rc_read_time, null);
         ViewHolder holder = new ViewHolder(view);
+        ViewGroup.LayoutParams params = holder.longView.getLayoutParams();
+        params.height=600;
+        holder.longView.setLayoutParams(params);
+
         return holder;
     }
 

@@ -5,6 +5,7 @@
     <!--android:layout_below="@+id/tv_title"-->
     <ImageView
         android:id="@+id/img_one"
+         
         android:layout_width="@dimen/dp_21"
         android:layout_height="@dimen/dp_21"
         android:layout_marginLeft="@dimen/dp_50"