Parcourir la source

消息对接口,

yuanshenglan il y a 7 ans
Parent
commit
2015776cf4
24 fichiers modifiés avec 927 ajouts et 100 suppressions
  1. 3 1
      app/src/main/AndroidManifest.xml
  2. 2 2
      app/src/main/java/com/kfzs/duanduan/fragment/FgtFindChild.java
  3. 40 25
      app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
  4. 0 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  5. 58 14
      app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java
  6. 146 0
      app/src/main/java/com/sheep/gamegroup/model/entity/MessageCenterEntity.java
  7. 126 0
      app/src/main/java/com/sheep/gamegroup/model/entity/MessageReplyEntity.java
  8. 23 0
      app/src/main/java/com/sheep/gamegroup/model/entity/MessageUnReadEntity.java
  9. 87 0
      app/src/main/java/com/sheep/gamegroup/view/activity/MessageCenterDetailActivity.java
  10. 32 0
      app/src/main/java/com/sheep/gamegroup/view/activity/MessageReplyDetailActivity.java
  11. 2 2
      app/src/main/java/com/sheep/gamegroup/view/activity/ActivityMessages.java
  12. 1 7
      app/src/main/java/com/sheep/gamegroup/view/adapter/MessageInteractionAdapter.java
  13. 21 20
      app/src/main/java/com/sheep/gamegroup/view/adapter/MessageLeftAdapter.java
  14. 101 0
      app/src/main/java/com/sheep/gamegroup/view/adapter/MessageRightAdapter.java
  15. 134 12
      app/src/main/java/com/sheep/gamegroup/view/fragment/MessageCenterFragment.java
  16. 130 8
      app/src/main/java/com/sheep/gamegroup/view/fragment/MessageReplyFragment.java
  17. 1 2
      app/src/main/res/layout/activity_messagesystem.xml
  18. 2 1
      app/src/main/res/layout/adapter_message_left_fragment.xml
  19. 2 4
      app/src/main/res/layout/fgt_personacenter_item_top.xml
  20. 10 0
      app/src/main/res/layout/fragment_message_reply.xml
  21. 6 1
      app/src/main/res/layout/fragment_messagecenter.xml
  22. BIN
      app/src/main/res/mipmap-xxhdpi/message_read_icon.png
  23. BIN
      app/src/main/res/mipmap-xxhdpi/message_unread.png
  24. BIN
      app/src/main/res/mipmap-xxhdpi/message_unread_icon.png

+ 3 - 1
app/src/main/AndroidManifest.xml

@@ -576,7 +576,7 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActSetting"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.ActivityMessages"
+        <activity android:name="com.sheep.gamegroup.view.activity.MessagesActivity"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActGameCenter"
             android:screenOrientation="portrait"/>
@@ -590,6 +590,8 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity"
             android:exported="true"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.MessageCenterDetailActivity"
+            android:exported="true"/>
 
         <!--start幂动科技-->
 

+ 2 - 2
app/src/main/java/com/kfzs/duanduan/fragment/FgtFindChild.java

@@ -326,8 +326,8 @@ public class FgtFindChild extends BaseCompatFragment {
                     }
 
                     @Override
-                    public void onError(BaseMessage baseMessage) {
-                        notifyDataSetChanged();
+                    public void onError(BaseMessage baseMessage){
+                            notifyDataSetChanged();
                     }
                 });
     }

+ 40 - 25
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -15,17 +15,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.utils.ApkUtils;
-import com.sheep.gamegroup.model.api.RedPackageMoney;
 import com.sheep.gamegroup.model.entity.AgentEntity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.MessageReplyEntity;
+import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -36,7 +34,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActivityMessages;
+import com.sheep.gamegroup.view.activity.MessagesActivity;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.gamegroup.view.dialog.DialogShare;
 import com.sheep.jiuyan.samllsheep.R;
@@ -44,7 +42,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.afinal.simplecache.ACache;
-import org.afinal.simplecache.ApiKey;
 
 import java.util.Locale;
 
@@ -61,7 +58,6 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FAQ;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
 import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
