作业BUG修复 及点评模块修改

@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -268,22 +269,26 @@ public class Jxt_ListAdapter extends BaseMultiItemQuickAdapter<JxtAllListEntity.
         state_text.setVisibility(View.GONE);
         if (item.getIs_author() == 1) {//1-自己发的 0-别人发的
             massage_num.setVisibility(View.GONE);
-            state_text.setText("已查看");
+            if (item.getIs_online()==0){
+                state_tv.setText("已查看");
+            }else {
+                state_tv.setText("已提交");
+            }
         } else {//不是我发的
             if (item.getIs_read() == 1) {//已读
                 massage_num.setVisibility(View.GONE);
                 if (item.getIs_online()==0){
-                    state_text.setText("已查看");
+                    state_tv.setText("已查看");
                 }else {
-                    state_text.setText("已提交");
+                    state_tv.setText("已提交");
                 }
             } else {
                 massage_num.setVisibility(View.VISIBLE);
                 massage_num.setText("1");
                 if (item.getIs_online()==0){
-                    state_text.setText("未查看");
+                    state_tv.setText("未查看");
                 }else {
-                    state_text.setText("未提交");
+                    state_tv.setText("未提交");
                 }
             }
         }

@@ -45,25 +45,29 @@ public class Jxt_Zy_Adapter extends BaseQuickAdapter<JxtZyListEntity.DataBeanX.D
         if (item.getIs_author() == 1) {//1-自己发的 0-别人发的
             massage_num.setVisibility(View.GONE);
             if (item.getIs_online()==0){
-                state_text.setText("已查看");
+                state_tv.setText("已查看");
             }else {
-                state_text.setText("已提交");
+                state_tv.setText("已提交");
             }
         } else {//不是我发的
             if (item.getIs_read() == 1) {//已读
                 massage_num.setVisibility(View.GONE);
                 if (item.getIs_online()==0){
-                    state_text.setText("已查看");
+                    state_tv.setText("已查看");
                 }else {
-                    state_text.setText("已提交");
+                    if (item.getStatus_text()!=null){
+                        state_tv.setText(item.getStatus_text());
+                    }
                 }
             } else {
                 massage_num.setVisibility(View.VISIBLE);
                 massage_num.setText("1");
                 if (item.getIs_online()==0){
-                    state_text.setText("未查看");
+                    state_tv.setText("未查看");
                 }else {
-                    state_text.setText("未提交");
+                    if (item.getStatus_text()!=null){
+                        state_tv.setText(item.getStatus_text());
+                    }
                 }
             }
         }

@@ -32,8 +32,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
-@SlideLip(slidelip = false) // 侧滑返回上一页 , 默认不开启 \
-@TopNavigationBar(color = Color.TRANSPARENT, setBarBiack = 2)   // 状态栏颜色 , 状态栏样式
 @Layout(R.layout.activity_jsbj)
 public class Jsbj_Activity extends BaseActivity {
     Jxt_Class_Adapter jxt_class_adapter;

@@ -225,16 +225,16 @@ public class Fbzy_Activity extends BaseActivity {
         }
         switch (jxtEntity.getData().getCycle_type()){
             case "week":
-                fwTimeText.setText(jxtEntity.getData().getCreate_time()+"周");
+                fwTimeText.setText(jxtEntity.getData().getCycle_time()+"周");
                 break;
             case "day":
-                fwTimeText.setText(jxtEntity.getData().getCreate_time()+"天");
+                fwTimeText.setText(jxtEntity.getData().getCycle_time()+"天");
                 break;
             case "hour":
-                fwTimeText.setText(jxtEntity.getData().getCreate_time()+"时");
+                fwTimeText.setText(jxtEntity.getData().getCycle_time()+"时");
                 break;
             case "minute":
-                fwTimeText.setText(jxtEntity.getData().getCreate_time()+"分");
+                fwTimeText.setText(jxtEntity.getData().getCycle_time()+"分");
                 break;
         }
 

@@ -180,10 +180,90 @@ public class Zyxq_Activity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode==7788){
-            getData();
+            setData();
+
         }
     }
 
