通知3.23

@@ -67,7 +67,7 @@ public class Jxt_Class_Adapter extends BaseQuickAdapter<getClassPersonListEntity
                 x++;
             }
         }
-        student_num.setText("家长（"+x+"/"+item.getStudent().size()+"）");
+        student_num.setText("学生（"+x+"/"+item.getStudent().size()+"）");
         class_num.setText("成员"+x+"/"+item.getStudent().size());
         helper.addOnClickListener(R.id.show_re);
         class_recycler.setLayoutManager(new LinearLayoutManager(mContext));

@@ -358,6 +358,37 @@ public class JxttzEntity {
             public void setTeacher_name(String teacher_name) {
                 this.teacher_name = teacher_name;
             }
+
+            @Override
+            public String toString() {
+                return "DataBean{" +
+                        "type=" + type +
+                        ", id=" + id +
+                        ", create_time=" + create_time +
+                        ", title='" + title + '\'' +
+                        ", teacher_id='" + teacher_id + '\'' +
+                        ", class_id=" + class_id +
+                        ", date='" + date + '\'' +
+                        ", deadline=" + deadline +
+                        ", teacher_ids='" + teacher_ids + '\'' +
+                        ", parent_ids='" + parent_ids + '\'' +
+                        ", content='" + content + '\'' +
+                        ", student_id=" + student_id +
+                        ", leave_type=" + leave_type +
+                        ", start_date='" + start_date + '\'' +
+                        ", end_date='" + end_date + '\'' +
+                        ", day=" + day +
+                        ", parent_id=" + parent_id +
+                        ", status=" + status +
+                        ", is_online=" + is_online +
+                        ", type_text='" + type_text + '\'' +
+                        ", total_num=" + total_num +
+                        ", view_num=" + view_num +
+                        ", uncomment_num=" + uncomment_num +
+                        ", class_name='" + class_name + '\'' +
+                        ", teacher_name='" + teacher_name + '\'' +
+                        '}';
+            }
         }
     }
 }

@@ -65,6 +65,8 @@ import com.yinhebairong.clasmanage.m.M;
 import com.yinhebairong.clasmanage.network.ApiService;
 import com.yinhebairong.clasmanage.ui.jxt.activity.Fbzy_Activity;
 import com.yinhebairong.clasmanage.ui.jxt.activity.Jsbj_Activity;
+import com.yinhebairong.clasmanage.ui.jxt.activity.Jsbj_Activity_ViewBinding;
+import com.yinhebairong.clasmanage.ui.jxt.fragment.Jl.JsjlActivity;
 import com.yinhebairong.clasmanage.utils.AudioUtils;
 import com.yinhebairong.clasmanage.widget.CircularProgressBar;
 
