Commit a516c951d2a39f6977fcaa3a78d0167f417e92e9
1 parent
028132f43d
Exists in
master
作业删除
Showing
4 changed files
with
39 additions
and
5 deletions
Show diff stats
.idea/deploymentTargetDropDown.xml
| ... | ... | @@ -3,7 +3,20 @@ |
| 3 | 3 | <component name="deploymentTargetDropDown"> |
| 4 | 4 | <value> |
| 5 | 5 | <entry key="app"> |
| 6 | - <State /> | |
| 6 | + <State> | |
| 7 | + <runningDeviceTargetSelectedWithDropDown> | |
| 8 | + <Target> | |
| 9 | + <type value="RUNNING_DEVICE_TARGET" /> | |
| 10 | + <deviceKey> | |
| 11 | + <Key> | |
| 12 | + <type value="SERIAL_NUMBER" /> | |
| 13 | + <value value="192.168.3.176:39671" /> | |
| 14 | + </Key> | |
| 15 | + </deviceKey> | |
| 16 | + </Target> | |
| 17 | + </runningDeviceTargetSelectedWithDropDown> | |
| 18 | + <timeTargetWasSelectedWithDropDown value="2024-09-29T02:03:12.057655600Z" /> | |
| 19 | + </State> | |
| 7 | 20 | </entry> |
| 8 | 21 | </value> |
| 9 | 22 | </component> | ... | ... |
app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
| ... | ... | @@ -17,6 +17,7 @@ import com.hjx.parent.databinding.PopupFilterTermBinding; |
| 17 | 17 | import com.hjx.parent.dialog.MsgConfirmDialog; |
| 18 | 18 | import com.hjx.parent.rx.BaseRxActivity; |
| 19 | 19 | import com.prws.common.bean.Student; |
| 20 | +import com.prws.common.bean.homework.HomeworkList; | |
| 20 | 21 | import com.prws.common.net.NetWorks; |
| 21 | 22 | import com.prws.common.utils.SharedPreferencesUtil; |
| 22 | 23 | import com.trello.rxlifecycle2.android.RxLifecycleAndroid; |
| ... | ... | @@ -69,12 +70,26 @@ public class StuHomeworkActivity extends BaseRxActivity<ActivityStudentHomeworkB |
| 69 | 70 | .build(); |
| 70 | 71 | } |
| 71 | 72 | deleteDialog.show(() -> { |
| 72 | - // TODO Delete | |
| 73 | + deleteHomework(data); | |
| 73 | 74 | return true; |
| 74 | 75 | }, null); |
| 75 | 76 | }; |
| 76 | 77 | } |
| 77 | 78 | |
| 79 | + @SuppressLint("CheckResult") | |
| 80 | + protected void deleteHomework(HomeworkList data) { | |
| 81 | + NetWorks.service_url.deleteHomework(NetWorks.getHeader(), data.getId()) | |
| 82 | + .subscribeOn(Schedulers.io()) | |
| 83 | + .observeOn(AndroidSchedulers.mainThread()) | |
| 84 | + .compose(RxLifecycleAndroid.bindActivity(getRxLifecycle())) | |
| 85 | + .subscribe((response, th) -> { | |
| 86 | + if (th != null) th.printStackTrace(); | |
| 87 | + if (response != null && response.getSuccess()) { | |
| 88 | + getHomework(); | |
| 89 | + } | |
| 90 | + }); | |
| 91 | + | |
| 92 | + } | |
| 78 | 93 | |
| 79 | 94 | @SuppressLint("CheckResult") |
| 80 | 95 | protected void getHomework() { | ... | ... |
libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java
| ... | ... | @@ -9,7 +9,7 @@ import java.util.Locale; |
| 9 | 9 | public class HomeworkList implements Comparable<HomeworkList> { |
| 10 | 10 | |
| 11 | 11 | @SerializedName(value = "homeworkId", alternate = "id") |
| 12 | - private Integer homeworkId; | |
| 12 | + private String homeworkId; | |
| 13 | 13 | @SerializedName(value = "name", alternate = "homeworkName") |
| 14 | 14 | private String name; |
| 15 | 15 | @SerializedName("grade") |
| ... | ... | @@ -41,7 +41,7 @@ public class HomeworkList implements Comparable<HomeworkList> { |
| 41 | 41 | this.total = total; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - public void setId(Integer id) { | |
| 44 | + public void setId(String id) { | |
| 45 | 45 | this.homeworkId = id; |
| 46 | 46 | } |
| 47 | 47 | |
| ... | ... | @@ -65,7 +65,7 @@ public class HomeworkList implements Comparable<HomeworkList> { |
| 65 | 65 | this.completeFlag = completeFlag; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - public Integer getId() { | |
| 68 | + public String getId() { | |
| 69 | 69 | return homeworkId; |
| 70 | 70 | } |
| 71 | 71 | ... | ... |
libs/common/src/main/java/com/prws/common/net/NetWorks.java
| ... | ... | @@ -192,6 +192,12 @@ public class NetWorks extends RetrofitUtils { |
| 192 | 192 | @POST("api/v1/homework/uploadHomeworkAction") |
| 193 | 193 | Single<ResponseResult> uploadHomework(@Header("Authorization") String token, @Body Object map); |
| 194 | 194 | |
| 195 | + @GET("api/v1/homework/removeHomework") | |
| 196 | + Single<ResponseResult<Boolean>> deleteHomework( | |
| 197 | + @Header("Authorization") String token, | |
| 198 | + @Query("homeworkId") String homeworkId | |
| 199 | + ); | |
| 200 | + | |
| 195 | 201 | } |
| 196 | 202 | |
| 197 | 203 | public static String getUserId() { | ... | ... |