-import static com.sheep.gamegroup.util.ViewUtil.measureHeight;
 
 /**
  * 个人中心
@@ -87,12 +83,14 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     View personal_center_version_new;
     @BindView(R.id.iv_redpackage)
     ImageView ivRedpackage;
+    @BindView(R.id.ibtn_baseactivity_message)
+    ImageView ivMessageIcon;
     Unbinder unbinder;
 
     public UserEntity userEntity;
     private String faqUrl;
     private String agentUrl;
-
+    private int mCounts = 0;//未读消息数量
     private Activity activity;
 
     @Override
@@ -148,7 +146,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         String appVersionName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
         version_item_tv.setText("小绵羊V");
         version_item_tv.append(appVersionName);
-
+        getUnReadMessageCounts();
     }
 
     private void initUserInfo() {
@@ -176,27 +174,43 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-      getLastUserInfo(null);
+        getLastUserInfo(null);
     }
 
-
     /**
-     * @return 是否显示红包
+     * 获取是否有未读消息并更新图标
+     *
      */
-    private void isShowRedPackage() {
-        // DataUtil.getInstance().是官方包吗();
-        if (userEntity == null) {
-            userEntity = DataUtil.getInstance().getUserEntity();
-        }
+    private void getUnReadMessageCounts() {
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageUnReadNum()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        MessageUnReadEntity entity=baseMessage.getData(MessageUnReadEntity.class);
+                        mCounts= entity.getNum();
+                        if (mCounts > 0) {
+                            ivMessageIcon.setImageResource(R.mipmap.message_unread_icon);
+                        }else {
+                            ivMessageIcon.setImageResource(R.mipmap.message_read_icon);
+                        }
+                    }
 
-        if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
-            ivRedpackage.setVisibility(View.GONE);
-        } else {
-            ivRedpackage.setVisibility(View.VISIBLE);
-        }
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+
+                        LogUtil.logI("返回格式错误---" + new Gson().toJson(baseMessage));
+                    }
+                });
 
     }
 
+
+
     /**
      * 兑换红包
      *
@@ -328,12 +342,13 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                                 ivRedpackage.setVisibility(View.VISIBLE);
                             }
                         }
-                     //   initUserInfo();
+                        //   initUserInfo();
                         if (action1 != null)
                             action1.call(userEntity);
                     }
                 });
     }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -349,7 +364,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.ibtn_baseactivity_message://消息
-                // startActivity(new Intent(activity, ActivityMessages.class));
+                startActivity(new Intent(activity, MessagesActivity.class));
                 break;
             case R.id.iv_redpackage://邀请成功后有可领红包
                 ViewUtil.changeRedPackage(getActivity(), getView(), FgtPersonalCenter.this);
@@ -426,7 +441,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
     @Override
     public void onResume() {
-       getLastUserInfo(null);
+        getLastUserInfo(null);
         super.onResume();
         try {
             initData();

+ 0 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -1511,7 +1511,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
 
         }
-
     }
 
     /**

+ 58 - 14
app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -44,6 +44,41 @@ public interface ApiService {
     Observable<BaseMessage> loginByCaptcha(@Body JSONObject jsonObject);
 
     /**
+     * @return 消息中心列表
+     */
+    @GET("app/message/system_notification/")
+    Observable<BaseMessage> getMessageCenter(@Query("page") int page, @Query("per_page") int per_page);
+
+    /**
+     * @param page            页数
+     * @param per_page,每页显示条数
+     * @return 回复互动列表
+     */
+    @GET("app/message/system_message/")
+    Observable<BaseMessage> getMessageReply(@Query("page") int page, @Query("per_page") int per_page);
+
+    /**
+     * @param id  回复互动id
+     * @return 回复互动详情
+     */
+    @GET("app/message/system_message/{id}")
+    Observable<BaseMessage> getMessageReplyItem(@Path("id") String id);
+
+    /**
+     * @param id  系统消息id
+     * @return 消息中心详情
+     */
+    @GET("app/message/system_notification/{id}")
+    Observable<BaseMessage> getMessageCenterItem(@Path("id") String id);
+
+    /**
+     * @return  获取未读消息条数 返回 0 或者 未读数量 大于零则有未读
+     * 获取未读消息条数
+     */
+    @GET("app/message/system_message/no_read_num")
+    Observable<BaseMessage>getMessageUnReadNum();
+
+    /**
      * @return ,
      * 主页抢任务
      */
