邀请页图片

app/src/main/AndroidManifest.xml

@@ -97,6 +97,7 @@
         android:label="@string/app_name"
         android:persistent="true"
         android:supportsRtl="true"
+        android:largeHeap="true"
         android:theme="@style/AppTheme">
         <meta-data android:name="design_width_in_dp" android:value="375"/>
         <meta-data android:name="design_height_in_dp" android:value="667"/>

app/src/main/java/com/sheep/gamegroup/helper/CustomRoundAngleImageView.java

@@ -0,0 +1,67 @@
+package com.sheep.gamegroup.helper;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Path;
+import android.os.Build;
+import android.support.v7.widget.AppCompatImageView;
+import android.util.AttributeSet;
+import android.view.View;
+
+/**
+ * created on：2018/9/5 on 21:22
+ * created by: YSL
+ * 描述:把Imageview设置四个radiu为12的圆角
+ */
+public class CustomRoundAngleImageView extends AppCompatImageView {
+    float width, height;
+
+    public CustomRoundAngleImageView(Context context) {
+        this(context, null);
+        init(context, null);
+    }
+
+    public CustomRoundAngleImageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+        init(context, attrs);
+    }
+
+    public CustomRoundAngleImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        if (Build.VERSION.SDK_INT < 18) {
+            setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        width = getWidth();
+        height = getHeight();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (width >= 12 && height > 12) {
+            Path path = new Path();
+            //四个圆角
+            path.moveTo(12, 0);
+            path.lineTo(width - 12, 0);
+            path.quadTo(width, 0, width, 12);
+            path.lineTo(width, height - 12);
+            path.quadTo(width, height, width - 12, height);
+            path.lineTo(12, height);
+            path.quadTo(0, height, 0, height - 12);
+            path.lineTo(0, 12);
+            path.quadTo(0, 0, 12, 0);
+
+            canvas.clipPath(path);
+        }
+        super.onDraw(canvas);
+    }
+
+}

app/src/main/java/com/sheep/gamegroup/helper/DownloadUtil.java

