From 216ca52fecb9e58a653ebccfb5edefbcd369c323 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Fri, 11 Oct 2024 13:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=88=B6=E4=BD=9C=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E4=B8=8D=E8=83=BD=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml                        | 15 +--------------
 .../main/java/com/hjx/parent/HomeworkDetailActivity.java  |  9 +++++++++
 .../main/java/com/hjx/parent/dialog/MsgConfirmDialog.java |  7 +++++++
 app/src/main/res/layout/dialog_message_confirm.xml        |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

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 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State>
-          <runningDeviceTargetSelectedWithDropDown>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="951f9ace" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-10-11T03:36:34.174716500Z" />
-        </State>
+        <State />
       </entry>
     </value>
   </component>
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<ActivityHomeworkDetai
 
     private Adapter mAdapter = new Adapter();
     private EditHomeworkDialog mDialog;
+    private MsgConfirmDialog noAnalyseDialog;
 
     @Override
     public void initView(Bundle savedInstanceState) {
@@ -39,6 +41,9 @@ public class HomeworkDetailActivity extends BaseRxActivity<ActivityHomeworkDetai
         mData = (HomeworkList) getIntent().getSerializableExtra("data");
         student = (Student) getIntent().getSerializableExtra("student");
         mDialog = new EditHomeworkDialog(this, mData);
+        noAnalyseDialog = new MsgConfirmDialog.Builder(this)
+                .setNegative("").setPositive("好的")
+                .setMessage("尚未完成解析制作，\n请先去好记星平板端制作解析").build();
         binding.tvTitle.setText(mData.getName());
 
         binding.recyclerView.setAdapter(mAdapter);
@@ -46,6 +51,10 @@ public class HomeworkDetailActivity extends BaseRxActivity<ActivityHomeworkDetai
 
         binding.btnFeedback.setOnClickListener(v -> {
             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<DialogMessageConfirmBinding>{
                 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<Boolean> positiveClick, Function10<Boolean> 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"/>
         <LinearLayout
             android:orientation="horizontal"
-            android:weightSum="2"
             android:layout_width="match_parent"
             android:layout_height="44dp">
             <TextView
@@ -60,6 +59,7 @@
                 android:background="#EEE"
                 android:layout_marginVertical="3dp"
                 android:layout_width="1dp"
+                android:layout_marginStart="1dp"
                 android:layout_height="match_parent"/>
             <TextView
                 android:id="@+id/btnPositive"
-- 
1.9.0