@@ -199,16 +234,19 @@ public interface ApiService {
 
     /**
      * @param jsonObject
-     * @return   领红包
+     * @return 领红包
      */
     @POST("app/user/receive_red_packet")
     Observable<BaseMessage> exchangeRedPackage(@Query("invitation_code") String jsonObject);
 
-    /**新手红包
-     * @return  .
+    /**
+     * 新手红包
+     *
+     * @return .
      */
     @POST("app/newbie_task/login_red_packet")
-    Observable<BaseMessage>getNewRedPackage();
+    Observable<BaseMessage> getNewRedPackage();
+
     /**
      * 更换手机号
      */
@@ -239,19 +277,20 @@ public interface ApiService {
      */
     @POST("app/user/sms_for_bind_mobile")
     Observable<BaseMessage> smsBindMobile(@Body JSONObject jsonObject);
+
     /**
      * 使用第三方登录时,未找到该qq对应的账号,不再直接创建账号,会先绑定手机号来注册新账号
      * captcha	string
-     验证码 第二步需要
-     mobile	string
-     platform	string
-     登录返回来的platform
-     scope	string
-     传kfzs为官包 传空为邀请包
-     step	string
-     步骤:first发验证码 second绑定
-     token	string
-     登录返回来的token
+     * 验证码 第二步需要
+     * mobile	string
+     * platform	string
+     * 登录返回来的platform
+     * scope	string
+     * 传kfzs为官包 传空为邀请包
+     * step	string
+     * 步骤:first发验证码 second绑定
+     * token	string
+     * 登录返回来的token
      */
     @POST("app/auth/bind_mobile")
     Observable<BaseMessage> bindMobileRegister(@Body JSONObject jsonObject);
@@ -823,28 +862,33 @@ public interface ApiService {
      */
     @GET("app/user/invitation_top_record")
     Observable<BaseMessage> getInvitationTopRecord();
+
     /**
      * 获取用户未做金额
      * can_receive_awar
      */
     @GET("app/user/can_receive_award")
     Observable<BaseMessage> getCanREceiveAwar();
+
     /**
      * 任务审核
      * accepted_task/static_audit
      */
     @GET("app/accepted_task/static_audit")
     Observable<BaseMessage> staticAudit();
+
     /**
      * 唤醒业务APP列表
      */
     @GET("app/awaken/app")
     Observable<BaseMessage> awakenApp(@Query("page") int page, @Query("per_page") int per_page);
+
     /**
      * 唤醒业务APP列表
      */
     @GET("app/awaken/article")
     Observable<BaseMessage> awakenApparticle(@Query("page") int page, @Query("per_page") int per_page);
+
     /**
      * 唤醒业务打开app内容成功后回调
      */

+ 146 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/MessageCenterEntity.java

@@ -0,0 +1,146 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ * created on:2018/9/3 on 13:36
+ * created by: YSL
+ * 描述:消息中心列表   ,  消息中心详情
+ */
+public class MessageCenterEntity implements Serializable{
+
+
+    /**
+     * updated_at : 1535524140
+     * is_look : 0
+     * Id : 6
+     * content : 4444444444444
+     * platform : 0
+     * abstracts : 4444444444
+     * title : 55555555555555
+     * recipient : 0
+     * send_type : 1
+     * recipient_invitation_code :
+     * created_at : 1535524140
+     * send_time : 1535524073
+     * type : 1
+     */
+
+    private int updated_at;
+    private int is_look;
+    private int Id;
+    private String content;
+    private int platform;
+    private String abstracts;
+    private String title;
+    private int recipient;
+    private int send_type;
+    private String recipient_invitation_code;
+    private int created_at;
+    private int send_time;
+    private int type;
+
+    public int getUpdated_at() {
+        return updated_at;
+    }
+
+    public void setUpdated_at(int updated_at) {
+        this.updated_at = updated_at;
+    }
+
+    public int getIs_look() {
+        return is_look;
+    }
+
+    public void setIs_look(int is_look) {
+        this.is_look = is_look;
+    }
+
+    public int getId() {
+        return Id;
+    }
+
+    public void setId(int Id) {
+        this.Id = Id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(int platform) {
+        this.platform = platform;
+    }
+
+    public String getAbstracts() {
+        return abstracts;
+    }
+
+    public void setAbstracts(String abstracts) {
+        this.abstracts = abstracts;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getRecipient() {
+        return recipient;
+    }
+
+    public void setRecipient(int recipient) {
+        this.recipient = recipient;
+    }
+
+    public int getSend_type() {
+        return send_type;
+    }
+
+    public void setSend_type(int send_type) {
+        this.send_type = send_type;
+    }
+
+    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 getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(int created_at) {
+        this.created_at = created_at;
+    }
+
+    public int getSend_time() {
+        return send_time;
+    }
+
+    public void setSend_time(int send_time) {
+        this.send_time = send_time;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+}

+ 126 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/MessageReplyEntity.java

@@ -0,0 +1,126 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ * created on:2018/9/3 on 13:52
+ * created by: YSL
+ * 描述:回复互动列表 , 回复互动详情 ,未读消息条数
+ */
+public class MessageReplyEntity implements Serializable{
+
+
+    /**
+     * user_feedback_id : 0
+     * faq_feedback_id : 2
+     * title :
+     * id : 1
+     * user_contet :
+     * created_at : 1535505529
+     * user_create_time : 0
+     * is_look : 0
+     * content : 正在处理222
+     * type : 1
+     * user_id : 63075
+     */
+
+    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;
+    }
+}

+ 23 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/MessageUnReadEntity.java

@@ -0,0 +1,23 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * created on:2018/9/3 on 21:08
+ * created by: YSL
+ * 描述:
+ */
+public class MessageUnReadEntity {
+
+    /**
+     * num : 0
+     */
+
+    private int num;
+
+    public int getNum() {
+        return num;
+    }
+
+    public void setNum(int num) {
+        this.num = num;
+    }
+}

+ 87 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/MessageCenterDetailActivity.java

@@ -0,0 +1,87 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.TextView;
+
+import com.google.gson.Gson;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageCenterEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * created on:2018/9/3 on 20:50
+ * created by: YSL
+ * 描述:
+ */
+public class MessageCenterDetailActivity extends AppCompatActivity{
+    @BindView(R.id.tv_content)
+    TextView tvContent;
+    @BindView(R.id.tv_title)
+    TextView tvTitle;
+    @BindView(R.id.txt_baseactivity_title)
+    TextView tvBaseTitle;
+
+    private int position;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_messagesystem);
+        ButterKnife.bind(this);
+        position=getIntent().getIntExtra("position",-1);
+        loadData(position+"");
+    }
+
+    @OnClick({R.id.img_baseactivity_title})
+    public void initClick(View view) {
+        switch (view.getId()) {
+            case R.id.img_baseactivity_title:
+                MessageCenterDetailActivity.this.finish();
+                break;
+        }
+
+    }
+
+    private void loadData(String id){
+        if (id.equals(-1+"")){
+            return;
+        }
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageCenterItem(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        LogUtil.logI("消息中心详细内容----"+new Gson().toJson(baseMessage));
+                        MessageCenterEntity entity =baseMessage.getData(MessageCenterEntity.class);
+                        tvContent.setText(entity.getContent());
+                        tvTitle.setText(entity.getTitle());
+
+                    }
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        LogUtil.logI("消息中心详细内容出错----"+new Gson().toJson(baseMessage));
+                    }
+                });
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+    }
+}