+    private void setData() {
+        Api().getTaskInfo(Config.Token, zyId)
+                .subscribeOn(Schedulers.io())
+                //需要在主线程更新UI
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<JxtEntity>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(JxtEntity jxtEntity) {
+                        if (jxtEntity.getCode() == M.success) {
+                            setButtonNum(0);
+                            allCheck.setEnabled(false);
+                            WaitDialog.dismiss();
+                            List<JxtEntity.DataBean.CommentListBean> comment_list = jxtEntity.getData().getComment_list();
+                            List<StudentCkEntity> studentCkEntities = new ArrayList<>();
+                            List<StudentCkEntity> unstudentCkEntities = new ArrayList<>();
+                            for (int i = 0; i < comment_list.size(); i++) {
+                                studentCkEntities.add(new StudentCkEntity(comment_list.get(i).getId()+"",comment_list.get(i).getStudent_id(),comment_list.get(i).getParent_name(),comment_list.get(i).getStudent_name(),comment_list.get(i).getPhoto(),comment_list.get(i).getGender(),comment_list.get(i).getSubmit_time(),comment_list.get(i).getEvaluate_level_id(),false));
+                            }
+                            List<JxtEntity.DataBean.UncommentListBean> uncomment_list = jxtEntity.getData().getUncomment_list();
+                            for (int i = 0; i < uncomment_list.size(); i++) {
+                                unstudentCkEntities.add(new StudentCkEntity(uncomment_list.get(i).getId()+"",uncomment_list.get(i).getStudent_id(), uncomment_list.get(i).getParent_name(), uncomment_list.get(i).getStudent_name(), uncomment_list.get(i).getPhoto(),uncomment_list.get(i).getGender(),uncomment_list.get(i).getSubmit_time(),uncomment_list.get(i).getEvaluate_level_id(), false));
+                            }
+                            zy_rv_wck_fragment.setNewdata(unstudentCkEntities);
+                            zy_rv_ck_fragment.setNewdata(studentCkEntities);
+                            if ( jxtEntity.getData().getIs_online()==0){
+                                Toast.makeText(ctx, "111", Toast.LENGTH_SHORT).show();
+                                tabNames.set(0,("已点评" + "(" + studentCkEntities.size() + ")"));
+                                tabNames.set(1,"未点评" + "(" + unstudentCkEntities.size() + ")");
+                            }else {
+                                Toast.makeText(ctx, "222", Toast.LENGTH_SHORT).show();
+                                tabNames.set(0,"已提交" + "(" + studentCkEntities.size() + ")");
+                                tabNames.set(1,"未提交" + "(" + unstudentCkEntities.size() + ")");
+                            }
+                            fragmentAdater.notifyDataSetChanged();
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        Log.e("错误请求", "onError: "+e );
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+        Api().getTaskEvaluateOption(Config.Token,zyId)
+                .subscribeOn(Schedulers.io())
+                //需要在主线程更新UI
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<getTaskEvaluateOptionEntity>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(getTaskEvaluateOptionEntity getTaskEvaluateOptionEntity) {
+                        taskEvaluate = getTaskEvaluateOptionEntity;
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
     @Override
     protected void initData() {
         allCheck.setEnabled(false);
@@ -577,37 +657,43 @@ public class Zyxq_Activity extends BaseActivity {
                         .setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
                             @Override
                             public boolean onClick(BaseDialog baseDialog, View v) {
-                                Api().delTask(Config.Token,zyId)
-                                        .subscribeOn(Schedulers.io())
-                                        //需要在主线程更新UI
-                                        .observeOn(AndroidSchedulers.mainThread())
-                                        .subscribe(new Observer<FbtzEntity>() {
-                                            @Override
-                                            public void onSubscribe(Disposable d) {
+                                return false;                    //位于“取消”位置的按钮点击后无法关闭对话框
+                            }
+                        })
+                .setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        Api().delTask(Config.Token,zyId)
+                                .subscribeOn(Schedulers.io())
+                                //需要在主线程更新UI
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(new Observer<FbtzEntity>() {
+                                    @Override
+                                    public void onSubscribe(Disposable d) {
 
-                                            }
+                                    }
 
-                                            @Override
-                                            public void onNext(FbtzEntity fbtzEntity) {
-                                                if (fbtzEntity.getCode()==M.success){
-                                                    Toast.makeText(Zyxq_Activity.this, "撤回成功", Toast.LENGTH_SHORT).show();
-                                                    finish();
-                                                }
-                                            }
+                                    @Override
+                                    public void onNext(FbtzEntity fbtzEntity) {
+                                        if (fbtzEntity.getCode()==M.success){
+                                            Toast.makeText(Zyxq_Activity.this, "撤回成功", Toast.LENGTH_SHORT).show();
+                                            finish();
+                                        }
+                                    }
 
-                                            @Override
-                                            public void onError(Throwable e) {
+                                    @Override
+                                    public void onError(Throwable e) {
 
-                                            }
+                                    }
 
-                                            @Override
-                                            public void onComplete() {
+                                    @Override
+                                    public void onComplete() {
 
-                                            }
-                                        });
-                                return false;                    //位于“取消”位置的按钮点击后无法关闭对话框
-                            }
-                        });
+                                    }
+                                });
+                        return false;
+                    }
+                });
                 tydpPopupwindow.dismiss();
             }
         });
