Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -756,7 +756,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("id", taskReleaseEty.getAccepted_task_id() == 0 && gettaskAcceptedEty != null ? gettaskAcceptedEty.getId() : taskReleaseEty.getAccepted_task_id());
         jsonObject.put("screenshots", data + "");
-        jsonObject.put("remark", taskEty.getRemarks() + "");
+        jsonObject.put("remark", /*taskEty.getRemarks() +*/ "");
         jsonObject.put("package_name", taskEty.getPackage_names() + "");
         jsonObject.put("status", 7 + "");
         presenter.taskStatus(jsonObject);

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

@@ -58,6 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_10"
             android:maxLines="2"
+            android:ellipsize="end"
             android:text="@string/app_name"
             android:textColor="#646464"
             android:textSize="14sp" />