+ 32 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/MessageReplyDetailActivity.java

@@ -6,11 +6,17 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageCenterEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * created on:2018/8/28 on 17:55
@@ -25,12 +31,15 @@ public class MessageReplyDetailActivity extends AppCompatActivity {
     @BindView(R.id.txt_baseactivity_title)
     TextView tvBaseTitle;
 
+    private int position;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_messagesystem);
         ButterKnife.bind(this);
+        position=getIntent().getIntExtra("position",-1);
+        loadData(position+"");
     }
 
     @OnClick({R.id.img_baseactivity_title})
@@ -43,6 +52,29 @@ public class MessageReplyDetailActivity extends AppCompatActivity {
 
     }
 
+    private void loadData(String id){
+        if (id.equals(-1+"")){
+            return;
+        }
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageReplyItem(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        MessageCenterEntity entity =baseMessage.getData(MessageCenterEntity.class);
+                        tvContent.setText(entity.getContent());
+                        tvTitle.setText(entity.getTitle());
+                    }
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+
+                    }
+                });
+    }
     @Override
     protected void onDestroy() {
         super.onDestroy();

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActivityMessages.java

@@ -20,7 +20,7 @@ import com.sheep.jiuyan.samllsheep.R;
  * created by: YSL
  * 描述:消息Activity,展示消息中心和互动消息两个模块
  */
-public class ActivityMessages extends AppCompatActivity {
+public class MessagesActivity extends AppCompatActivity {
     private String[] mTitle = new String[]{"消息中心", "回复互动"};
     private TabLayout tabLayout = null;
     private ViewPager viewPager = null;
@@ -69,7 +69,7 @@ public class ActivityMessages extends AppCompatActivity {
         findViewById(R.id.iv_back).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ActivityMessages.this.finish();
+                MessagesActivity.this.finish();
             }
         });
     }

+ 1 - 7
app/src/main/java/com/sheep/gamegroup/view/adapter/MessageInteractionAdapter.java