@@ -665,6 +751,7 @@ public class Zyxq_Activity extends BaseActivity {
             DisplayMetrics dm = new DisplayMetrics();
             if (isSet){
                 delet_text.setVisibility(View.VISIBLE);
+                helper.addOnClickListener(R.id.delet_text);
             }else {
                 delet_text.setVisibility(View.GONE);
             }
@@ -782,7 +869,7 @@ public class Zyxq_Activity extends BaseActivity {
                 }else if (zy_rv_ck_fragment.getCheckedId().size()!=0){
                     studentIds = zy_rv_ck_fragment.getStudentIds();
                 }
-                Api().setTaskEvaluate(Config.Token,zyId+"",studentIds,id+"",edit_content.getText().toString(),audio)
+                Api().setTaskEvaluate(Config.Token,zyId+"",id+"",studentIds,edit_content.getText().toString(),audio)
                          .subscribeOn(Schedulers.io())
                         //需要在主线程更新UI
                         .observeOn(AndroidSchedulers.mainThread())
@@ -796,7 +883,7 @@ public class Zyxq_Activity extends BaseActivity {
                             public void onNext(setTaskEvaluateEntity setTaskEvaluateEntity) {
                                 if (setTaskEvaluateEntity.getCode() == M.success){
                                     tydpPopupwindow.dismiss();
-                                    getData();
+                                    setData();
                                 }else {
                                     WaitDialog.dismiss();
                                     Toast.makeText(ctx, ""+setTaskEvaluateEntity.getMsg(), Toast.LENGTH_SHORT).show();
@@ -1209,6 +1296,7 @@ public class Zyxq_Activity extends BaseActivity {
                             postFile(filePath);
                             ly_style.setText("点击录音");
                             handler.removeCallbacks(runnable);
+                            popupWindow.dismiss();
                             endTime();
                         }
                     }else {
@@ -1228,7 +1316,6 @@ public class Zyxq_Activity extends BaseActivity {
             public void onDismiss() {
                 // popupWindow隐藏时恢复屏幕正常透明度
                 yjdpPop();
-                setBackgroundAlpha(1.0f);
             }
         });
     }

@@ -95,7 +95,9 @@ public class Zy_Rv_Wck_Fragment extends BaseFragment {
         }
 
     }
-
+    public void setNewdata(List<StudentCkEntity> studentCkEntities){
+        zy_wck_adapter.setNewData(studentCkEntities);
+    }
     @Override
     protected void initListener() {
 
@@ -120,7 +122,7 @@ public class Zy_Rv_Wck_Fragment extends BaseFragment {
 
     public void checkedAllStudent(boolean isAll) {
         Zyxq_Activity zyxq_activity = (Zyxq_Activity) FatherActivity;
-        if (zy_wck_adapter.getData().size() != 0) {
+        if (zy_wck_adapter.getData()!= null) {
             if (isAll) {
                 List<StudentCkEntity> data = zy_wck_adapter.getData();
                 for (int i = 0; i < data.size(); i++) {

@@ -42,6 +42,9 @@ public class Zy_Rv_ck_Fragment extends BaseFragment {
         FatherActivity = fatherActivity;
         this.Is_online = Is_online;
     }
+    public void setNewdata(List<StudentCkEntity> studentCkEntities){
+        zy_ck_adapter.setNewData(studentCkEntities);
+    }
     @Override
     protected void initView(View root) {
         zy_ck_adapter = new Zy_Ck_Adapter(R.layout.item_jxt_xq, commentListBean,Is_online);
@@ -101,18 +104,22 @@ public class Zy_Rv_ck_Fragment extends BaseFragment {
     }
     public  List<String> getCheckedId(){
         List<String> studentIds = new ArrayList<>();
-        List<StudentCkEntity> data = zy_ck_adapter.getData();
-        for (int i = 0; i <data.size() ; i++) {
-            if (data.get(i).isChecked()){
-                int id = data.get(i).getId();
-                studentIds.add(""+id);
+        if (zy_ck_adapter.getData()!=null){
+            List<StudentCkEntity> data = zy_ck_adapter.getData();
+            for (int i = 0; i <data.size() ; i++) {
+                if (data.get(i).isChecked()){
+                    int id = data.get(i).getId();
+                    studentIds.add(""+id);
+                }
             }
+            return studentIds;
+        }else {
+            return null;
         }
-        return studentIds;
     }
     public void checkedAllStudent(boolean isAll){
         Zyxq_Activity zyxq_activity = (Zyxq_Activity) FatherActivity;
-        if (zy_ck_adapter.getData().size()!=0){
+        if (zy_ck_adapter.getData()!=null){
             if (isAll){
                int x = 0;
                 List<StudentCkEntity> data = zy_ck_adapter.getData();

@@ -74,6 +74,7 @@
                 android:layout_marginLeft="@dimen/dp_20"
                 android:src="@mipmap/icon_play"/>
             <ImageView
+                android:visibility="gone"
                 android:id="@+id/lj_img"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"