@@ -159,7 +161,9 @@ public class FbtzA_ctivity extends BaseActivity {
     @Override
     protected void initData() {
         title = getIntent().getStringExtra("title");
+        Log.e("TagA", "initData:-----"+title);
         contextText = getIntent().getStringExtra("contextText");
+        Log.e("TagA", "initData: -------"+contextText);
         etTzzt.setText(title);
         contentEd.setText(contextText);
         audioAdapter = new AudioAdapter(R.layout.item_yinpin_layout, frequencyUrl);
@@ -178,7 +182,7 @@ public class FbtzA_ctivity extends BaseActivity {
             @Override
             public void onClick(View view) {
                 Intent intent = new Intent();
-                intent.setClass(FbtzA_ctivity.this, Jsbj_Activity.class);
+                intent.setClass(FbtzA_ctivity.this, JsjlActivity.class);
                 startActivityForResult(intent, STRAT_ID);
             }
         });
@@ -209,7 +213,7 @@ public class FbtzA_ctivity extends BaseActivity {
                                 video = TextUtils.join(",",videoUrl);
                                 links = TextUtils.join(",",links_list);
                                 Log.i("录音", "onClick: " + audio);
-                                Api().fbtz(Config.Token, classId, teacherIds, parentIds, content, content, tzmb_item.getCall(), tzmb_item.getInscription(), img, audio, video,links).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {
+                                Api().fbtz(Config.Token, classId, teacherIds, parentIds, name, content, tzmb_item.getCall(), tzmb_item.getInscription(), img, audio, video,links).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {
                                     @Override
                                     public void onSubscribe(Disposable d) {
 

@@ -117,7 +117,6 @@ public class Tzmb_Activity extends BaseActivity {
                     intent.setClass(mContext, TzmbxqActivity.class);
                     Bundle bundle = new Bundle();
                     bundle.putSerializable("tzmb_item",item.getItem().get(position));
-
                     intent.putExtras(bundle);
                     startActivity(intent);
                 }

@@ -3,6 +3,7 @@ package com.yinhebairong.clasmanage.ui.jxt.fragment.Tz;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -69,7 +70,9 @@ public class TzmbxqActivity extends BaseActivity {
                 intent.setClass(TzmbxqActivity.this, FbtzA_ctivity.class);
                 //模板数据带到发布页面展示
                 intent.putExtra("title",itemBean.getTitle());
+                Log.e("TagB", "onClick: "+itemBean.getTitle());
                 intent.putExtra("contextText",itemBean.getContent());
+                Log.e("TagB", "onClick: "+itemBean.getContent());
                 Bundle bundle = new Bundle();
                 bundle.putSerializable("tzmb_item", itemBean);
                 intent.putExtras(bundle);

@@ -41,6 +41,7 @@ import com.yinhebairong.clasmanage.entity.JxtImageEntity;
 import com.yinhebairong.clasmanage.entity.TzxqEntity;
 import com.yinhebairong.clasmanage.entity.VideoEntity;
 import com.yinhebairong.clasmanage.m.M;
+import com.yinhebairong.clasmanage.ui.jxt.activity.Zyxq_Activity;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -88,8 +89,7 @@ public class TzxqActivity extends BaseActivity {
     RecyclerView voiceRecycler;
     @BindView(R.id.img_recycle)
     RecyclerView imgRecycle;
-    @BindView(R.id.jlxq_rv2)
-    RecyclerView jlxqRv2;
+
 
 
 
@@ -117,9 +117,9 @@ public class TzxqActivity extends BaseActivity {
                     public void onNext(TzxqEntity tzxqEntity) {
                         if (tzxqEntity.getCode() == M.success){
                             tzTitleTv.setText(tzxqEntity.getData().getTitle());
+                            tzXqlist.setText(tzxqEntity.getData().getContent());
                             jlLsName.setText(tzxqEntity.getData().getTeacher_name());
                             jlBj.setText(tzxqEntity.getData().getClass_name());
-                            tzXqlist.setText(tzxqEntity.getData().getContent());
                             jlTime.setText(tzxqEntity.getData().getDate());
                             RequestOptions requestOptions = RequestOptions.circleCropTransform();
                             Glide.with(TzxqActivity.this).load(tzxqEntity.getData().getImages()).apply(requestOptions).into(jlxqImg);
@@ -150,7 +150,19 @@ public class TzxqActivity extends BaseActivity {
                             audio_adapter = new Audio_Adapter(R.layout.item_yinpin_layout, videoEntityList);
                             voiceRecycler.setLayoutManager(new LinearLayoutManager(TzxqActivity.this));
                             voiceRecycler.setAdapter(audio_adapter);
+                            List<String> images = tzxqEntity.getData().getImages();
+                            List<String> video = (List<String>) tzxqEntity.getData().getVideo();
                             List<JxtImageEntity> show_adapter = new ArrayList<>();
+                            if (show_adapter.size() != 0) {
+                                show_adapter.clear();
+                            } else {
+                                for (int i = 0; i < images.size(); i++) {
+                                    show_adapter.add(new JxtImageEntity(images.get(i), 1));
+                                }
+                                for (int i = 0; i < video.size(); i++) {
+                                    show_adapter.add(0, new JxtImageEntity(video.get(i), 2));
+                                }
+                            }
                             tzimgAdapter = new TzimgAdapter(R.layout.item_select_picture, show_adapter);
                             imgRecycle.setLayoutManager(new GridLayoutManager(TzxqActivity.this, 3));
                             imgRecycle.setAdapter(tzimgAdapter);
@@ -199,27 +211,25 @@ public class TzxqActivity extends BaseActivity {
     GSYVideoOptionBuilder gsyVideoOption;
     private boolean isPlay;
 
-    private void imgPop(List<JxtImageEntity> show_adapter, int position) {
-        this.pageSze = position;
+    private void imgPop(List<JxtImageEntity> imgList, int pageSze1) {
+        this.pageSze = pageSze1;
         View view = LayoutInflater.from(TzxqActivity.this).inflate(R.layout.pop_zpgl_image, null);
         ImageView pop_back = view.findViewById(R.id.pop_image_back);
         ImageView pop_img = view.findViewById(R.id.pop_zpgl_image_img);
         TextView pop_value = view.findViewById(R.id.pop_zpgl_image_value);
         player = view.findViewById(R.id.videoplay);
         View player_gs = view.findViewById(R.id.player_gs);
-
         player.getBackButton().setVisibility(View.GONE);
         gsyVideoOption = new GSYVideoOptionBuilder();
-
         // 初始值
-        pop_value.setText((pageSze + 1) + "/" + show_adapter.size());
-        if (show_adapter.get(position).getType() == 2) {
+        pop_value.setText((pageSze + 1) + "/" + imgList.size());
+        if (imgList.get(pageSze1).getType() == 2) {
             pop_img.setVisibility(View.GONE);
             player.setVisibility(View.VISIBLE);
             player_gs.setVisibility(View.VISIBLE);
-            setplay(gsyVideoOption, show_adapter.get(position).getPath());
+            setplay(gsyVideoOption, imgList.get(pageSze1).getPath());
         } else {
-            M.Glide(show_adapter.get(pageSze).getPath(), pop_img, activity);
+            M.Glide(imgList.get(pageSze).getPath(), pop_img, activity);
         }
 
         // 弹窗
@@ -228,7 +238,6 @@ public class TzxqActivity extends BaseActivity {
         popupWindow.setTouchable(true);
         popupWindow.setFocusable(true);
         popupWindow.setBackgroundDrawable(getResources().getDrawable(R.color.color_tm));
-
         popupWindow.showAsDropDown(view);
 
         // back
@@ -265,7 +274,7 @@ public class TzxqActivity extends BaseActivity {
                         if ((x2 - x1) > (width / 3)) {
                             if ((pageSze - 1) >= 0) {
                                 pageSze--;
-                                if (show_adapter.get(pageSze).getType() == 2) {
+                                if (imgList.get(pageSze).getType() == 2) {
                                     pop_img.setVisibility(View.GONE);
                                     pop_img.setVisibility(View.GONE);
                                     player.setVisibility(View.VISIBLE);
@@ -273,24 +282,24 @@ public class TzxqActivity extends BaseActivity {
                                     if (gsyVideoOption == null) {
                                         gsyVideoOption = new GSYVideoOptionBuilder();
                                     }
-                                    setplay(gsyVideoOption, show_adapter.get(pageSze).getPath());
-                                    pop_value.setText((pageSze + 1) + "/" + show_adapter.size());
+                                    setplay(gsyVideoOption, imgList.get(pageSze).getPath());
+                                    pop_value.setText((pageSze + 1) + "/" + imgList.size());
                                 } else {
                                     pop_img.setVisibility(View.VISIBLE);
                                     player.setVisibility(View.GONE);
                                     player_gs.setVisibility(View.GONE);
-                                    M.Glide(show_adapter.get(pageSze).getPath(), pop_img, activity);
-                                    pop_value.setText((pageSze + 1) + "/" + show_adapter.size());
+                                    M.Glide(imgList.get(pageSze).getPath(), pop_img, activity);
+                                    pop_value.setText((pageSze + 1) + "/" + imgList.size());
                                 }
 
-                                M.log("video", show_adapter.get(pageSze));
+                                M.log("video", imgList.get(pageSze));
                             } else {
                                 M.toast(activity, "已是第一页");
                             }
                         } else if ((x1 - x2) > (width / 3)) {
-                            if ((pageSze + 1) < show_adapter.size()) {
+                            if ((pageSze + 1) < imgList.size()) {
                                 pageSze++;
-                                if (show_adapter.get(pageSze).getType() == 2) {
+                                if (imgList.get(pageSze).getType() == 2) {
                                     pop_img.setVisibility(View.GONE);
                                     pop_img.setVisibility(View.GONE);
                                     player.setVisibility(View.VISIBLE);
@@ -298,14 +307,14 @@ public class TzxqActivity extends BaseActivity {
                                     if (gsyVideoOption == null) {
                                         gsyVideoOption = new GSYVideoOptionBuilder();
                                     }
-                                    setplay(gsyVideoOption, show_adapter.get(pageSze).getPath());
-                                    pop_value.setText((pageSze + 1) + "/" + show_adapter.size());
+                                    setplay(gsyVideoOption, imgList.get(pageSze).getPath());
+                                    pop_value.setText((pageSze + 1) + "/" + imgList.size());
                                 } else {
                                     pop_img.setVisibility(View.VISIBLE);
                                     player.setVisibility(View.GONE);
                                     player_gs.setVisibility(View.GONE);
-                                    M.Glide(show_adapter.get(pageSze).getPath(), pop_img, activity);
-                                    pop_value.setText((pageSze + 1) + "/" + show_adapter.size());
+                                    M.Glide(imgList.get(pageSze).getPath(), pop_img, activity);
+                                    pop_value.setText((pageSze + 1) + "/" + imgList.size());
                                 }
 
                             } else {
@@ -317,6 +326,7 @@ public class TzxqActivity extends BaseActivity {
                 return true;
             }
         });
+
     }
 
     private void setplay(GSYVideoOptionBuilder gsyVideoOption, String path) {

@@ -276,13 +276,20 @@ public class Tz_Rv_Fragment extends BaseFragment {
             LinearLayout ck_lin = helper.itemView.findViewById(R.id.ck_lin);
             leixing_text.setText("通知");
             title.setText(item.getTitle());
+            Log.e("TagE", "getTitle: ------"+item.getTitle());
             content_tv.setText(item.getContent());
+            Log.e("TagE", "convert: --------"+item.getContent());
             class_tv.setText(item.getClass_name());
             teacher_tv.setText(item.getTeacher_name());
             date_tv.setText(item.getDate());
             yellow_tv.setText(item.getView_num() + "");
             gray_tv.setText("/" + item.getTotal_num());
             state_text.setVisibility(View.GONE);
+            if (item.getUncomment_num().equals("")){
+                massage_num.setVisibility(View.GONE);
+            }else {
+                massage_num.setText(item.getUncomment_num()+"");
+            }
             if (item.getIs_online() ==0){
                 state_tv.setText("已查看");
             }else {

@@ -172,7 +172,7 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
 
     // lv
 
-    int ChA;  // 这个标记, 用来区分点击右边日期的时候 , 选中状态
+//    int ChA;  // 这个标记, 用来区分点击右边日期的时候 , 选中状态
     int year, monthx;   // 系统时间  月选择的时候 , 用来确定所选时间小于等于当前时间
 
     List<PjfxIntentEntity> intArr = new ArrayList<>();
@@ -219,19 +219,17 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
 
     }
 
-    // historgram item click show popwindow
-    public void setclick(int pos, int[] startLocation) {
-        M.log("startLocation", startLocation[0] + "--" + startLocation[1]);
-        charListenerPop(startLocation[0], startLocation[1], pos, 1);
-    }
 
     //   ---------------------------------------------------------------------------------------------------------------------------------------------------------
     //   ---------------------------------------------------   主界面逻辑   ---------------------------------------------------------------------------------------
     //   ---------------------------------------------------------------------------------------------------------------------------------------------------------
 
     //   ---------------------------------------------------   下拉框   --------------------------------------------------------------------
+    View view;
+     PopupWindow popupWindow;
+    RecyclerView dropRv;
     private void showDrop() {
-        View view = LayoutInflater.from(PjfxActivity.this).inflate(R.layout.pop_time_choose, null);
+         view = LayoutInflater.from(PjfxActivity.this).inflate(R.layout.pop_time_choose, null);
 
         // 时间选择器 - 月
         DatePickerView picker = view.findViewById(R.id.time_choose_picker);
@@ -244,9 +242,11 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
         lis.setAdapter(listAdapter);
 
         // 周
-        RecyclerView rv = view.findViewById(R.id.time_choose_rv);
+        dropRv = view.findViewById(R.id.time_choose_rv);
+        setRv(dropRv, 0, 0, 3);
+
         if (level.getValue() == -1) {
-            setDate(rv, 0, 3, 0);  // 初始化
+            setDate();  // 初始化
         }
 
         // 学年
@@ -257,7 +257,7 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
         WheelItemView wheel1 = view.findViewById(R.id.wheelitem1);
         WheelItemView wheel2 = view.findViewById(R.id.wheelitem2);
 
-        final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
+        popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
         popupWindow.setOutsideTouchable(true);
         popupWindow.setTouchable(true);
         popupWindow.setFocusable(true);
@@ -282,19 +282,18 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
             // 1 , 2 , 3 , 4  - > 周 , 月 , 学期 , 学年
             switch (level.getKey()) {
                 case 1:   // 周
-//                    timeChooseSure.setBackground(montchos);   // 未超过当前时间显示黄色
-//                    timeChooseSure.setClickable(true);
                     level.setKey(1);
-                    rv.setVisibility(View.VISIBLE);
+                    dropRv.setVisibility(View.VISIBLE);
                     wheel_linear.setVisibility(View.GONE);
                     picker.setVisibility(View.GONE);
-                    setDate(rv, 0, 3, 1);   // level.getKey()
+                    setDate();   // level.getKey()
                     break;
                 case 2:   // 月
+
                     level.setKey(2);
                     picker.setVisibility(View.VISIBLE);
                     wheel_linear.setVisibility(View.GONE);
-                    rv.setVisibility(View.GONE);
+                    dropRv.setVisibility(View.GONE);
                     wheel3.setVisibility(View.GONE);
                     if (level.getMonth() != null) {
                         picker.setDate(level.getMonth()[0], level.getMonth()[1]);  // 数据
@@ -302,25 +301,26 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
 
                     break;
                 case 3:   // 学期
+
                     level.setKey(3);
                     wheel_linear.setVisibility(View.VISIBLE);
-                    rv.setVisibility(View.GONE);
+                    dropRv.setVisibility(View.GONE);
                     picker.setVisibility(View.GONE);
                     wheel3.setVisibility(View.GONE);
 
                     if (level.getSchYear() != null) {
                         setXqData(wheel1, wheel2, level.getSchYear()[0]);
-                        M.log("getSchYear55", level.getSchYear()[0] + "--" + level.getSchYear()[1]);
                         wheel1.setSelectedIndex(level.getSchYear()[0]);
                         wheel2.setSelectedIndex(level.getSchYear()[1]);
                     } else {
                         setXqData(wheel1, wheel2, 0);
                     }
+
                     break;
                 case 4:   // 学年
                     level.setKey(4);
                     wheel_linear.setVisibility(View.GONE);
-                    rv.setVisibility(View.GONE);
+                    dropRv.setVisibility(View.GONE);
                     picker.setVisibility(View.GONE);
                     wheel3.setVisibility(View.VISIBLE);
                     setXnData(wheel3);
@@ -342,16 +342,15 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                         timeChooseSure.setClickable(true);
                         level.setKey(1);
                         wheel_linear.setVisibility(View.GONE);
-                        rv.setVisibility(View.VISIBLE);
+                        dropRv.setVisibility(View.VISIBLE);
                         picker.setVisibility(View.GONE);
                         wheel3.setVisibility(View.GONE);
-                        setDate(rv, 0, 3, 1);   // 最后一位是 判断什么标记
-
+                        setDate();   // 最后一位是 判断什么标记
                         break;
                     case 1:   // 月
                         level.setKey(2);
                         picker.setVisibility(View.VISIBLE);
-                        rv.setVisibility(View.GONE);
+                        dropRv.setVisibility(View.GONE);
                         wheel3.setVisibility(View.GONE);
                         wheel_linear.setVisibility(View.GONE);
 
@@ -364,7 +363,6 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                             timeChooseSure.setBackground(montchos_no);   // 超过当前时间显示灰色
                             timeChooseSure.setClickable(false);
                         }
-
                         break;
                     case 2:    // 学期
                         timeChooseSure.setBackground(montchos);   // 未超过当前时间显示黄色
@@ -372,10 +370,12 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
 
                         level.setKey(3);
                         wheel_linear.setVisibility(View.VISIBLE);
-                        rv.setVisibility(View.GONE);
+                        dropRv.setVisibility(View.GONE);
                         picker.setVisibility(View.GONE);
                         wheel3.setVisibility(View.GONE);
-                        setXqData(wheel1, wheel2, 0);
+
+                        setXqData(wheel1, wheel2, 0);  // 数据
+
                         break;
                     case 3:   // 学年
                         timeChooseSure.setBackground(montchos);   // 未超过当前时间显示黄色
@@ -383,7 +383,7 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
 
                         level.setKey(4);
                         wheel_linear.setVisibility(View.GONE);
-                        rv.setVisibility(View.GONE);
+                        dropRv.setVisibility(View.GONE);
                         picker.setVisibility(View.GONE);
                         wheel3.setVisibility(View.VISIBLE);
                         setXnData(wheel3);
@@ -423,67 +423,37 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
             level.setXnVal(selectedIndex);
             level.setXnYear(selectedIndex + "");
         });
+
         // 恢复默认
         timeChooseHfmr.setOnClickListener(v -> {
 
             switch (level.getKey()) {
                 case 1:   // 周
-                    // 不是周或者学期的设置空值
-                    level.setMonth(null);
-                    level.setSchYear(null);  // 学期标记
-                    level.setXnYear("");   // 学年标记
-                    level.setKey(1);
-                    date();
-                    setDate(rv, 0, 3, 0);   // level.getKey()
+                    date(0);
                     break;
                 case 2:   // 月
                     picker.setDate(year, monthx);   // 系统时间设置数据
-                    // 不是月的设置空值
-                    int mothV = (year > picker.getSelectDate()[0]) || (year == picker.getSelectDate()[0] && monthx >= picker.getSelectDate()[1]) == true ? 0 : 1;
-                    if (mothV == 0) {
-                        level.setValue(-1);
-                        level.setSchYear(null);
-                        level.setMonth(picker.getSelectDate());
-                        level.setMonth_value(picker.getSelectDate()[0] + "");
-                        level.setXnYear("");   // 学年标记
-                        ChA = 1000;  // 清理周 , 学期 , 学年标记
-                        level.setKey(2);
-                    } else {
-                        M.toast(activity, "操作无效");
-                    }
-
-                    M.log("Months", picker.getSelectDate()[0] + "--" + picker.getSelectDate()[1]);
                     break;
                 case 3:   // 学期
 
-                    // 将标记变为初始
-                    level.setSchYear(new int[]{0, 0});
-                    setXqData(wheel1, wheel2, level.getSchYear()[0]);
-
-                    wheel1.setSelectedIndex(level.getSchYear()[0]);
-                    wheel2.setSelectedIndex(level.getSchYear()[1]);
-
-                    // 不是学期的设置空值
-                    level.setValue(-1);
-                    level.setMonth(null);
-                    level.setXnYear("");   // 学年标记
-                    ChA = 1000;  // 清理周标记
-                    level.setKey(3);
-
-                    int val;   // 刷新列表的时候使用
-
+                    date(1);
                     if (level.getSchYear() != null) {
-                        val = xnList.get(level.getSchYear()[0]).getItemBeans().get(level.getSchYear()[1]).getValues();
-                        data(level.getKey() + "", val + "");
-                        ChooseXnLevel xnlevel = xnList.get(level.getSchYear()[0]);
-                        level.setSchVal(val);   // 就一个地方用到
+                        setXqData(wheel1, wheel2, level.getSchYear()[0]);
                     } else {
-                        val = xnList.get(0).getItemBeans().get(0).getValues();
-                        data(level.getKey() + "", val + "");
-                        ChooseXnLevel xnlevel = xnList.get(0);
+                        setXqData(wheel1, wheel2, 0);
+                    }
 
-                        level.setSchVal(val);   // 就一个地方用到
-                        level.setSchYear(new int[]{0, 0});
+                    // 下面是默认选中位置
+                    for (int i = 0; i < xnList.size(); i++) {
+                        if (xnList.get(i).getChecked() == 1) {
+                            wheel1.setSelectedIndex(i);
+                        }
+                        List<ChooseXnLevel.ItemBeans> itemBeans = xnList.get(i).getItemBeans();
+                        for (int j = 0; j < itemBeans.size(); j++) {
+                            if (itemBeans.get(j).getChecked() == 1) {
+                                wheel2.setSelectedIndex(j);
+                            }
+                        }
                     }
 
                     break;
@@ -492,16 +462,8 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                     // 恢复初始值
                     level.setXnYear(0 + "");
                     wheel3.setSelectedIndex(0);
-
                     level.setXnVal(0); // 下次进来之后选择器得默认值
-
                     // 不是学年的设置空值
-                    level.setValue(-1);
-                    level.setMonth(null);
-                    ChA = 1000;  // 清理周
-                    level.setSchYear(null);  // 学期
-                    level.setKey(4);
-                    level.setXnYearName(arr.get(1).get(xnIndex).getName());
 
                     break;
             }
@@ -516,9 +478,9 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                 switch (level.getKey()) {
                     case 1:   // 周
                         // 不是周或者学期的设置空值
-                        level.setMonth(null);
-                        level.setSchYear(null);  // 学期标记
-                        level.setXnYear("");   // 学年标记
+//                        level.setMonth(null);
+//                        level.setSchYear(null);  // 学期标记
+//                        level.setXnYear("");   // 学年标记
                         level.setKey(1);
 
                         if (level.getKey() == 0 || level.getValue() == 1000) {
@@ -534,12 +496,10 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                         // 不是月的设置空值
                         int mothV = (year > picker.getSelectDate()[0]) || (year == picker.getSelectDate()[0] && monthx >= picker.getSelectDate()[1]) == true ? 0 : 1;
                         if (mothV == 0) {
-                            level.setValue(-1);
-                            level.setSchYear(null);
+//                            level.setSchYear(null);
                             level.setMonth(picker.getSelectDate());
                             level.setMonth_value(picker.getSelectDate()[0] + "");
-                            level.setXnYear("");   // 学年标记
-                            ChA = 1000;  // 清理周 , 学期 , 学年标记
+//                            level.setXnYear("");   // 学年标记
                             level.setKey(2);
                             data(level.getKey() + "", picker.getSelectDate()[0] + "-" + picker.getSelectDate()[1]);
                             changeUI(false, "本月", "某月", picker.getSelectDate()[0] + "-" + picker.getSelectDate()[1], "本月得分", "上月得分");   // 这里第二个参数无用
@@ -551,10 +511,8 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                         break;
                     case 3:   // 学期
                         // 不是学期的设置空值
-                        level.setValue(-1);
-                        level.setMonth(null);
-                        level.setXnYear("");   // 学年标记
-                        ChA = 1000;  // 清理周标记
+//                        level.setMonth(null);
+//                        level.setXnYear("");   // 学年标记
                         level.setKey(3);
 
                         int val;   // 刷新列表的时候使用
@@ -580,11 +538,8 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                         break;
                     case 4:   // 学年
 
-                        // 不是学年的设置空值
-                        level.setValue(-1);
-                        level.setMonth(null);
-                        ChA = 1000;  // 清理周
-                        level.setSchYear(null);  // 学期
+//                        level.setMonth(null);
+//                        level.setSchYear(null);  // 学期
                         level.setKey(4);
 
                         xnIndex = wheel3.getSelectedIndex();
@@ -606,6 +561,7 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
         });
 
     }
+
     // 确定之后更换页面数据 -- 这里主要是 为了稍微整理一下代码 , 方便到时候统一管理
     private void changeUI(boolean lx, String... par) {   // lx 用来区分 周 , (月 , 学期 , 学年)   因为除了周有两条折线 , 别的之后一条
         pjfx_value.setText(par[2]);
@@ -613,16 +569,6 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
         sj_title.setText(par[3]);
         sj_score.setText(par[4]);
 
-        // 顺序留作参考
-//        bz.setText("本周");
-//        xz.setText("上周");
-//        pjfx_value.setText("按周查看");
-//        sj_title.setText("本周得分");
-//        sj_score.setText("上周得分");
-//        bz.setText("本月");
-//        pjfx_value.setText("按月查看");
-//        sj_title.setText("本月得分");
-//        sj_score.setText("上月得分");
     }
 
     // 提供给弹窗  - > 学年  - >  控件设置数据
@@ -654,39 +600,19 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
         wheelB.setItems(child);
     }
 
+    dataAdapter adapter;    // level.getValue  , 上面如果选中月 , 学期 , 学年 , 确定之后会将 level.getValue == - 1 , 这样下次进入周的时候, 就不会出现默认值了
     // 提供给弹窗的adapter  - > 周  - >  控件设置数据
-    private void setDate(RecyclerView rv, int page, int count, int tag) {   // tag - > 周
-        M.log("checkValue111", level.getValue() + "");
+    private void setDate() {   // tag - > 周
         if (items.size() > 0) {
             items.clear();
         }
         if (arr.size() > 0) {
-            items.addAll(arr.get(page));   // 数据源
-
-            setRv(rv, 0, 0, count);
-            dataAdapter adapter;    // level.getValue  , 上面如果选中月 , 学期 , 学年 , 确定之后会将 level.getValue == - 1 , 这样下次进入周的时候, 就不会出现默认值了
-            if (level.getValue() != -1) {
-                for (int i = 0; i < items.size(); i++) {
-                    if (items.get(i).isChecked() == 1) {
-                        if (level.getValue() == 1000) {
-                            level.setValue(i);
-                        }
-                        M.log("checkValue222", level.getValue() + "");
-                    }
-                }
-                adapter = new dataAdapter(R.layout.item_date, items, items.get(level.getValue()).getValue());
+            items.addAll(arr.get(0));   // 数据源
+
+            M.log("checkValue222", level.getValue() + "");
+            adapter = new dataAdapter(R.layout.item_date, items, items.get(level.getValue()).getValue());
+            dropRv.setAdapter(adapter);
 
-            } else {
-                adapter = new dataAdapter(R.layout.item_date, items, -1);
-            }
-            rv.setAdapter(adapter);
-            if (level.getValue() != 1000 && items.size() > level.getValue()) {
-                if (tag == ChA) {
-                    adapter.change(items.get(level.getValue()).getValue() + "");
-                    adapter.notifyDataSetChanged();
-                    M.log("checkValue333", level.getValue() + "");
-                }
-            }
             // right 时间选择 周
             adapter.setOnItemChildClickListener((adapter1, view1, position) -> {
                 switch (view1.getId()) {
@@ -694,7 +620,6 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                         adapter.change(items.get(position).getValue() + "", 1000);
                         adapter.notifyDataSetChanged();
                         level.setValue(position);
-                        ChA = level.getKey();   // 选中的时候保存, 点击标记 , setDate()方法再次执行的时候, 区分选中状态
                         M.log("checkValue444", level.getValue() + "");
                 }
             });
@@ -1018,9 +943,11 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
     }
 
     //   ----------------------------------------------------------   日期   --------------------------------------------------------------------
-    private void date() {      //  这里的  List<DateLevel> list 是一个败笔 , 因为一开始的时候数据是全部一致 , 我为了统一管理 , 后来改数据之后 , 觉得有点蠢 , 但是没时间改
+    private void date() {
         Api().dateList(Config.Token).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {
             arr.clear();
+            xnList.clear();
+
             if (data.getCode() == M.success) {
                 List<DateLevel> list = new ArrayList<>();    // 周
                 List<DateLevel> lis1 = new ArrayList<>();   // 学年
@@ -1052,7 +979,7 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
                 /* 这个破地方 , 如果用数据结构写 , 就这bi样, 我觉得用双map 可能会更好一些 */
                 List<DateEntity.DataBean.YearTermBean> year_term = data.getData().getYear_term();
                 for (int i = 0; i < year_term.size(); i++) {
-                    ChooseXnLevel chooseXnLevel = new ChooseXnLevel(year_term.get(i).getValue(), year_term.get(i).getName() + "");
+                    ChooseXnLevel chooseXnLevel = new ChooseXnLevel(year_term.get(i).getValue(), year_term.get(i).getName() + "", year_term.get(i).isChecked());
                     List<ChooseXnLevel.ItemBeans> level = new ArrayList<>();
 
                     List<DateEntity.DataBean.YearTermBean.ItemBean> item = year_term.get(i).getItem();
@@ -1075,6 +1002,73 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
         });
     }
 
+    private void date(int isReched) {      //  这里的  List<DateLevel> list 是一个败笔 , 因为一开始的时候数据是全部一致 , 我为了统一管理 , 后来改数据之后 , 觉得有点蠢 , 但是没时间改
+        Api().dateList(Config.Token).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {
+            if (data.getCode() == M.success) {
+
+                if (isReched == 0) {
+                    arr.clear();
+
+                    List<DateLevel> list = new ArrayList<>();    // 周
+                    List<DateLevel> lis1 = new ArrayList<>();   // 学年
+
+                    List<DateEntity.DataBean.WeekBean> week = data.getData().getWeek();
+                    List<DateEntity.DataBean.YearBean> year = data.getData().getYear();
+
+                    for (int i = 0; i < week.size(); i++) {
+                        list.add(new DateLevel(week.get(i).getValue(), week.get(i).getName() + "", week.get(i).getChecked()));
+                        if (i == week.size() - 1) {
+                            arr.add(list);
+                        }
+                        if (week.get(i).getChecked() == 1) {   // 默认选中的值
+                            level.setKey(1);
+                            level.setValue(i);
+                        }
+                    }
+
+                    for (int i = 0; i < year.size(); i++) {
+                        lis1.add(new DateLevel(year.get(i).getValue(), year.get(i).getName() + "", 0));
+                        if (i == year.size() - 1) {
+                            arr.add(lis1);
+                        }
+                    }
+
+                    pjfx_value.setText("第" + arr.get(0).get(level.getValue()).getValue() + "周");   // 默认当前周
+                    setDate();   // level.getKey()
+
+                } else {
+
+                    xnList.clear();
+                    // 这是学期的数据
+                    /* 这个破地方 , 如果用数据结构写 , 就这bi样, 我觉得用双map 可能会更好一些 */
+                    List<DateEntity.DataBean.YearTermBean> year_term = data.getData().getYear_term();
+                    for (int i = 0; i < year_term.size(); i++) {
+                        ChooseXnLevel chooseXnLevel = new ChooseXnLevel(year_term.get(i).getValue(), year_term.get(i).getName() + "", year_term.get(i).isChecked());
+                        List<ChooseXnLevel.ItemBeans> level = new ArrayList<>();
+
+                        List<DateEntity.DataBean.YearTermBean.ItemBean> item = year_term.get(i).getItem();
+
+                        for (int k = 0; k < year_term.get(i).getItem().size(); k++) {
+                            ChooseXnLevel.ItemBeans itemBeans = new ChooseXnLevel.ItemBeans();
+                            itemBeans.setValues(item.get(k).getValue());
+                            itemBeans.setNames(item.get(k).getName() + "");
+                            itemBeans.setChecked(item.get(k).isChecked());
+
+                            level.add(itemBeans);
+                            chooseXnLevel.setItemBeans(level);
+                        }
+
+                        xnList.add(chooseXnLevel);
+                    }
+
+                }
+
+            } else if (data.getCode() == 401) {
+                ApiError.refreshToken();
+            }
+        });
+    }
+
     //   ---------------------------------------------------------------------------------------------------------------------------------------------------------
     //   ---------------------------------------------------   图表   ---------------------------------------------------------------------------------------
     //   ---------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -1093,7 +1087,6 @@ public class PjfxActivity extends BaseActivity implements OnChartValueSelectedLi
 
         chart = this.findViewById(R.id.chat_1);
         lineChartManager1 = new LineChartManager(chart);
-        chart.setOnChartValueSelectedListener(this);
         // 数据
         data("", ""); // 刚进来的时候留一个默认值
     }

@@ -385,7 +385,7 @@ public class PjfxActivity_per extends BaseActivity {
 
         switch (type) {
             case 0:   // LineChar
-                week.setText(xaxis.get(iEnty)+"");
+                week.setText(xaxis.get(iEnty) + "");
                 week.setVisibility(View.VISIBLE);
                 break;
             case 1:   // Historgram
@@ -550,40 +550,45 @@ public class PjfxActivity_per extends BaseActivity {
 
     // 日期弹窗
     //   ---------------------------------------------------   日期下拉框   --------------------------------------------------------------------
+    View dropview;
+    PopupWindow dropPop;
+    RecyclerView dropRv;
     private void showDrop() {
-        View view = LayoutInflater.from(PjfxActivity_per.this).inflate(R.layout.pop_time_choose, null);
+        dropview = LayoutInflater.from(PjfxActivity_per.this).inflate(R.layout.pop_time_choose, null);
 
         // 时间选择器 - 月
-        DatePickerView picker = view.findViewById(R.id.time_choose_picker);
-        TextView timeChooseHfmr = view.findViewById(R.id.time_choose_hfmr);
-        TextView timeChooseSure = view.findViewById(R.id.time_choose_sure);   // 确定
+        DatePickerView picker = dropview.findViewById(R.id.time_choose_picker);
+        TextView timeChooseHfmr = dropview.findViewById(R.id.time_choose_hfmr);
+        TextView timeChooseSure = dropview.findViewById(R.id.time_choose_sure);   // 确定
 
         // left 选 周 , 月 , 学期 , 学年
-        ListView lis = view.findViewById(R.id.grid_two);
+        ListView lis = dropview.findViewById(R.id.grid_two);
         listAdapter listAdapter = new listAdapter(listArr);
         lis.setAdapter(listAdapter);
 
         // 周
-        RecyclerView rv = view.findViewById(R.id.time_choose_rv);
+        dropRv = dropview.findViewById(R.id.time_choose_rv);
+        setRv(dropRv, 0, 0, 3);
+
         if (getIntent().getSerializableExtra(M.XspjKey) == null) {
-            setDate(rv, 0, 3, 0);  // 初始化
+            setDate();  // 初始化
         }
 
         // 学年
-        WheelItemView wheel3 = view.findViewById(R.id.wheelitem3);
+        WheelItemView wheel3 = dropview.findViewById(R.id.wheelitem3);
 
         // 学期
-        LinearLayout wheel_linear = view.findViewById(R.id.poptime_choose_wheel);
-        WheelItemView wheel1 = view.findViewById(R.id.wheelitem1);
-        WheelItemView wheel2 = view.findViewById(R.id.wheelitem2);
-
-        final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
-        popupWindow.setOutsideTouchable(true);
-        popupWindow.setTouchable(true);
-        popupWindow.setFocusable(true);
-        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.color.color_tm));
-        popupWindow.setAnimationStyle(R.style.AnimTopMiddle);
-        popupWindow.showAsDropDown(line4);
+        LinearLayout wheel_linear = dropview.findViewById(R.id.poptime_choose_wheel);
+        WheelItemView wheel1 = dropview.findViewById(R.id.wheelitem1);
+        WheelItemView wheel2 = dropview.findViewById(R.id.wheelitem2);
+
+        dropPop = new PopupWindow(dropview, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
+        dropPop.setOutsideTouchable(true);
+        dropPop.setTouchable(true);
+        dropPop.setFocusable(true);
+        dropPop.setBackgroundDrawable(getResources().getDrawable(R.color.color_tm));
+        dropPop.setAnimationStyle(R.style.AnimTopMiddle);
+        dropPop.showAsDropDown(line4);
 
         // 月默认时间
         int[] month = level.getMonth();
@@ -602,26 +607,27 @@ public class PjfxActivity_per extends BaseActivity {
             switch (level.getKey()) {
                 case 1:   // 周
                     level.setKey(1);
-                    rv.setVisibility(View.VISIBLE);
+                    dropRv.setVisibility(View.VISIBLE);
                     wheel_linear.setVisibility(View.GONE);
                     picker.setVisibility(View.GONE);
-                    setDate(rv, 0, 3, 1);   // level.getKey()
+                    setDate();   // level.getKey()
                     break;
                 case 2:   // 月
                     level.setKey(2);
                     picker.setVisibility(View.VISIBLE);
                     wheel_linear.setVisibility(View.GONE);
-                    rv.setVisibility(View.GONE);
+                    dropRv.setVisibility(View.GONE);
                     wheel3.setVisibility(View.GONE);
                     if (level.getMonth() != null) {
                         picker.setDate(level.getMonth()[0], level.getMonth()[1]);  // 数据
                     }
                     break;
                 case 3:   // 学期
+
                     level.setKey(3);
 
                     wheel_linear.setVisibility(View.VISIBLE);
-                    rv.setVisibility(View.GONE);
+                    dropRv.setVisibility(View.GONE);
                     picker.setVisibility(View.GONE);
                     wheel3.setVisibility(View.GONE);
 
@@ -632,11 +638,12 @@ public class PjfxActivity_per extends BaseActivity {
                     } else {
                         setXqData(wheel1, wheel2, 0);
                     }
+
                     break;
                 case 4:   // 学年
                     level.setKey(4);
                     wheel_linear.setVisibility(View.GONE);
-                    rv.setVisibility(View.GONE);
+                    dropRv.setVisibility(View.GONE);
                     picker.setVisibility(View.GONE);
                     wheel3.setVisibility(View.VISIBLE);
                     setXnData(wheel3);
@@ -660,17 +667,17 @@ public class PjfxActivity_per extends BaseActivity {
                         timeChooseSure.setClickable(true);
                         level.setKey(1);
                         wheel_linear.setVisibility(View.GONE);
-                        rv.setVisibility(View.VISIBLE);
+                        dropRv.setVisibility(View.VISIBLE);
                         picker.setVisibility(View.GONE);
                         wheel3.setVisibility(View.GONE);
 
-                        setDate(rv, 0, 3, 1);   // 最后一位是 判断什么标记
+                        setDate();   // 最后一位是 判断什么标记
                         break;
                     case 1:   // 月
 
                         level.setKey(2);
                         picker.setVisibility(View.VISIBLE);
-                        rv.setVisibility(View.GONE);
+                        dropRv.setVisibility(View.GONE);
                         wheel3.setVisibility(View.GONE);
                         wheel_linear.setVisibility(View.GONE);
 
@@ -691,7 +698,7 @@ public class PjfxActivity_per extends BaseActivity {
                         timeChooseSure.setClickable(true);
                         level.setKey(3);
                         wheel_linear.setVisibility(View.VISIBLE);
-                        rv.setVisibility(View.GONE);
+                        dropRv.setVisibility(View.GONE);
                         picker.setVisibility(View.GONE);
                         wheel3.setVisibility(View.GONE);
 
@@ -703,7 +710,7 @@ public class PjfxActivity_per extends BaseActivity {
                         timeChooseSure.setClickable(true);
                         level.setKey(4);
                         wheel_linear.setVisibility(View.GONE);
-                        rv.setVisibility(View.GONE);
+                        dropRv.setVisibility(View.GONE);
                         picker.setVisibility(View.GONE);
                         wheel3.setVisibility(View.VISIBLE);
 
@@ -715,7 +722,6 @@ public class PjfxActivity_per extends BaseActivity {
             }
         });
 
-
         // 月的时间选择器
         picker.addOnSelectedChangingListener((oldValue, newValue) -> {   // 0 - > 年 | 1 - > 月
 
@@ -756,68 +762,36 @@ public class PjfxActivity_per extends BaseActivity {
         timeChooseHfmr.setOnClickListener(v -> {
             switch (level.getKey()) {
                 case 1:   // 周
-                    setDate(rv, 0, 3, 0);   // level.getKey()
-
-                    level.setMonth(null);
-                    level.setSchYear(null);  // 学期标记
-                    level.setXnYear("");   // 学年标记
-
-                    date();
-                    setDate(rv, 0, 3, 0);   // level.getKey()
-//                    if (level.getKey() == 0 || level.getValue() == 1000) {
-//                        tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), "", "");
-//                    } else {
-//                        requestValue = items.get(level.getValue()).getValue() + "";
-//                        tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), level.getKey() + "", requestValue);
-//                    }
-//                    changeUI(true, "本周", "上周", "第" + arr.get(0).get(level.getValue()).getValue() + "周", "本周得分", "上周得分");
+                    date(0);
                     break;
                 case 2:   // 月
                     picker.setDate(year, monthx);   // 系统时间设置数据
-
-                    int mothV = (year > picker.getSelectDate()[0]) || (year == picker.getSelectDate()[0] && monthx >= picker.getSelectDate()[1]) == true ? 0 : 1;
-                    if (mothV == 0) {
-                        // 不是月的设置空值
-                        level.setValue(-1);
-                        level.setSchYear(null);
-                        level.setXnYear("");   // 学年标记
-                        ChA = 1000;  // 清理周 , 学期 , 学年标记
-//                        tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), level.getKey() + "", picker.getSelectDate()[0] + "-" + picker.getSelectDate()[1]);
-//                        changeUI(false, "本月", "某月", picker.getSelectDate()[0] + "-" + picker.getSelectDate()[1], "本月得分", "上月得分");     // 这里第二个参数无用
-
-//                        popupWindow.dismiss();
-
-                    } else {
-                        M.toast(activity, "操作无效");
-                    }
-
                     break;
                 case 3:   // 学期
 
-                    // 将标记变为初始
-                    level.setSchYear(new int[]{0, 0});
-                    setXqData(wheel1, wheel2, level.getSchYear()[0]);
+                    date(1);
+                    if (level.getSchYear() != null) {
+                        setXqData(wheel1, wheel2, level.getSchYear()[0]);
+                    } else {
+                        setXqData(wheel1, wheel2, 0);
+                    }
 
-                    wheel1.setSelectedIndex(level.getSchYear()[0]);
-                    wheel2.setSelectedIndex(level.getSchYear()[1]);
+                    // 下面是默认选中位置
+                    for (int i = 0; i < xnList.size(); i++) {
+                        if (xnList.get(i).getChecked() == 1) {
+                            wheel1.setSelectedIndex(i);
+                        }
+                        List<ChooseXnLevel.ItemBeans> itemBeans = xnList.get(i).getItemBeans();
+                        for (int j = 0; j < itemBeans.size(); j++) {
+                            if (itemBeans.get(j).getChecked() == 1) {
+                                wheel2.setSelectedIndex(j);
+                            }
+                        }
+                    }
 
-                    level.setValue(-1);
-                    level.setMonth(null);
-                    level.setXnYear("");   // 学年标记
-                    ChA = 1000;  // 清理周标记
-//                    popupWindow.dismiss();
                     break;
                 case 4:   // 学年
-
-                    // 恢复初始值
-                    level.setXnYear(0 + "");
                     wheel3.setSelectedIndex(0);
-                    level.setXnVal(0); // 下次进来之后选择器得默认值
-                    level.setValue(-1);
-                    level.setMonth(null);
-                    ChA = 1000;  // 清理周
-                    level.setSchYear(null);  // 学期
-//                    popupWindow.dismiss();
                     break;
             }
 
@@ -827,13 +801,12 @@ public class PjfxActivity_per extends BaseActivity {
         timeChooseSure.setOnClickListener(v -> {
 
             if (level.getKey() != 0 || !(level.getValue() + "").equals("") || level.getMonth() != null) {
-
                 switch (level.getKey()) {
                     case 1:   // 周
                         // 不是周或者学期的设置空值
-                        level.setMonth(null);
-                        level.setSchYear(null);  // 学期标记
-                        level.setXnYear("");   // 学年标记
+//                        level.setMonth(null);
+//                        level.setSchYear(null);  // 学期标记
+//                        level.setXnYear("");   // 学年标记
 
                         if (level.getKey() == 0 || level.getValue() == 1000) {
                             tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), "", "");
@@ -843,34 +816,27 @@ public class PjfxActivity_per extends BaseActivity {
                         }
 
                         changeUI(true, "本周", "上周", "第" + arr.get(0).get(level.getValue()).getValue() + "周", "本周得分", "上周得分");
-                        popupWindow.dismiss();
 
+                        dropPop.dismiss();
                         break;
                     case 2:   // 月
 
                         int mothV = (year > picker.getSelectDate()[0]) || (year == picker.getSelectDate()[0] && monthx >= picker.getSelectDate()[1]) == true ? 0 : 1;
                         if (mothV == 0) {
-                            // 不是月的设置空值
-                            level.setValue(-1);
-                            level.setSchYear(null);
-                            level.setXnYear("");   // 学年标记
-                            ChA = 1000;  // 清理周 , 学期 , 学年标记
+//                            level.setValue(-1);
+//                            level.setSchYear(null);
+//                            level.setXnYear("");   // 学年标记
                             tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), level.getKey() + "", picker.getSelectDate()[0] + "-" + picker.getSelectDate()[1]);
                             changeUI(false, "本月", "某月", picker.getSelectDate()[0] + "-" + picker.getSelectDate()[1], "本月得分", "上月得分");     // 这里第二个参数无用
-
-                            popupWindow.dismiss();
-
                         } else {
                             M.toast(activity, "操作无效");
                         }
-
+                        dropPop.dismiss();
                         break;
                     case 3:   // 学期
                         // 不是学期的设置空值
-                        level.setValue(-1);
-                        level.setMonth(null);
-                        level.setXnYear("");   // 学年标记
-                        ChA = 1000;  // 清理周标记
+//                        level.setMonth(null);
+//                        level.setXnYear("");   // 学年标记
 
                         int val;   // 刷新列表的时候使用
 
@@ -886,24 +852,21 @@ public class PjfxActivity_per extends BaseActivity {
                         }
                         tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), level.getKey() + "", val + "");
 
-                        popupWindow.dismiss();
+                        dropPop.dismiss();
                         break;
                     case 4:   // 学年
 
                         // 不是学年的设置空值
-                        level.setValue(-1);
-                        level.setMonth(null);
-                        ChA = 1000;  // 清理周
-                        level.setSchYear(null);  // 学期
-
+//                        level.setMonth(null);
+//                        level.setSchYear(null);  // 学期
                         level.setXnVal(wheel3.getSelectedIndex()); // 下次进来之后选择器得默认值
 
                         int xnval = arr.get(1).get(wheel3.getSelectedIndex()).getValue();
                         int xnIndex = wheel3.getSelectedIndex();
                         tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), level.getKey() + "", xnval + "");
                         changeUI(false, "本学年", "某学年", arr.get(1).get(xnIndex).getName() + "", "本学年得分", "上学年得分");     // 这里第二个参数无用
-                        popupWindow.dismiss();
 
+                        dropPop.dismiss();
                         break;
                 }
 
@@ -917,24 +880,10 @@ public class PjfxActivity_per extends BaseActivity {
     // 确定之后更换页面数据 -- 这里主要是 为了稍微整理一下代码 , 方便到时候统一管理
     private void changeUI(boolean lx, String... par) {   // lx 用来区分 周 , (月 , 学期 , 学年)   因为除了周有两条折线 , 别的之后一条
 
-
         per_value.setText(par[2]);
-
         sj_title.setText(par[3]);
         sj_score.setText(par[4]);
 
-        // 顺序留作参考
-//        bz.setText("本周");
-//        xz.setText("上周");
-//        per_value.setText("按周查看");
-//        sj_title.setText("本周得分");
-//        sj_score.setText("上周得分");
-
-//        bz.setText("本月");
-//        per_value.setText("按月查看");
-//        sj_title.setText("本月得分");
-//        sj_score.setText("上月得分");
-
     }
 
     // 提供给弹窗  - > 学年  - >  控件设置数据
@@ -967,49 +916,30 @@ public class PjfxActivity_per extends BaseActivity {
     }
 
     // 提供给弹窗的adapter   - > 周  - >  控件设置数据
-    private void setDate(RecyclerView rv, int page, int count, int tag) {  // tag - > 周
+    dataAdapter adapter;
+    private void setDate() {  // tag - > 周
 
+        M.log("checkValue111", arr.size() + "");
         if (items.size() > 0) {
             items.clear();
         }
         if (arr.size() > 0) {
-            items.addAll(arr.get(page));
-
-            setRv(rv, 0, 0, count);
-            dataAdapter adapter;              // level.getValue  , 上面如果选中月 , 学期 , 学年 , 确定之后会将 level.getValue == - 1 , 这样下次进入周的时候, 就不会出现默认值了
-            if (level.getValue() != -1) {
-                for (int i = 0; i < items.size(); i++) {
-                    if (items.get(i).isChecked() == 1) {
-                        if (level.getValue() == 1000) {
-                            level.setValue(i);
-                        }
-                    }
-                }
-                adapter = new dataAdapter(R.layout.item_date, items, items.get(level.getValue()).getValue());    //  最后一个参数 , 是刚点开弹窗 , 有一个默认当前周的选中
-            } else {
-                adapter = new dataAdapter(R.layout.item_date, items, -1);
-            }
+            items.addAll(arr.get(0));   // 数据源
 
-            rv.setAdapter(adapter);
-            if (level.getValue() != 1000 && items.size() > level.getValue()) {
-                if (tag == ChA) {
-                    adapter.change(items.get(level.getValue()).getValue() + "");
-                    adapter.notifyDataSetChanged();
-                }
-            }
+            M.log("checkValue222", level.getValue() + "");
+            adapter = new dataAdapter(R.layout.item_date, items, items.get(level.getValue()).getValue());
+            dropRv.setAdapter(adapter);
 
-            // right 时间选择 周 , 学期 , 学年
+            // right 时间选择 周
             adapter.setOnItemChildClickListener((adapter1, view1, position) -> {
                 switch (view1.getId()) {
                     case R.id.date_linear:
                         adapter.change(items.get(position).getValue() + "", 1000);
                         adapter.notifyDataSetChanged();
                         level.setValue(position);
-
-                        ChA = level.getKey();   // 选中的时候保存, 点击标记 , setDate()方法再次执行的时候, 区分选中状态
+                        M.log("checkValue444", level.getValue() + "");
                 }
             });
-
         }
     }
 
@@ -1017,9 +947,11 @@ public class PjfxActivity_per extends BaseActivity {
 
     //   ----------------------------------------------------------   main 接口日期   --------------------------------------------------------------------
     private void date() {                     //  这里的  List<DateLevel> list 是一个败笔 , 因为一开始的时候数据是全部一致 , 我为了统一管理 , 后来改数据之后 , 觉得有点蠢 , 但是没时间改
-        arr.clear();
         Api().dateList(Config.Token).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {
             if (data.getCode() == M.success) {
+                arr.clear();
+                xnList.clear();
+
                 List<DateLevel> list = new ArrayList<>();    // 周
                 List<DateLevel> lis1 = new ArrayList<>();   // 学年
 
@@ -1053,10 +985,9 @@ public class PjfxActivity_per extends BaseActivity {
                 }
 
                 // 这是学期的数据
-                /* 这个破地方 , 如果用数据结构写 , 就这bi样, 我觉得用双map 可能会更好一些 */
                 List<DateEntity.DataBean.YearTermBean> year_term = data.getData().getYear_term();
                 for (int i = 0; i < year_term.size(); i++) {
-                    ChooseXnLevel chooseXnLevel = new ChooseXnLevel(year_term.get(i).getValue(), year_term.get(i).getName() + "");
+                    ChooseXnLevel chooseXnLevel = new ChooseXnLevel(year_term.get(i).getValue(), year_term.get(i).getName() + "", year_term.get(i).isChecked());
                     List<ChooseXnLevel.ItemBeans> level = new ArrayList<>();
 
                     List<DateEntity.DataBean.YearTermBean.ItemBean> item = year_term.get(i).getItem();
@@ -1065,6 +996,7 @@ public class PjfxActivity_per extends BaseActivity {
                         ChooseXnLevel.ItemBeans itemBeans = new ChooseXnLevel.ItemBeans();
                         itemBeans.setValues(item.get(k).getValue());
                         itemBeans.setNames(item.get(k).getName() + "");
+                        itemBeans.setChecked(item.get(k).isChecked());
 
                         level.add(itemBeans);
                         chooseXnLevel.setItemBeans(level);
@@ -1079,6 +1011,77 @@ public class PjfxActivity_per extends BaseActivity {
         });
     }
 
+    private void date(int hf) {                     //  这里的  List<DateLevel> list 是一个败笔 , 因为一开始的时候数据是全部一致 , 我为了统一管理 , 后来改数据之后 , 觉得有点蠢 , 但是没时间改
+
+        Api().dateList(Config.Token).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {
+            if (data.getCode() == M.success) {
+                if (hf == 0) {
+                    arr.clear();
+
+                    List<DateLevel> list = new ArrayList<>();    // 周
+                    List<DateLevel> lis1 = new ArrayList<>();   // 学年
+                    List<DateEntity.DataBean.WeekBean> week = data.getData().getWeek();
+                    List<DateEntity.DataBean.YearBean> year = data.getData().getYear();
+
+                    for (int i = 0; i < week.size(); i++) {
+                        if (getIntent().getSerializableExtra(M.XspjKey) == null) {
+                            list.add(new DateLevel(week.get(i).getValue(), week.get(i).getName() + "", week.get(i).getChecked()));
+                            if (week.get(i).getChecked() == 1) {   // 默认选中的值
+                                level.setKey(1);
+                                level.setValue(i);
+                                per_value.setText("第" + (i + 1) + "周");  // 默认当前周
+                                requestValue = (i + 1) + "";    // 这个默认值 , 不然右边评价项弹窗 , 点击无效 , 因为无周期值
+                            }
+                        } else {
+                            list.add(new DateLevel(week.get(i).getValue(), week.get(i).getName() + "", week.get(i).getValue() == level.getValue() ? 1 : 0));
+                        }
+
+                        if (i == week.size() - 1) {
+                            arr.add(list);
+                        }
+
+                    }
+
+                    for (int i = 0; i < year.size(); i++) {
+                        lis1.add(new DateLevel(year.get(i).getValue(), year.get(i).getName() + "", 0));
+                        if (i == year.size() - 1) {
+                            arr.add(lis1);
+                        }
+                    }
+                    setDate();
+                } else {
+                    xnList.clear();
+
+                    // 这是学期的数据
+                    List<DateEntity.DataBean.YearTermBean> year_term = data.getData().getYear_term();
+                    for (int i = 0; i < year_term.size(); i++) {
+                        ChooseXnLevel chooseXnLevel = new ChooseXnLevel(year_term.get(i).getValue(), year_term.get(i).getName() + "", year_term.get(i).isChecked());
+                        List<ChooseXnLevel.ItemBeans> level = new ArrayList<>();
+
+                        List<DateEntity.DataBean.YearTermBean.ItemBean> item = year_term.get(i).getItem();
+
+                        for (int k = 0; k < year_term.get(i).getItem().size(); k++) {
+                            ChooseXnLevel.ItemBeans itemBeans = new ChooseXnLevel.ItemBeans();
+                            itemBeans.setValues(item.get(k).getValue());
+                            itemBeans.setNames(item.get(k).getName() + "");
+                            itemBeans.setChecked(item.get(k).isChecked());
+
+                            level.add(itemBeans);
+                            chooseXnLevel.setItemBeans(level);
+                        }
+
+                        xnList.add(chooseXnLevel);
+                    }
+
+                }
+
+            } else if (data.getCode() == 401) {
+                ApiError.refreshToken();
+            }
+        });
+    }
+
+
     //   ----------------------------------------------------------   main 接口筛选   --------------------------------------------------------------------
     private void zt_screen() {
         Api().all_eva_items(Config.Token, Config.ClassId).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {

@@ -73,7 +73,6 @@ public class SharedPreferenceUtil {
         } else if (defaultObject instanceof Integer) {
             return sp.getInt(key, (Integer) defaultObject);
         } else if (defaultObject instanceof Boolean) {
-
             return sp.getBoolean(key, (Boolean) defaultObject);
         } else if (defaultObject instanceof Float) {
             return sp.getFloat(key, (Float) defaultObject);

@@ -145,7 +145,7 @@
                         android:layout_marginLeft="@dimen/dp_15"
                         android:text="数学:1、运动会期间,口述复习第四单元试卷,复习五单元以前，请访问。"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent">
+                        android:layout_height="@dimen/dp_200">
                     </TextView>
 
                     <LinearLayout
@@ -172,21 +172,7 @@
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_marginTop="@dimen/dp_12"
-                    android:background="@drawable/shape_solid_4_fff"
-                    android:layout_marginLeft="@dimen/dp_15"
-                    android:layout_marginRight="@dimen/dp_15"
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
 
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/jlxq_rv2"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-                    </androidx.recyclerview.widget.RecyclerView>
-                </LinearLayout>
 
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>

@@ -26,6 +26,7 @@
                 android:layout_height="wrap_content"
                 android:text="进行中"
                 android:textSize="@dimen/sp_12"
+
                 android:textColor="#FFAB13"
                 android:layout_marginRight="@dimen/dp_8"
                 android:layout_marginTop="@dimen/dp_19"
@@ -36,6 +37,9 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/sp_16"
                 android:text="11月24日作业"
+                android:maxLines="1"
+                android:maxLength="10"
+                android:ellipsize="end"
                 android:textStyle="bold"
                 android:layout_marginTop="@dimen/dp_20"
                 android:textColor="#3D444D"/>