@@ -43,17 +43,11 @@ public class MessageInteractionAdapter extends RecyclerView.Adapter<MessageInter
 
     @Override
     public void onBindViewHolder(@NonNull MyHolder viewHolder, int i) {
-        if (mList == null || mList.isEmpty()) {
-            return;
-        } else {
-            if (i == mList.size() - 1) {
-                viewHolder.viewLine.setVisibility(View.GONE);//最后一条数据隐藏线条
-            }
             GlideImageLoader.centerImage(viewHolder.ivIcon, "");
             viewHolder.tvPeople.setText("");
             viewHolder.tvTime.setText("");
             viewHolder.tvContent.setText("");
-        }
+
     }
 
     @Override

+ 21 - 20
app/src/main/java/com/sheep/gamegroup/view/adapter/MessageLeftAdapter.java

@@ -10,7 +10,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 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.jiuyan.samllsheep.R;
 
 
@@ -24,11 +26,11 @@ import java.util.List;
  */
 public class MessageLeftAdapter extends RecyclerView.Adapter<MessageLeftAdapter.Myholder> {
     private Context mContext;
-    private List<?> mList;
+    private List<MessageCenterEntity> mList;
     private ItemOnClickListener itemClick;
     private int position;
 
-    public MessageLeftAdapter(Context mContext, List<?> mList, ItemOnClickListener itemClick) {
+    public MessageLeftAdapter(Context mContext, List<MessageCenterEntity> mList, ItemOnClickListener itemClick) {
         this.mContext = mContext;
         this.mList = mList;
         this.itemClick = itemClick;
@@ -49,24 +51,21 @@ public class MessageLeftAdapter extends RecyclerView.Adapter<MessageLeftAdapter.
 
     @Override
     public void onBindViewHolder(@NonNull Myholder viewHolder, int i) {
-        if (mList == null || mList.isEmpty()) {
-            return;
-        } else {
-            if (i == mList.size() - 1) {
-                viewHolder.viewLine.setVisibility(View.GONE);//最后一条数据隐藏线条
-            }
-            GlideImageLoader.centerImage(viewHolder.ivIcon, "");
-            viewHolder.tvTitle.setText("");
-            viewHolder.tvTime.setText("");
-            viewHolder.tvContent.setText("");
-            position = i;
-            viewHolder.itemLayout.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    itemClick.itemClick(position);
-                }
-            });
+        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.tvContent.setText(mList.get(i).getContent() + "");
+        position = i;
+        viewHolder.itemLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                itemClick.itemClick(position);
+            }
+        });
     }
 
     @Override
@@ -81,6 +80,7 @@ public class MessageLeftAdapter extends RecyclerView.Adapter<MessageLeftAdapter.
         private TextView tvContent;//每条消息的内容,这里最多只显示一行
         private View viewLine;//item之间的线条
         private LinearLayout itemLayout;//整个item布局
+        private View viewReadFlag;//item是否已读标记
 
         public Myholder(View view) {
             super(view);
@@ -90,6 +90,7 @@ public class MessageLeftAdapter extends RecyclerView.Adapter<MessageLeftAdapter.
             tvContent = view.findViewById(R.id.tv_content);
             viewLine = view.findViewById(R.id.view_line);
             itemLayout = view.findViewById(R.id.item_layout);
+            viewReadFlag = view.findViewById(R.id.view_flag_is_read);
         }
     }
 
@@ -98,7 +99,7 @@ public class MessageLeftAdapter extends RecyclerView.Adapter<MessageLeftAdapter.
      */
     public interface ItemOnClickListener {
         /**
-         * @param position,当前消息在获取数据集合中的对应位置
+         * @param position
          */
         void itemClick(int position);
     }

+ 101 - 0
app/src/main/java/com/sheep/gamegroup/view/adapter/MessageRightAdapter.java

