diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index c1d66df..0c0c338 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,20 +3,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java b/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java
index 9ec3e2b..0da5c6a 100644
--- a/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java
+++ b/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java
@@ -14,6 +14,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.hjx.parent.databinding.ActivityHomeworkDetailBinding;
import com.hjx.parent.dialog.EditHomeworkDialog;
+import com.hjx.parent.dialog.MsgConfirmDialog;
import com.hjx.parent.rx.BaseRxActivity;
import com.prws.common.bean.ResponseResult;
import com.prws.common.bean.Student;
@@ -32,6 +33,7 @@ public class HomeworkDetailActivity extends BaseRxActivity {
if (mAdapter.getData().size() == 0) return;
+ if (mData.getCompleteFlag() == 0) {
+ noAnalyseDialog.show();
+ return;
+ }
Intent intent = new Intent(this, HomeworkSelectActivity.class);
intent.putExtra("data", mData);
intent.putExtra("student", student);
diff --git a/app/src/main/java/com/hjx/parent/dialog/MsgConfirmDialog.java b/app/src/main/java/com/hjx/parent/dialog/MsgConfirmDialog.java
index 7ca52bd..2026c58 100644
--- a/app/src/main/java/com/hjx/parent/dialog/MsgConfirmDialog.java
+++ b/app/src/main/java/com/hjx/parent/dialog/MsgConfirmDialog.java
@@ -1,6 +1,7 @@
package com.hjx.parent.dialog;
import android.content.Context;
+import android.view.View;
import androidx.annotation.NonNull;
@@ -41,6 +42,12 @@ public class MsgConfirmDialog extends BaseDialog{
dismiss();
}
});
+ if (positive == null || positive.length() == 0) {
+ binding.btnPositive.setVisibility(View.GONE);
+ }
+ if (negative == null || negative.length() == 0) {
+ binding.btnNegative.setVisibility(View.GONE);
+ }
}
public void show(Function10 positiveClick, Function10 negativeClick) {
diff --git a/app/src/main/res/layout/dialog_message_confirm.xml b/app/src/main/res/layout/dialog_message_confirm.xml
index f23fe10..4c7a538 100644
--- a/app/src/main/res/layout/dialog_message_confirm.xml
+++ b/app/src/main/res/layout/dialog_message_confirm.xml
@@ -43,7 +43,6 @@
android:layout_height="1dp"/>