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

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

@@ -120,4 +120,12 @@ public class MessageReplyDetailEntity {
     public void setUser_id(int user_id) {
         this.user_id = user_id;
     }
+
+
+
+
+    //返回用户提交的内容，这里服务器字段写错了
+    public String getUser_content() {
+        return user_contet;
+    }
 }

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

@@ -79,16 +79,17 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         entity = baseMessage.getData(MessageReplyDetailEntity.class);
-                        ViewUtil.setText(title, entity.getTitle());
                         LinearLayoutManager manager = new LinearLayoutManager(MessageInteractionDetailActivity.this);
                         manager.setOrientation(OrientationHelper.VERTICAL);
                         recyclerView.setLayoutManager(manager);
                         if (entity.getFaq_feedback_id() > 0) {//faq
+                            ViewUtil.setText(title, entity.getTitle());
+
                             List<FaqMsg> faqMsgList = ListUtil.emptyList();
                             FaqMsg userFaqMsg = new FaqMsg();
                             userFaqMsg.setAvatar(DataUtil.getInstance().getUserAvatar());
                             userFaqMsg.setUser(true);
-                            userFaqMsg.setContent(entity.getUser_contet());
+                            userFaqMsg.setContent(entity.getUser_content());
                             userFaqMsg.setName("我");
                             userFaqMsg.setTime(entity.getUser_create_time());
                             faqMsgList.add(userFaqMsg);
@@ -97,9 +98,11 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
                             faqMsg.setContent(entity.getContent());
                             faqMsg.setName("官方回复");
                             faqMsg.setTime(entity.getCreated_at());
-                            faqMsgList.add(userFaqMsg);
+                            faqMsgList.add(faqMsg);
                             adapter = new AdpMsgFaq(MessageInteractionDetailActivity.this, faqMsgList);
                         } else if (entity.getUser_feedback_id() > 0) {//用户反馈
+                            ViewUtil.setText(title, entity.getUser_content());
+
                             adapter = new AdpMsgUserFeedBack(MessageInteractionDetailActivity.this, entity);
                         }
                         recyclerView.setAdapter(adapter);

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

@@ -343,6 +343,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     break;
                 case 1000://连续任务
                     setFirstBtnState();
+                    int failChildPosition = taskEty.getFailChildPosition();//获取第一个审核失败子任务的位置
+                    if (type == DownloadUtil.STATUS_INSTALLED && gettaskAcceptedEty != null && failChildPosition > -1) {//已经安装并且有任务未完成的情况下
+                        btnUpImag.setText(String.format(Locale.CHINA, "重新上传截图（第%d天）", failChildPosition + 1));
+                        btnUpImag.setEnabled(true);
+                        btnUpImag.setVisibility(View.VISIBLE);
+                    }
                     break;
                 case 1002:
                 case 1003:

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <include layout="@layout/title" />