@@ -0,0 +1,101 @@
+package com.sheep.gamegroup.view.adapter;
+
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.model.entity.MessageReplyEntity;
+import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+/**
+ * created on:2018/9/3 on 17:31
+ * created by: YSL
+ * 描述:
+ */
+public class MessageRightAdapter extends RecyclerView.Adapter<MessageRightAdapter.MyHolder> {
+    private Context mContext;
+    private List<MessageReplyEntity> mList;
+    private ItemOnClickListener itemClick;
+    private int position;
+
+    public MessageRightAdapter(Context mContext, List<MessageReplyEntity> mList, MessageRightAdapter.ItemOnClickListener itemClick) {
+        this.mContext = mContext;
+        this.mList = mList;
+        this.itemClick = itemClick;
+    }
+
+    @NonNull
+    @Override
+    public MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+        View view = null;
+        if (mList == null || mList.isEmpty()) {
+            view = LayoutInflater.from(mContext).inflate(R.layout.empty_view, null);
+        } else {
+            view = LayoutInflater.from(mContext).inflate(R.layout.adapter_message_left_fragment, null);
+        }
+        return new MessageRightAdapter.MyHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull MyHolder viewHolder, 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.tvContent.setText(mList.get(i).getContent());
+        position = i;
+        viewHolder.itemLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                itemClick.itemClick(mList.get(position));
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList == null ? 0 : mList.size();
+    }
+    class MyHolder extends RecyclerView.ViewHolder{
+        private ImageView ivIcon;//头像
+        private TextView tvTitle;//标题
+        private TextView tvTime;//时间
+        private TextView tvContent;//每条消息的内容,这里最多只显示一行
+        private View viewLine;//item之间的线条
+        private LinearLayout itemLayout;//整个item布局
+        private View viewReadFlag;//item是否已读标记
+
+        public MyHolder(View view) {
+            super(view);
+            ivIcon = view.findViewById(R.id.iv_icon);
+            tvTitle = view.findViewById(R.id.tv_title);
+            tvTime = view.findViewById(R.id.tv_time);
+            tvContent = view.findViewById(R.id.tv_content);
+            viewLine = view.findViewById(R.id.view_line);
+            itemLayout = view.findViewById(R.id.item_layout);
+            viewReadFlag = view.findViewById(R.id.view_flag_is_read);
+        }
+    }
+    /**
+     * 设置每一条消息的回调
+     */
+    public interface ItemOnClickListener {
+        /**
+         * @param entity
+         */
+        void itemClick(MessageReplyEntity entity);
+    }
+}

+ 134 - 12
app/src/main/java/com/sheep/gamegroup/view/fragment/MessageCenterFragment.java

@@ -6,22 +6,42 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageCenterEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.MessageCenterDetailActivity;
+import com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity;
 import com.sheep.gamegroup.view.activity.MessageReplyDetailActivity;
 import com.sheep.gamegroup.view.adapter.MessageLeftAdapter;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import rx.Scheduler;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
 /**
  * created on:2018/8/28 on 12:32
  * created by: YSL
@@ -31,9 +51,12 @@ import java.util.List;
 @SuppressLint("ValidFragment")
 public class MessageCenterFragment extends Fragment implements MessageLeftAdapter.ItemOnClickListener {
     private Context mContext;
-    private RecyclerView recyclerView;
+    private XRecyclerView recyclerView;
+    private ConstraintLayout emptyView;
     private MessageLeftAdapter adapter;
-    private List<?> mList;
+    private List<MessageCenterEntity> mList = new ArrayList<>();
+    private int per_page;
+    private int page;
 
 
     public MessageCenterFragment() {
@@ -47,32 +70,131 @@ public class MessageCenterFragment extends Fragment implements MessageLeftAdapte
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = null;
-        if (mList == null || mList.isEmpty()) {
-            view=inflater.inflate(R.layout.layout_empty_no_data,null);
-        } else {
-            view = inflater.inflate(R.layout.fragment_messagecenter, null);
-            recyclerView = view.findViewById(R.id.recycle_fragment_message_center);
-        }
+        view = inflater.inflate(R.layout.fragment_messagecenter, null);
+        recyclerView = view.findViewById(R.id.recycle_fragment_message_center);
+        emptyView = view.findViewById(R.id.view_empty);
         return view;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (mList==null||mList.isEmpty()){
-            return;
-        }
+        recyclerView.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+                refreshData(1, 20);
+            }
+
+            @Override
+            public void onLoadMore() {
+                loadmoreMessage();
+                if (ListUtil.size(mList) >= per_page * page) {
+                    page += 1;
+                    loadmoreMessage();
+                } else {
+                    recyclerView.setNoMore(true);
+                }
+            }
+        });
+        //  ViewUtil.setBottomLine(recyclerView);
         adapter = new MessageLeftAdapter(mContext, mList, this);
         LinearLayoutManager manager = new LinearLayoutManager(mContext);
         manager.setOrientation(OrientationHelper.VERTICAL);
         recyclerView.setLayoutManager(manager);
         recyclerView.setAdapter(adapter);
+        loadDatas(1, 20);
+
+    }
+
+    /**
+     * 加载消息
+     *
+     * @param page     页数
+     * @param per_page ,每页加载条数
+     */
+    private void loadDatas(int page, int per_page) {
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageCenter(page, per_page)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        mList.addAll(baseMessage.getDataList(MessageCenterEntity.class));
+                        if (mList.isEmpty()) {
+                            emptyView.setVisibility(View.VISIBLE);
+                            recyclerView.setVisibility(View.GONE);
+                        } else {
+                            emptyView.setVisibility(View.GONE);
+                            recyclerView.setVisibility(View.VISIBLE);
+                        }
+                        recyclerView.getAdapter().notifyDataSetChanged();
+
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        emptyView.setVisibility(View.VISIBLE);
+                        recyclerView.setVisibility(View.GONE);
+                    }
+                });
+    }
+
+    /**
+     * 刷新
+     */
+    private void refreshData(int page, int per_page) {
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageCenter(page, per_page)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if (!mList.isEmpty()) {
+                            mList.clear();
+                        }
+                        mList.addAll(baseMessage.getDataList(MessageCenterEntity.class));
+                        if (mList.isEmpty()) {
+                            emptyView.setVisibility(View.VISIBLE);
+                            recyclerView.setVisibility(View.GONE);
+                        } else {
+                            emptyView.setVisibility(View.GONE);
+                            recyclerView.setVisibility(View.VISIBLE);
+                        }
+                        recyclerView.getAdapter().notifyDataSetChanged();
+                        recyclerView.refreshComplete();
+
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        emptyView.setVisibility(View.VISIBLE);
+                        recyclerView.setVisibility(View.GONE);
+                        recyclerView.refreshComplete();
+                    }
+                });
+
+    }
+
+    /**
+     * 加载更多消息
+     */
+    private void loadmoreMessage() {
+        G.showToast("加载更多");
+        recyclerView.loadMoreComplete();
     }
 
     @Override
     public void itemClick(int position) {
         if (getActivity() != null) {
-            startActivity(new Intent(getActivity(), MessageReplyDetailActivity.class));
+            Intent intent = new Intent(getActivity(), MessageCenterDetailActivity.class);
+            intent.putExtra("position", position);
+            startActivity(intent);
         }
     }
 }