@@ -0,0 +1,137 @@
+package com.sheep.gamegroup.helper;
+
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * Created by free on 2018/9/5.
+ */
+
+public class DownloadUtil {
+
+    private static DownloadUtil downloadUtil;
+    private final OkHttpClient okHttpClient;
+
+    public static DownloadUtil get() {
+        if (downloadUtil == null) {
+            downloadUtil = new DownloadUtil();
+        }
+        return downloadUtil;
+    }
+
+    private DownloadUtil() {
+        okHttpClient = new OkHttpClient();
+    }
+
+    /**
+     * @param url 下载连接
+     * @param saveDir 储存下载文件的SDCard目录
+     * @param listener 下载监听
+     */
+    public void download(final String url, final String saveDir, final OnDownloadListener listener) {
+        Request request = new Request.Builder().url(url).build();
+        okHttpClient.newCall(request).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                // 下载失败
+                listener.onDownloadFailed();
+            }
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                InputStream is = null;
+                byte[] buf = new byte[2048];
+                int len = 0;
+                FileOutputStream fos = null;
+                // 储存下载文件的目录
+                String savePath = isExistDir(saveDir);
+                try {
+                    is = response.body().byteStream();
+                    long total = response.body().contentLength();
+                    File file = new File(savePath, getNameFromUrl(url));
+                    Log.i("aaaa",file.getName());
+                    fos = new FileOutputStream(file);
+                    long sum = 0;
+                    while ((len = is.read(buf)) != -1) {
+                        fos.write(buf, 0, len);
+                        sum += len;
+                        int progress = (int) (sum * 1.0f / total * 100);
+                        // 下载中
+                        listener.onDownloading(progress);
+                    }
+                    fos.flush();
+                    // 下载完成
+                    listener.onDownloadSuccess();
+                } catch (Exception e) {
+                    listener.onDownloadFailed();
+                } finally {
+                    try {
+                        if (is != null)
+                            is.close();
+                    } catch (IOException e) {
+                    }
+                    try {
+                        if (fos != null)
+                            fos.close();
+                    } catch (IOException e) {
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * @param saveDir
+     * @return
+     * @throws IOException
+     * 判断下载目录是否存在
+     */
+    private String isExistDir(String saveDir) throws IOException {
+        // 下载位置
+        File downloadFile = new File(Environment.getExternalStorageDirectory(), saveDir);
+        if (!downloadFile.mkdirs()) {
+            downloadFile.createNewFile();
+        }
+        String savePath = downloadFile.getAbsolutePath();
+        return savePath;
+    }
+
+    /**
+     * @param url
+     * @return
+     * 从下载连接中解析出文件名
+     */
+    @NonNull
+    private String getNameFromUrl(String url) {
+        return url.substring(url.lastIndexOf("/") + 1);
+    }
+
+    public interface OnDownloadListener {
+        /**
+         * 下载成功
+         */
+        void onDownloadSuccess();
+
+        /**
+         * @param progress
+         * 下载进度
+         */
+        void onDownloading(int progress);
+
+        /**
+         * 下载失败
+         */
+        void onDownloadFailed();
+    }
+}

app/src/main/java/com/sheep/gamegroup/helper/ZXingHelper.java

@@ -0,0 +1,99 @@
+package com.sheep.gamegroup.helper;
+
+import android.graphics.Bitmap;
+import android.graphics.Matrix;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+import java.util.Hashtable;
+
+/**
+ * created on：2018/9/5 on 17:46
+ * created by: YSL
+ * 描述:二维码生成
+ */
+public class ZXingHelper {
+    private static int IMAGE_HALFWIDTH = 50;//宽度值，影响中间图片大小
+    /**
+     * 生成带logo的二维码，默认二维码的大小为500，logo为二维码的1/5
+     *
+     * @param text    需要生成二维码的文字、网址等
+     * @param mBitmap logo文件
+     * @return bitmap
+     */
+    public static Bitmap createQRCodeWithLogo(String text, Bitmap mBitmap) {
+        return createQRCodeWithLogo(text, 500, mBitmap);
+    }
+    /**
+     * 生成带logo的二维码，logo默认为二维码的1/5
+     *
+     * @param text    需要生成二维码的文字、网址等
+     * @param size    需要生成二维码的大小（）
+     * @param mBitmap logo文件
+     * @return bitmap
+     */
+    public static Bitmap createQRCodeWithLogo(String text, int size, Bitmap mBitmap) {
+        try {
+            IMAGE_HALFWIDTH = size / 10;
+            Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+            /*
+             * 设置容错级别，默认为ErrorCorrectionLevel.L
+             * 因为中间加入logo所以建议你把容错级别调至H,否则可能会出现识别不了
+             */
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            //设置空白边距的宽度
+            hints.put(EncodeHintType.MARGIN, 1); //default is 4
+            // 图像数据转换，使用了矩阵转换
+            BitMatrix bitMatrix = new QRCodeWriter().encode(text,
+                    BarcodeFormat.QR_CODE, size, size, hints);
+
+            int width = bitMatrix.getWidth();//矩阵高度
+            int height = bitMatrix.getHeight();//矩阵宽度
+            int halfW = width / 2;
+            int halfH = height / 2;
+
+            Matrix m = new Matrix();
+            float sx = (float) 2 * IMAGE_HALFWIDTH / mBitmap.getWidth();
+            float sy = (float) 2 * IMAGE_HALFWIDTH
+                    / mBitmap.getHeight();
+            m.setScale(sx, sy);
+            //设置缩放信息
+            //将logo图片按martix设置的信息缩放
+            mBitmap = Bitmap.createBitmap(mBitmap, 0, 0,
+                    mBitmap.getWidth(), mBitmap.getHeight(), m, false);
+
+            int[] pixels = new int[size * size];
+            for (int y = 0; y < size; y++) {
+                for (int x = 0; x < size; x++) {
+                    if (x > halfW - IMAGE_HALFWIDTH && x < halfW + IMAGE_HALFWIDTH
+                            && y > halfH - IMAGE_HALFWIDTH
+                            && y < halfH + IMAGE_HALFWIDTH) {
+                        //该位置用于存放图片信息
+                        //记录图片每个像素信息
+                        pixels[y * width + x] = mBitmap.getPixel(x - halfW
+                                + IMAGE_HALFWIDTH, y - halfH + IMAGE_HALFWIDTH);
+                    } else {
+                        if (bitMatrix.get(x, y)) {
+                            pixels[y * size + x] = 0xff000000;
+                        } else {
+                            pixels[y * size + x] = 0xffffffff;
+                        }
+                    }
+                }
+            }
+            Bitmap bitmap = Bitmap.createBitmap(size, size,
+                    Bitmap.Config.ARGB_8888);
+            bitmap.setPixels(pixels, 0, size, 0, 0, size, size);
+            return bitmap;
+        } catch (WriterException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/entity/MessageCenterDetailEntity.java

@@ -0,0 +1,143 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * created on：2018/9/5 on 14:07
+ * created by: YSL
+ * 描述:消息中心详情
+ */
+public class MessageCenterDetailEntity {
+
+    /**
+     * Id : 0
+     * abstracts : string
+     * content : string
+     * created_at : 0
+     * is_look : 0
+     * platform : 0
+     * recipient : 0
+     * recipient_invitation_code : string
+     * send_time : 0
+     * send_type : 0
+     * title : string
+     * type : 0
+     * updated_at : 0
+     */
+
+    private int Id;
+    private String abstracts;
+    private String content;
+    private int created_at;
+    private int is_look;
+    private int platform;
+    private int recipient;
+    private String recipient_invitation_code;
+    private int send_time;
+    private int send_type;
+    private String title;
+    private int type;
+    private int updated_at;
+
+    public int getId() {
+        return Id;
+    }
+
+    public void setId(int Id) {
+        this.Id = Id;
+    }
+
+    public String getAbstracts() {
+        return abstracts;
+    }
+
+    public void setAbstracts(String abstracts) {
+        this.abstracts = abstracts;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(int created_at) {
+        this.created_at = created_at;
+    }
+
+    public int getIs_look() {
+        return is_look;
+    }
+
+    public void setIs_look(int is_look) {
+        this.is_look = is_look;
+    }
+
+    public int getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(int platform) {
+        this.platform = platform;
+    }
+
+    public int getRecipient() {
+        return recipient;
+    }
+
+    public void setRecipient(int recipient) {
+        this.recipient = recipient;
+    }
+
+    public String getRecipient_invitation_code() {
+        return recipient_invitation_code;
+    }
+
+    public void setRecipient_invitation_code(String recipient_invitation_code) {
+        this.recipient_invitation_code = recipient_invitation_code;
+    }
+
+    public int getSend_time() {
+        return send_time;
+    }
+
+    public void setSend_time(int send_time) {
+        this.send_time = send_time;
+    }
+
+    public int getSend_type() {
+        return send_type;
+    }
+
+    public void setSend_type(int send_type) {
+        this.send_type = send_type;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getUpdated_at() {
+        return updated_at;
+    }
+
+    public void setUpdated_at(int updated_at) {
+        this.updated_at = updated_at;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/entity/MessageReplyDetailEntity.java

@@ -0,0 +1,123 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * created on：2018/9/5 on 14:26
+ * created by: YSL
+ * 描述:
+ */
+public class MessageReplyDetailEntity {
+
+    /**
+     * user_feedback_id : 41
+     * faq_feedback_id : 0
+     * title : 用户反馈
+     * id : 9
+     * user_contet : 就
+     * created_at : 1536112184
+     * user_create_time : 1536112165
+     * is_look : 1
+     * content : 1111111111111111111111111111
+     * type : 2
+     * user_id : 63033
+     */
+
+    private int user_feedback_id;
+    private int faq_feedback_id;
+    private String title;
+    private int id;
+    private String user_contet;
+    private int created_at;
+    private int user_create_time;
+    private int is_look;
+    private String content;
+    private int type;
+    private int user_id;
+
+    public int getUser_feedback_id() {
+        return user_feedback_id;
+    }
+
+    public void setUser_feedback_id(int user_feedback_id) {
+        this.user_feedback_id = user_feedback_id;
+    }
+
+    public int getFaq_feedback_id() {
+        return faq_feedback_id;
+    }
+
+    public void setFaq_feedback_id(int faq_feedback_id) {
+        this.faq_feedback_id = faq_feedback_id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUser_contet() {
+        return user_contet;
+    }
+
+    public void setUser_contet(String user_contet) {
+        this.user_contet = user_contet;
+    }
+
+    public int getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(int created_at) {
+        this.created_at = created_at;
+    }
+
+    public int getUser_create_time() {
+        return user_create_time;
+    }
+
+    public void setUser_create_time(int user_create_time) {
+        this.user_create_time = user_create_time;
+    }
+
+    public int getIs_look() {
+        return is_look;
+    }
+
+    public void setIs_look(int is_look) {
+        this.is_look = is_look;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(int user_id) {
+        this.user_id = user_id;
+    }
+}

app/src/main/java/com/sheep/gamegroup/view/activity/InvitationActivity.java

@@ -7,6 +7,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -24,8 +25,17 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.kfzs.duanduan.cardview.CardScaleHelper;
+import com.sheep.gamegroup.helper.DownloadUtil;
 import com.sheep.gamegroup.helper.ScalableCardHelper;
+import com.sheep.gamegroup.helper.ZXingHelper;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
@@ -37,6 +47,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -55,6 +66,7 @@ import com.umeng.socialize.media.UMWeb;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Hashtable;
 import java.util.List;
 
 import butterknife.BindView;
@@ -79,6 +91,10 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
     RecyclerView mRecyclerView;
     @BindView(R.id.blurView)
     ImageView mBlurView;
+    @BindView(R.id.img_baseactivity_title)
+    ImageView ivBack;
+    @BindView(R.id.txt_baseactivity_title)
+    TextView tvTitle;
     private List<Integer> mList = new ArrayList<>();
     private CardScaleHelper mCardScaleHelper = null;
     private Runnable mBlurRunnable;
@@ -103,8 +119,9 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
     private List<Bitmap> listBitmap = new ArrayList<>();
     private List<Bitmap> listBitmap1 = new ArrayList<>();
     private List<Bitmap> listBitmap2 = new ArrayList<>();
-    private  MyAdapter adapter;
-
+    private MyAdapter adapter;
+    private int size = 0;
+    private View view = null;
 
     @Override
 
@@ -112,36 +129,29 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_invitation);
         ButterKnife.bind(this);
+        initView();
         initData();
-       // initPicture();
-        cerateAdapter(listBitmap,this);
+        // initPicture();
+        cerateAdapter(listBitmap1, this);
         getPicetureList();
     }
 
-    private void initPicture() {
-        for (int i = 0; i < 10; i++) {
-            mList.add(R.drawable.kaipin);
-            mList.add(R.drawable.kaipin);
-            mList.add(R.drawable.kaipin);
-        }
-
-        // final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false);
-        //   mRecyclerView.setLayoutManager(linearLayoutManager);
-        //mRecyclerView.setAdapter(new CardAdapter(mList));
-        // mRecyclerView绑定scale效果
-        // mCardScaleHelper = new CardScaleHelper();
-        //  mCardScaleHelper.setCurrentItemPos(1);
-        // mCardScaleHelper.attachToRecyclerView(mRecyclerView);
-
-
+    private void initView() {
+        tvTitle.setText("邀请赚钱");
+        ivBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                InvitationActivity.this.finish();
+            }
+        });
     }
 
     /**
-     * @param list         Bitmap集合
+     * @param list    Bitmap集合
      * @param context
      */
-    private void cerateAdapter( List<Bitmap> list, Context context) {
-         adapter = new MyAdapter(context, list);
+    private void cerateAdapter(List<Bitmap> list, Context context) {
+        adapter = new MyAdapter(context, list, listBitmap2);
         LinearLayoutManager layoutManager = new LinearLayoutManager(context);
         layoutManager.setOrientation(OrientationHelper.HORIZONTAL);
         mRecyclerView.setLayoutManager(layoutManager);
@@ -193,8 +203,6 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
                     @Override
                     public void onClick(View view) {
                         if (position == 1 || position == 2) {
-                            mBitmap = getBitmap();
-                            mBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.kaipin);
                             popShare(InvitationActivity.this, url, item, description, mBitmap);
                         } else {
                             popShare(InvitationActivity.this, url, item, description, null);
@@ -206,9 +214,6 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
         ask_share_list.setAdapter(adapter);
     }
 
-    private Bitmap getBitmap() {
-        return null;
-    }
 
     /**
      * 分享 url type 拼接
@@ -352,12 +357,12 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
 
     @Override
     public void onPageSelected(int position) {
+        mBitmap=getViewBitmap(adapter.getView());
         Log.i("aaaa", "当前位置" + position);
     }
 
     /**
      * 来获取邀请图片，
-     *
      */
     private void getPicetureList() {
         ArrayList<PictureInvitationEntity> list = new ArrayList<>();
@@ -371,38 +376,57 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        LogUtil.logI("onNext__getPicetureList--" + new Gson().toJson(baseMessage));
                         mPictureList.addAll(baseMessage.getDataList(PictureInvitationEntity.class));
                         downloadPictures();
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-
+                        LogUtil.logI("onError__getPicetureList--" + new Gson().toJson(baseMessage));
                     }
                 });
     }
 
+    /**
+     * @param url ,,图片地址
+     * @return /storage/emulated/0/sheep/aaa
+     */
+    private String getSavePath(String url) {
+        return Environment.getExternalStorageDirectory() + "/sheep/" + url.substring(url.lastIndexOf("/") + 1);
+    }
     private void downloadPictures() {
         for (int i = 0; i < mPictureList.size(); i++) {
             position = i;
-            GlideImageLoader.downLoadImage("pic" + i, mPictureList.get(i).getPicture(), new Action1<File>() {
+            DownloadUtil.get().download(mPictureList.get(position).getPicture(), "sheep", new DownloadUtil.OnDownloadListener() {
                 @Override
-                public void call(File file) {
-                    if (file == null) {
-                        listBitmap1.add(BitmapFactory.decodeFile(ClassFileHelper.DIR + "pic" + position + ".png"));
+                public void onDownloadSuccess() {
+                    Log.i("aaaa", "下载成功");
+                    if (position == mPictureList.size()-1) {
+                        Log.i("aaaa", "下载成功"+"---"+size+"-----"+mPictureList.size());
+                        createBitmapList(position);
                     }
                 }
-            });
-            GlideImageLoader.downLoadImage("rx" + i, mPictureList.get(i).getLink(), new Action1<File>() {
+
                 @Override
-                public void call(File file) {
-                    if (file == null) {
-                        listBitmap2.add(BitmapFactory.decodeFile(ClassFileHelper.DIR + "rx" + position + ".png"));
+                public void onDownloading(int progress) {
+                }
 
-                    }
+                @Override
+                public void onDownloadFailed() {
+                    Log.i("aaaa", "下载失败");
                 }
             });
         }
+    }
+
+    private void createBitmapList(int y) {
+        for (int i = 0; i < mPictureList.size(); i++) {
+            listBitmap1.add(BitmapFactory.decodeFile(getSavePath(mPictureList.get(i).getPicture())));
+            Bitmap logo = BitmapFactory.decodeResource(getResources(), R.mipmap.sheep_logo);
+            Bitmap bitmapx = ZXingHelper.createQRCodeWithLogo(mPictureList.get(y).getLink(), logo);
+            listBitmap2.add(bitmapx);
+        }
         handler.sendEmptyMessage(1);
     }
 
@@ -411,22 +435,76 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            if (msg.what == 1) {
-                for (int i = 0; i < mPictureFileList.size(); i++) {
-                    if (!listBitmap1.isEmpty() && !listBitmap2.isEmpty()) {
+            switch (msg.what) {
+                case 1:
+                  /*  for (int i = 0; i < size; i++) {
                         listBitmap.add(mergeBitmap(listBitmap1.get(i), listBitmap2.get(i)));
-                    }
-                }
-                adapter.notifyDataSetChanged();
+                    }*/
+                    adapter.notifyDataSetChanged();
+
+                    break;
+                case 2:
+                    break;
+                default:
+
+                    break;
             }
         }
     };
 
+    /**
+     * @param addViewContent
+     * @return
+     */
+    private Bitmap getViewBitmap(View addViewContent) {
+        if (addViewContent==null){
+            return null;
+        }
+        addViewContent.setDrawingCacheEnabled(true);
+        addViewContent.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+        addViewContent.layout(0, 0, addViewContent.getMeasuredWidth(), addViewContent.getMeasuredHeight());
+        addViewContent.buildDrawingCache();
+        Bitmap cacheBitmap = addViewContent.getDrawingCache();
+        Bitmap bitmap = Bitmap.createBitmap(cacheBitmap);
+        return bitmap;
+    }
+
+
+    /**
+     * 合成图片
+     * @param firstBitmap
+     * @param secondBitmap
+     * @return
+     */
     private Bitmap mergeBitmap(Bitmap firstBitmap, Bitmap secondBitmap) {
         Bitmap bitmap = Bitmap.createBitmap(firstBitmap.getWidth(), firstBitmap.getHeight(), firstBitmap.getConfig());
         Canvas canvas = new Canvas(bitmap);
+        float w = firstBitmap.getWidth();
+        float h = firstBitmap.getHeight();
+        Matrix matrix = new Matrix();
+        //确定secondBitmap大小比例
+        matrix.setScale(secondBitmap.getWidth(), h / secondBitmap.getHeight());
         canvas.drawBitmap(firstBitmap, new Matrix(), null);
-        canvas.drawBitmap(secondBitmap, 30, 30, null);
+        canvas.drawBitmap(zoomImage(secondBitmap, 50, 50), 320, 320, null);
+        LogUtil.logI("bitmap----first---" + firstBitmap.getWidth() + "--" + firstBitmap.getHeight());
+        LogUtil.logI("bitmap----secound---" + secondBitmap.getWidth() + "--" + secondBitmap.getHeight());
         return bitmap;
     }
+
+    public static Bitmap zoomImage(Bitmap bgimage, double newWidth, double newHeight) {
+        // 获取这个图片的宽和高
+        float width = bgimage.getWidth();
+        float height = bgimage.getHeight();
+        // 创建操作图片用的matrix对象
+        Matrix matrix = new Matrix();
+        // 计算宽高缩放率
+        float scaleWidth = ((float) newWidth) / width;
+        float scaleHeight = ((float) newHeight) / height;
+        // 缩放图片动作
+        matrix.postScale(scaleWidth, scaleHeight);
+        Bitmap bitmap = Bitmap.createBitmap(bgimage, 0, 0, (int) width,
+                (int) height, matrix, true);
+        return bitmap;
+    }
+
 }

app/src/main/java/com/sheep/gamegroup/view/activity/MessageCenterDetailActivity.java

@@ -8,6 +8,7 @@ import android.widget.TextView;
 
 import com.google.gson.Gson;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageCenterDetailEntity;
 import com.sheep.gamegroup.model.entity.MessageCenterEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.LogUtil;
@@ -40,6 +41,7 @@ public class MessageCenterDetailActivity extends AppCompatActivity{
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_messagesystem);
         ButterKnife.bind(this);
+        tvBaseTitle.setText("消息中心");
         position=getIntent().getIntExtra("position",-1);
         loadData(position+"");
     }
@@ -68,7 +70,7 @@ public class MessageCenterDetailActivity extends AppCompatActivity{
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         LogUtil.logI("消息中心详细内容----"+new Gson().toJson(baseMessage));
-                        MessageCenterEntity entity =baseMessage.getData(MessageCenterEntity.class);
+                        MessageCenterDetailEntity entity =baseMessage.getData(MessageCenterDetailEntity.class);
                         tvContent.setText(entity.getContent());
                         tvTitle.setText(entity.getTitle());
 

app/src/main/java/com/sheep/gamegroup/view/activity/MessageInteractionDetailActivity.java

@@ -12,6 +12,7 @@ import android.widget.TextView;
 
 import com.google.gson.Gson;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageReplyDetailEntity;
 import com.sheep.gamegroup.model.entity.MessageReplyEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.LogUtil;
@@ -39,9 +40,10 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
     TextView tvTitle;
     @BindView(R.id.recycle_view)
     RecyclerView recyclerView;
+    @BindView(R.id.tv_title)
+    TextView title;
     private MessageInteractionAdapter adapter;
-    private List<MessageReplyEntity> mList = new ArrayList<>();
-    private MessageReplyEntity entity=null;
+    private MessageReplyDetailEntity entity;
     private String id="";
 
     @Override
@@ -49,13 +51,8 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_message_interaction);
         ButterKnife.bind(this);
-        tvTitle.setText("回复详情");
-        LinearLayoutManager manager = new LinearLayoutManager(this);
-        manager.setOrientation(OrientationHelper.VERTICAL);
-        recyclerView.setLayoutManager(manager);
-        adapter = new MessageInteractionAdapter(this, mList);
-        recyclerView.setAdapter(adapter);
-        entity = (MessageReplyEntity) getIntent().getSerializableExtra("message");
+        tvTitle.setText("消息互动");
+
         id=getIntent().getIntExtra("position",-1)+"";
         loadData(id + "");
     }
@@ -82,8 +79,15 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         LogUtil.logI("loadData-onNext----"+new Gson().toJson(baseMessage));
-                        mList.addAll(baseMessage.getDataList(MessageReplyEntity.class));
-                        tvTitle.setText(entity.getTitle());
+                        entity=baseMessage.getData(MessageReplyDetailEntity.class);
+                        title.setText(entity.getTitle());
+                        LogUtil.logI("loadData-onNext---entity---"+new Gson().toJson(entity));
+                        adapter = new MessageInteractionAdapter(MessageInteractionDetailActivity.this, entity);
+                        LinearLayoutManager manager = new LinearLayoutManager(MessageInteractionDetailActivity.this);
+                        manager.setOrientation(OrientationHelper.VERTICAL);
+                        recyclerView.setLayoutManager(manager);
+                        recyclerView.setAdapter(adapter);
+
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/MessagesActivity.java

@@ -92,7 +92,7 @@ public class MessagesActivity extends AppCompatActivity {
         });
         viewPager.setAdapter(new MessageAdapter(getSupportFragmentManager(), this));
         tabLayout.setupWithViewPager(viewPager);
-        //返回
+
         findViewById(R.id.iv_back).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/java/com/sheep/gamegroup/view/adapter/MessageInteractionAdapter.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -10,8 +11,14 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.gson.Gson;
+import com.sheep.gamegroup.model.entity.MessageReplyDetailEntity;
 import com.sheep.gamegroup.model.entity.MessageReplyEntity;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -24,11 +31,12 @@ import java.util.List;
  */
 public class MessageInteractionAdapter extends RecyclerView.Adapter<MessageInteractionAdapter.MyHolder> {
     private Context mContext;
-    private List<MessageReplyEntity> mList;
+    private MessageReplyDetailEntity entity;
+    private UserEntity userEntity = DataUtil.getInstance().getUserEntity();
 
-    public MessageInteractionAdapter(Context mContext, List<MessageReplyEntity> mList) {
+    public MessageInteractionAdapter(Context mContext, MessageReplyDetailEntity entity) {
         this.mContext = mContext;
-        this.mList = mList;
+        this.entity = entity;
     }
 
     @NonNull
@@ -41,16 +49,19 @@ public class MessageInteractionAdapter extends RecyclerView.Adapter<MessageInter
 
     @Override
     public void onBindViewHolder(@NonNull MyHolder viewHolder, int i) {
-            GlideImageLoader.centerImage(viewHolder.ivIcon, "");
-            viewHolder.tvPeople.setText(mList.get(i).getType()==1?"官方回复":"我");
-            viewHolder.tvTime.setText(""+ TimeUtil.TimeStamp2Date(mList.get(i).getCreated_at(), "yyyy-MM-dd HH:mm"));
-            viewHolder.tvContent.setText(mList.get(i).getContent());
+
+        GlideImageLoader.setAvatar(viewHolder.ivIcon, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
+        viewHolder.tvPeople.setText(entity.getType() == 1 ? "官方回复" : "我");
+        viewHolder.tvTime.setText("" + TimeUtil.TimeStamp2Date(entity.getUser_create_time(), "yyyy-MM-dd HH:mm"));
+        viewHolder.tvContent.setText(entity.getUser_contet());
+
 
     }
 
     @Override
     public int getItemCount() {
-        return mList == null ? 0 : mList.size();
+        LogUtil.logI("size------"+(entity == null ? 0 : 1));
+        return entity == null ? 0 : 1;
     }
 
     class MyHolder extends RecyclerView.ViewHolder {

app/src/main/java/com/sheep/gamegroup/view/adapter/MessageLeftAdapter.java

@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.sheep.gamegroup.model.entity.MessageCenterEntity;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
 
@@ -50,13 +51,13 @@ public class MessageLeftAdapter extends RecyclerView.Adapter<MessageLeftAdapter.
     }
 
     @Override
-    public void onBindViewHolder(@NonNull Myholder viewHolder, int i) {
+    public void onBindViewHolder(@NonNull Myholder viewHolder, final int i) {
         if (i == mList.size() - 1) {
             viewHolder.viewLine.setVisibility(View.GONE);//最后一条数据隐藏线条
         }
         //  GlideImageLoader.centerImage(viewHolder.ivIcon, "");
         viewHolder.tvTitle.setText(mList.get(i).getTitle() + "");
-        viewHolder.tvTime.setText(mList.get(i).getCreated_at() + "");
+        viewHolder.tvTime.setText(TimeUtil.TimeStamp2Date(mList.get(i).getCreated_at(), "yyyy-MM-dd HH:mm"));
         viewHolder.tvContent.setText(mList.get(i).getContent() + "");
         if (mList.get(i).getIs_look()==1){
             viewHolder.ivIcon.setImageResource(R.mipmap.icon_unread);//已读
@@ -67,7 +68,7 @@ public class MessageLeftAdapter extends RecyclerView.Adapter<MessageLeftAdapter.
         viewHolder.itemLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                itemClick.itemClick(position);
+                itemClick.itemClick(mList.get(i).getId());
             }
         });
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/MessageRightAdapter.java

@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.model.entity.MessageReplyEntity;
+import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
@@ -46,14 +47,14 @@ public class MessageRightAdapter extends RecyclerView.Adapter<MessageRightAdapte
     }
 
     @Override
-    public void onBindViewHolder(@NonNull MyHolder viewHolder, int i) {
+    public void onBindViewHolder(@NonNull MyHolder viewHolder, final int i) {
         if (i == mList.size() - 1) {
             viewHolder.viewLine.setVisibility(View.GONE);//最后一条数据隐藏线条
         }
         //GlideImageLoader.centerImage(viewHolder.ivIcon, "");
         viewHolder.ivIcon.setImageResource(R.mipmap.message_unread);
         viewHolder.tvTitle.setText(mList.get(i).getTitle()+"");
-        viewHolder.tvTime.setText(mList.get(i).getCreated_at()+"");
+        viewHolder.tvTime.setText(TimeUtil.TimeStamp2Date(mList.get(i).getCreated_at(), "yyyy-MM-dd HH:mm"));
         viewHolder.tvContent.setText(mList.get(i).getContent());
         if (mList.get(i).getIs_look()==1){
             viewHolder.ivIcon.setImageResource(R.mipmap.icon_unread);//已读
@@ -64,7 +65,7 @@ public class MessageRightAdapter extends RecyclerView.Adapter<MessageRightAdapte
         viewHolder.itemLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                itemClick.itemClick(mList.get(position),position);
+                itemClick.itemClick(mList.get(i).getId());
             }
         });
     }
@@ -98,8 +99,8 @@ public class MessageRightAdapter extends RecyclerView.Adapter<MessageRightAdapte
      */
     public interface ItemOnClickListener {
         /**
-         * @param entity
+         * @param position
          */
-        void itemClick(MessageReplyEntity entity,int position);
+        void itemClick(int position);
     }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/MyAdapter.java

@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -21,10 +22,13 @@ import java.util.List;
 public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyHolder> {
     private Context mContext;
     private List<Bitmap> mList;
+    private List<Bitmap> list;
+    private View view;
 
-    public MyAdapter(Context mContext, List<Bitmap> mList) {
+    public MyAdapter(Context mContext, List<Bitmap> mList, List<Bitmap> list) {
         this.mContext = mContext;
         this.mList = mList;
+        this.list = list;
     }
 
     @NonNull
@@ -39,8 +43,12 @@ public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyHolder> {
         //   holder.imageView.setImageResource(ress[position]);
 
         // holder.imageView.setImageBitmap(mergeBitmap(bitmap1, bitmap2));
-
+        if (mList.size() == 0 || list.size() == 0) {
+            return;
+        }
         holder.imageView.setImageBitmap(mList.get(position));
+        holder.iv_er.setImageBitmap(list.get(position));
+        setView(holder.relativeLayout);
 
     }
 
@@ -49,14 +57,25 @@ public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyHolder> {
         return mList == null ? 0 : mList.size();
     }
 
+    public View getView() {
+        return view;
+    }
+
+    private void setView(RelativeLayout relativeLayout) {
+        this.view = relativeLayout;
+    }
 
     class MyHolder extends RecyclerView.ViewHolder {
 
-        ImageView imageView;
+        com.sheep.gamegroup.helper.CustomRoundAngleImageView imageView;
+        ImageView iv_er;
+        RelativeLayout relativeLayout;
 
         public MyHolder(View itemView) {
             super(itemView);
             imageView = itemView.findViewById(R.id.image);
+            iv_er = itemView.findViewById(R.id.iv_er);
+            relativeLayout = itemView.findViewById(R.id.layout_view);
         }
     }
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/MessageCenterFragment.java

@@ -126,11 +126,11 @@ public class MessageCenterFragment extends Fragment implements MessageLeftAdapte
                     public void onNext(BaseMessage baseMessage) {
                         mList.addAll(baseMessage.getDataList(MessageCenterEntity.class));
                         if (mList.isEmpty()) {
-                            EventBus.getDefault().post("right_read");
+                            EventBus.getDefault().post("left_read");
                             emptyView.setVisibility(View.VISIBLE);
                             recyclerView.setVisibility(View.GONE);
                         } else {
-                            EventBus.getDefault().post("right_unread");
+                            EventBus.getDefault().post("left_unread");
                             emptyView.setVisibility(View.GONE);
                             recyclerView.setVisibility(View.VISIBLE);
                         }
@@ -161,11 +161,11 @@ public class MessageCenterFragment extends Fragment implements MessageLeftAdapte
                     public void onNext(BaseMessage baseMessage) {
                         if (!mList.isEmpty()) {
                             mList.clear();
-                            EventBus.getDefault().post("right_unread");
+                            EventBus.getDefault().post("left_unread");
                         }
                         mList.addAll(baseMessage.getDataList(MessageCenterEntity.class));
                         if (mList.isEmpty()) {
-                            EventBus.getDefault().post("right_read");
+                            EventBus.getDefault().post("left_read");
                             emptyView.setVisibility(View.VISIBLE);
                             recyclerView.setVisibility(View.GONE);
                         } else {

app/src/main/java/com/sheep/gamegroup/view/fragment/MessageReplyFragment.java

@@ -47,7 +47,7 @@ public class MessageReplyFragment extends Fragment implements MessageRightAdapte
     private Context mContext;
     private XRecyclerView recyclerView;
     private MessageRightAdapter adapter;
-    private List<MessageReplyEntity> mList=new ArrayList<>();
+    private List<MessageReplyEntity> mList = new ArrayList<>();
     private View emptyView;
     private int per_page;
     private int page;
@@ -75,7 +75,7 @@ public class MessageReplyFragment extends Fragment implements MessageRightAdapte
         recyclerView.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
             public void onRefresh() {
-                refreshData(1,20);
+                refreshData(1, 20);
             }
 
             @Override
@@ -101,7 +101,7 @@ public class MessageReplyFragment extends Fragment implements MessageRightAdapte
     /**
      * 刷新
      */
-    private void refreshData(int page,int per_page) {
+    private void refreshData(int page, int per_page) {
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()
@@ -112,13 +112,13 @@ public class MessageReplyFragment extends Fragment implements MessageRightAdapte
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         LogUtil.logI("返回格式---" + new Gson().toJson(baseMessage));
-                        if (!mList.isEmpty()){
-                            EventBus.getDefault().post("left_unread");
+                        if (!mList.isEmpty()) {
+                            EventBus.getDefault().post("right_unread");
                             mList.clear();
                             mList.addAll(baseMessage.getDataList(MessageReplyEntity.class));
                         }
                         if (mList.isEmpty()) {
-                            EventBus.getDefault().post("left_read");
+                            EventBus.getDefault().post("right_read");
                             emptyView.setVisibility(View.VISIBLE);
                             recyclerView.setVisibility(View.GONE);
                         } else {
@@ -162,13 +162,13 @@ public class MessageReplyFragment extends Fragment implements MessageRightAdapte
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         LogUtil.logI("返回格式---" + new Gson().toJson(baseMessage));
-                            mList.addAll(baseMessage.getDataList(MessageReplyEntity.class));
+                        mList.addAll(baseMessage.getDataList(MessageReplyEntity.class));
                         if (mList.isEmpty()) {
                             emptyView.setVisibility(View.VISIBLE);
                             recyclerView.setVisibility(View.GONE);
-                            EventBus.getDefault().post("left_read");
+                            EventBus.getDefault().post("right_read");
                         } else {
-                            EventBus.getDefault().post("left_unread");
+                            EventBus.getDefault().post("right_unread");
                             emptyView.setVisibility(View.GONE);
                             recyclerView.setVisibility(View.VISIBLE);
                         }
@@ -185,13 +185,12 @@ public class MessageReplyFragment extends Fragment implements MessageRightAdapte
     }
 
     @Override
-    public void itemClick(MessageReplyEntity entity,int position) {
-        refreshData(1,20);
+    public void itemClick(int position) {
+        refreshData(1, 20);
         if (getActivity() != null) {
-            Intent intent=new Intent(getActivity(), MessageInteractionDetailActivity.class);
-            intent.putExtra("message",entity);
-            intent.putExtra("position",position);
-            LogUtil.logI("loadData-----id---post--"+position);
+            Intent intent = new Intent(getActivity(), MessageInteractionDetailActivity.class);
+            intent.putExtra("position", position);
+            LogUtil.logI("loadData-----id---post--" + position);
             startActivity(new Intent(intent));
         }
     }

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

@@ -65,7 +65,7 @@
             android:layout_below="@+id/ask_share_title"
             android:layout_marginStart="@dimen/content_padding_15"
             android:layout_marginTop="20dp"
-            android:layout_marginBottom="35dp"/>
+            android:layout_marginBottom="15dp"/>
     </RelativeLayout>
 
     <include

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

@@ -12,7 +12,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="10dp"
-        android:text="xxxx任务上线"
         android:textColor="#ff333333"
         android:textSize="18sp" />
 
@@ -23,7 +22,6 @@
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="15dp"
-        android:text="xx任务上线，限量1000分，任务奖励1元，赶紧去领取吧~!xx任务上线，限量1000分，任务奖励1元，赶紧去领取吧~!"
         android:textColor="#ff666666"
         android:textSize="13sp" />
 </LinearLayout>

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

@@ -16,6 +16,7 @@
             android:gravity="center_vertical"
             android:textColor="#ff666666"
             android:textSize="15sp"
+            android:textStyle="bold"
             android:text="消息中心" />
 
         <ImageView

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

@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="240dp"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="350dp"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="240dp"
-        android:scaleType="centerCrop"
-        android:layout_centerInParent="true"
-        android:layout_height="match_parent" />
+    <RelativeLayout
+        android:id="@+id/layout_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.sheep.gamegroup.helper.CustomRoundAngleImageView
+            android:id="@+id/image"
+            android:layout_width="350dp"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="20dp"
+            android:layout_marginTop="20dp"
+            android:scaleType="centerCrop" />
+
+        <ImageView
+            android:id="@+id/iv_er"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="60dp"
+            android:src="@mipmap/sheep_logo" />
+    </RelativeLayout>
 </RelativeLayout>