diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c338..bb0031e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
index a682874..16c83af 100644
--- a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
+++ b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
@@ -17,6 +17,7 @@ import com.hjx.parent.databinding.PopupFilterTermBinding;
import com.hjx.parent.dialog.MsgConfirmDialog;
import com.hjx.parent.rx.BaseRxActivity;
import com.prws.common.bean.Student;
+import com.prws.common.bean.homework.HomeworkList;
import com.prws.common.net.NetWorks;
import com.prws.common.utils.SharedPreferencesUtil;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
@@ -69,12 +70,26 @@ public class StuHomeworkActivity extends BaseRxActivity {
- // TODO Delete
+ deleteHomework(data);
return true;
}, null);
};
}
+ @SuppressLint("CheckResult")
+ protected void deleteHomework(HomeworkList data) {
+ NetWorks.service_url.deleteHomework(NetWorks.getHeader(), data.getId())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .compose(RxLifecycleAndroid.bindActivity(getRxLifecycle()))
+ .subscribe((response, th) -> {
+ if (th != null) th.printStackTrace();
+ if (response != null && response.getSuccess()) {
+ getHomework();
+ }
+ });
+
+ }
@SuppressLint("CheckResult")
protected void getHomework() {
diff --git a/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java b/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java
index a7bf936..3b3f8dc 100644
--- a/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java
+++ b/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java
@@ -9,7 +9,7 @@ import java.util.Locale;
public class HomeworkList implements Comparable {
@SerializedName(value = "homeworkId", alternate = "id")
- private Integer homeworkId;
+ private String homeworkId;
@SerializedName(value = "name", alternate = "homeworkName")
private String name;
@SerializedName("grade")
@@ -41,7 +41,7 @@ public class HomeworkList implements Comparable {
this.total = total;
}
- public void setId(Integer id) {
+ public void setId(String id) {
this.homeworkId = id;
}
@@ -65,7 +65,7 @@ public class HomeworkList implements Comparable {
this.completeFlag = completeFlag;
}
- public Integer getId() {
+ public String getId() {
return homeworkId;
}
diff --git a/libs/common/src/main/java/com/prws/common/net/NetWorks.java b/libs/common/src/main/java/com/prws/common/net/NetWorks.java
index 8fa83c4..22967d5 100644
--- a/libs/common/src/main/java/com/prws/common/net/NetWorks.java
+++ b/libs/common/src/main/java/com/prws/common/net/NetWorks.java
@@ -192,6 +192,12 @@ public class NetWorks extends RetrofitUtils {
@POST("api/v1/homework/uploadHomeworkAction")
Single uploadHomework(@Header("Authorization") String token, @Body Object map);
+ @GET("api/v1/homework/removeHomework")
+ Single> deleteHomework(
+ @Header("Authorization") String token,
+ @Query("homeworkId") String homeworkId
+ );
+
}
public static String getUserId() {