+ 130 - 8
app/src/main/java/com/sheep/gamegroup/view/fragment/MessageReplyFragment.java

@@ -14,12 +14,26 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.gson.Gson;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageCenterEntity;
+import com.sheep.gamegroup.model.entity.MessageReplyEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity;
 import com.sheep.gamegroup.view.adapter.MessageLeftAdapter;
+import com.sheep.gamegroup.view.adapter.MessageRightAdapter;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
 /**
  * created on:2018/8/29 on 9:58
  * created by: YSL
@@ -27,11 +41,14 @@ import java.util.List;
  */
 
 @SuppressLint("ValidFragment")
-public class MessageReplyFragment extends Fragment implements MessageLeftAdapter.ItemOnClickListener {
+public class MessageReplyFragment extends Fragment implements MessageRightAdapter.ItemOnClickListener {
     private Context mContext;
-    private RecyclerView recyclerView;
-    private MessageLeftAdapter adapter;
-    private List<?> mList;
+    private XRecyclerView recyclerView;
+    private MessageRightAdapter adapter;
+    private List<MessageReplyEntity> mList=new ArrayList<>();
+    private View emptyView;
+    private int per_page;
+    private int page;
 
     public MessageReplyFragment() {
     }
@@ -43,24 +60,129 @@ public class MessageReplyFragment extends Fragment implements MessageLeftAdapter
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_messagecenter, null);
+        View view = null;
+        view = inflater.inflate(R.layout.fragment_messagecenter, null);
         recyclerView = view.findViewById(R.id.recycle_fragment_message_center);
+        emptyView = view.findViewById(R.id.view_empty);
         return view;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        adapter = new MessageLeftAdapter(mContext, mList, this);
+        recyclerView.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+                refreshData(1,20);
+            }
+
+            @Override
+            public void onLoadMore() {
+                loadmoreMessage();
+                if (ListUtil.size(mList) >= per_page * page) {
+                    page += 1;
+                    loadmoreMessage();
+                } else {
+                    recyclerView.setNoMore(true);
+                }
+            }
+        });
+        //  ViewUtil.setBottomLine(recyclerView);
+        adapter = new MessageRightAdapter(mContext, mList, this);
         LinearLayoutManager manager = new LinearLayoutManager(mContext);
         manager.setOrientation(OrientationHelper.VERTICAL);
         recyclerView.setLayoutManager(manager);
         recyclerView.setAdapter(adapter);
