yuanshenglan пре 7 година
родитељ
комит
1432a18ff6

+ 40 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/MessageInteractionDetailActivity.java

@@ -10,14 +10,24 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.gson.Gson;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageReplyEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.view.adapter.MessageInteractionAdapter;
 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 butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * created on:2018/8/28 on 17:15
@@ -30,7 +40,9 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
     @BindView(R.id.recycle_view)
     RecyclerView recyclerView;
     private MessageInteractionAdapter adapter;
-    private List<?> mList;
+    private List<MessageReplyEntity> mList = new ArrayList<>();
+    private MessageReplyEntity entity=null;
+    private String id="";
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -43,6 +55,9 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
         recyclerView.setLayoutManager(manager);
         adapter = new MessageInteractionAdapter(this, mList);
         recyclerView.setAdapter(adapter);
+        entity = (MessageReplyEntity) getIntent().getSerializableExtra("message");
+        id=getIntent().getIntExtra("position",-1)+"";
+        loadData(id + "");
     }
 
     @OnClick({R.id.img_baseactivity_title})
@@ -53,4 +68,28 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
                 break;
         }
     }
+    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) {
+                        LogUtil.logI("loadData-onNext----"+new Gson().toJson(baseMessage));
+                        mList.addAll(baseMessage.getDataList(MessageReplyEntity.class));
+                        tvTitle.setText(entity.getTitle());
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        LogUtil.logI("loadData-onError----"+new Gson().toJson(baseMessage));
+                    }
+                });
+    }
 }

+ 13 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/MessageReplyDetailActivity.java

@@ -8,10 +8,14 @@ import android.widget.TextView;
 
 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.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -32,14 +36,16 @@ public class MessageReplyDetailActivity extends AppCompatActivity {
     TextView tvBaseTitle;
 
     private int position;
+    private List<MessageReplyEntity> mList = new ArrayList<>();
+    private MessageReplyEntity entity=null;
 
     @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+"");
+        position = getIntent().getIntExtra("position", -1);
+        loadData(position + "");
     }
 
     @OnClick({R.id.img_baseactivity_title})
@@ -52,8 +58,8 @@ public class MessageReplyDetailActivity extends AppCompatActivity {
 
     }
 
-    private void loadData(String id){
-        if (id.equals(-1+"")){
+    private void loadData(String id) {
+        if (id.equals(-1 + "")) {
             return;
         }
         SheepApp.getInstance()
@@ -65,16 +71,18 @@ public class MessageReplyDetailActivity extends AppCompatActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        MessageCenterEntity entity =baseMessage.getData(MessageCenterEntity.class);
+                        mList.addAll(baseMessage.getDataList(MessageReplyEntity.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/adapter/MessageLeftAdapter.java

@@ -80,7 +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,7 +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);
+
         }
     }
 

+ 4 - 5
app/src/main/java/com/sheep/gamegroup/view/adapter/MessageRightAdapter.java

@@ -12,7 +12,6 @@ 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;
@@ -60,7 +59,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));
+                itemClick.itemClick(mList.get(position),position);
             }
         });
     }
@@ -76,7 +75,7 @@ public class MessageRightAdapter extends RecyclerView.Adapter<MessageRightAdapte
         private TextView tvContent;//每条消息的内容,这里最多只显示一行
         private View viewLine;//item之间的线条
         private LinearLayout itemLayout;//整个item布局
-        private View viewReadFlag;//item是否已读标记
+
 
         public MyHolder(View view) {
             super(view);
@@ -86,7 +85,7 @@ public class MessageRightAdapter extends RecyclerView.Adapter<MessageRightAdapte
             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);
+
         }
     }
     /**
@@ -96,6 +95,6 @@ public class MessageRightAdapter extends RecyclerView.Adapter<MessageRightAdapte
         /**
          * @param entity
          */
-        void itemClick(MessageReplyEntity entity);
+        void itemClick(MessageReplyEntity entity,int position);
     }
 }

+ 4 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/MessageReplyFragment.java

@@ -179,11 +179,13 @@ public class MessageReplyFragment extends Fragment implements MessageRightAdapte
     }
 
     @Override
-    public void itemClick(MessageReplyEntity entity) {
+    public void itemClick(MessageReplyEntity entity,int position) {
         if (getActivity() != null) {
             Intent intent=new Intent(getActivity(), MessageInteractionDetailActivity.class);
             intent.putExtra("message",entity);
-            startActivity(new Intent(getActivity(), MessageInteractionDetailActivity.class));
+            intent.putExtra("position",position);
+            LogUtil.logI("loadData-----id---post--"+position);
+            startActivity(new Intent(intent));
         }
     }
 }