+        loadDatas(1, 20);
+    }
+
+    /**
+     * 刷新
+     */
+    private void refreshData(int page,int per_page) {
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageReply(page, per_page)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        LogUtil.logI("返回格式---" + new Gson().toJson(baseMessage));
+                        if (!mList.isEmpty()){
+                            mList.clear();
+                            mList.addAll(baseMessage.getDataList(MessageReplyEntity.class));
+                        }
+                        if (mList.isEmpty()) {
+                            emptyView.setVisibility(View.VISIBLE);
+                            recyclerView.setVisibility(View.GONE);
+                        } else {
+                            emptyView.setVisibility(View.GONE);
+                            recyclerView.setVisibility(View.VISIBLE);
+                        }
+                        recyclerView.refreshComplete();
+                        recyclerView.getAdapter().notifyDataSetChanged();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                       /* emptyView.setVisibility(View.VISIBLE);
+                        recyclerView.setVisibility(View.GONE);*/
+                        recyclerView.refreshComplete();
+                        LogUtil.logI("返回格式错误---" + new Gson().toJson(baseMessage));
+                    }
+                });
+    }
+
+    /**
+     * 加载更多
+     */
+    private void loadmoreMessage() {
+    }
+
+    /**
+     * 加载消息
+     *
+     * @param page     页数
+     * @param per_page ,每页加载条数
+     */
+    private void loadDatas(int page, int per_page) {
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageReply(page, per_page)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        LogUtil.logI("返回格式---" + new Gson().toJson(baseMessage));
+                            mList.addAll(baseMessage.getDataList(MessageReplyEntity.class));
+                        if (mList.isEmpty()) {
+                            emptyView.setVisibility(View.VISIBLE);
+                            recyclerView.setVisibility(View.GONE);
+                        } else {
+                            emptyView.setVisibility(View.GONE);
+                            recyclerView.setVisibility(View.VISIBLE);
+                        }
+                        recyclerView.getAdapter().notifyDataSetChanged();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                       /* emptyView.setVisibility(View.VISIBLE);
+                        recyclerView.setVisibility(View.GONE);*/
+                        LogUtil.logI("返回格式错误---" + new Gson().toJson(baseMessage));
+                    }
+                });
     }
 
     @Override
-    public void itemClick(int position) {
-        if (getActivity()!=null){
+    public void itemClick(MessageReplyEntity entity) {
+        if (getActivity() != null) {
+            Intent intent=new Intent(getActivity(), MessageInteractionDetailActivity.class);
+            intent.putExtra("message",entity);
             startActivity(new Intent(getActivity(), MessageInteractionDetailActivity.class));
         }
     }

+ 1 - 2
app/src/main/res/layout/activity_messagesystem.xml

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

+ 2 - 1
app/src/main/res/layout/adapter_message_left_fragment.xml

@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <com.kfzs.android.view.widget.CircleImageView
+        <ImageView
             android:id="@+id/iv_icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
@@ -35,6 +35,7 @@
                 android:textSize="15sp"
                 android:textStyle="bold" />
 
+
             <TextView
                 android:id="@+id/tv_time"
                 android:layout_width="wrap_content"

+ 2 - 4
app/src/main/res/layout/fgt_personacenter_item_top.xml

@@ -46,17 +46,15 @@
                 android:layout_alignParentRight="true"
                 android:background="@color/translate"
                 android:gravity="center"
-                android:src="@mipmap/add_black_img"
-                android:visibility="gone" />
+                android:src="@mipmap/message_read_icon" />
             <!--右边设置图标按钮-->
             <ImageButton
                 android:id="@+id/ibtn_baseactivity_right"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="16dp"
                 android:background="@color/translate"
+                android:layout_toLeftOf="@id/ibtn_baseactivity_message"
                 android:gravity="center"
                 android:src="@mipmap/setting" />
 

+ 10 - 0
app/src/main/res/layout/fragment_message_reply.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/recycle_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</android.support.constraint.ConstraintLayout>

+ 6 - 1
app/src/main/res/layout/fragment_messagecenter.xml

@@ -3,8 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <include
+        android:id="@+id/view_empty"
+        layout="@layout/layout_empty_no_data"
+        android:visibility="gone"/>
 
-    <android.support.v7.widget.RecyclerView
+
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:id="@+id/recycle_fragment_message_center"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

BIN
app/src/main/res/mipmap-xxhdpi/message_read_icon.png


BIN
app/src/main/res/mipmap-xxhdpi/message_unread.png


BIN
app/src/main/res/mipmap-xxhdpi/message_unread_icon.png