李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 b2bfa961d38285234a4e34cadb2f690f37fb32c0 1 个父辈 a85e2bee

add

内嵌 并排对比
正在显示 13 个修改的文件 包含 420 行增加 和 270 行删除
@@ -124,7 +124,8 @@ @@ -124,7 +124,8 @@
124 <activity 124 <activity
125 android:name=".ui.jxt.activity.TZ.FbtzA_ctivity" 125 android:name=".ui.jxt.activity.TZ.FbtzA_ctivity"
126 android:launchMode="singleTask" 126 android:launchMode="singleTask"
127 - android:windowSoftInputMode="adjustResize|stateHidden" /> 127 + android:screenOrientation="portrait"
  128 + android:windowSoftInputMode="adjustPan" />
128 <activity 129 <activity
129 android:name=".ui.jxt.activity.Zy.Zyxqck_Activity" 130 android:name=".ui.jxt.activity.Zy.Zyxqck_Activity"
130 android:windowSoftInputMode="adjustResize|stateHidden" /> 131 android:windowSoftInputMode="adjustResize|stateHidden" />
@@ -236,7 +236,7 @@ public interface ApiService { @@ -236,7 +236,7 @@ public interface ApiService {
236 236
237 /*家校通通知列表数*/ 237 /*家校通通知列表数*/
238 @POST("/api/home_school/getList") 238 @POST("/api/home_school/getList")
239 - Observable<JxttzEntity> getTzList(@Header("token") String token, @Query("type") int type,@Query("date") String date); 239 + Observable<JxttzEntity> getTzList(@Header("token") String token, @Query("type") int type,@Query("date") String date,@Query("page") int page);
240 240
241 /*家校通 家长端通知列表*/ 241 /*家校通 家长端通知列表*/
242 @POST("/api/home_school/getListParent") 242 @POST("/api/home_school/getListParent")
@@ -282,6 +282,9 @@ public interface ApiService { @@ -282,6 +282,9 @@ public interface ApiService {
282 /* 撤回活动 */ 282 /* 撤回活动 */
283 @POST("/api/active/delActive") 283 @POST("/api/active/delActive")
284 Observable<ActiveSignEntity> getDeleteActive(@Header("token") String token, @Query("id") String id); 284 Observable<ActiveSignEntity> getDeleteActive(@Header("token") String token, @Query("id") String id);
  285 + /* 撤回通知 */
  286 + @POST("/api/notice/delNotice")
  287 + Observable<ActiveSignEntity> getDeleteNotice(@Header("token") String token, @Query("id") String id);
285 /* 活动报名 */ 288 /* 活动报名 */
286 @POST("/api/active/sign") 289 @POST("/api/active/sign")
287 Observable<ActiveSignEntity> geSignActive(@Header("token") String token, @Query("id") String id); 290 Observable<ActiveSignEntity> geSignActive(@Header("token") String token, @Query("id") String id);
@@ -69,6 +69,7 @@ import com.yinhebairong.clasmanage.entity.VideoEntity; @@ -69,6 +69,7 @@ import com.yinhebairong.clasmanage.entity.VideoEntity;
69 import com.yinhebairong.clasmanage.m.M; 69 import com.yinhebairong.clasmanage.m.M;
70 import com.yinhebairong.clasmanage.network.ApiService; 70 import com.yinhebairong.clasmanage.network.ApiService;
71 import com.yinhebairong.clasmanage.ui.jxt.fragment.Jl.JsjlActivity; 71 import com.yinhebairong.clasmanage.ui.jxt.fragment.Jl.JsjlActivity;
  72 +import com.yinhebairong.clasmanage.ui.jxt.fragment.Tz.Tz_Rv_Fragment;
72 import com.yinhebairong.clasmanage.utils.AudioUtils; 73 import com.yinhebairong.clasmanage.utils.AudioUtils;
73 import com.yinhebairong.clasmanage.utils.FilesUtil; 74 import com.yinhebairong.clasmanage.utils.FilesUtil;
74 import com.yinhebairong.clasmanage.utils.SdcardUtil; 75 import com.yinhebairong.clasmanage.utils.SdcardUtil;
@@ -226,20 +227,20 @@ public class FbtzA_ctivity extends BaseActivity { @@ -226,20 +227,20 @@ public class FbtzA_ctivity extends BaseActivity {
226 xbNum.setText(Math.abs(tzxqEntity.getData().getScore())); 227 xbNum.setText(Math.abs(tzxqEntity.getData().getScore()));
227 break; 228 break;
228 } 229 }
229 - List<JxtImageEntity> jxtImageEntities = new ArrayList<>();  
230 - if (tzxqEntity.getData().getImages()!=null){ 230 +// List<JxtImageEntity> jxtImageEntities = new ArrayList<>();
  231 + if (tzxqEntity.getData().getImages()!=null&&tzxqEntity.getData().getImages().size()>0){
231 for (int i = 0; i <tzxqEntity.getData().getImages().size() ; i++) { 232 for (int i = 0; i <tzxqEntity.getData().getImages().size() ; i++) {
232 - jxtImageEntities.add(new JxtImageEntity(tzxqEntity.getData().getImages().get(i),1)); 233 + picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getImages().get(i),1));
233 } 234 }
234 } 235 }
235 - if (tzxqEntity.getData().getVideo()!=null){ 236 + if (tzxqEntity.getData().getVideo()!=null&&tzxqEntity.getData().getVideo().size()>0){
236 for (int i = 0; i <tzxqEntity.getData().getAudio().size() ; i++) { 237 for (int i = 0; i <tzxqEntity.getData().getAudio().size() ; i++) {
237 - jxtImageEntities.add(new JxtImageEntity(tzxqEntity.getData().getVideo().get(i),2,getNetVideoBitmap(tzxqEntity.getData().getVideo().get(i)))); 238 + picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getVideo().get(i),2,getNetVideoBitmap(tzxqEntity.getData().getVideo().get(i))));
238 } 239 }
239 } 240 }
240 - imageAdapter.setNewData(jxtImageEntities);  
241 - List<VideoEntity> frequencyUrl = new ArrayList<>();  
242 - if (tzxqEntity.getData().getAudio()!=null){ 241 + imageAdapter.setNewData(picAndVideo);
  242 +// List<VideoEntity> frequencyUrl = new ArrayList<>();
  243 + if (tzxqEntity.getData().getAudio()!=null&&tzxqEntity.getData().getAudio().size()>0){
243 for (int i = 0; i <tzxqEntity.getData().getAudio().size() ; i++) { 244 for (int i = 0; i <tzxqEntity.getData().getAudio().size() ; i++) {
244 frequencyUrl.add(new VideoEntity(tzxqEntity.getData().getAudio().get(i),false)); 245 frequencyUrl.add(new VideoEntity(tzxqEntity.getData().getAudio().get(i),false));
245 } 246 }
@@ -671,6 +672,7 @@ public class FbtzA_ctivity extends BaseActivity { @@ -671,6 +672,7 @@ public class FbtzA_ctivity extends BaseActivity {
671 @Override 672 @Override
672 public void onNext(FbtzEntity fbtzEntity) { 673 public void onNext(FbtzEntity fbtzEntity) {
673 if (fbtzEntity.getCode() == M.success) { 674 if (fbtzEntity.getCode() == M.success) {
  675 + Tz_Rv_Fragment.DO_REFRESH=true;//让列表刷新
674 finish(); 676 finish();
675 } else { 677 } else {
676 Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show(); 678 Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show();
@@ -698,6 +700,7 @@ public class FbtzA_ctivity extends BaseActivity { @@ -698,6 +700,7 @@ public class FbtzA_ctivity extends BaseActivity {
698 @Override 700 @Override
699 public void onNext(FbtzEntity fbtzEntity) { 701 public void onNext(FbtzEntity fbtzEntity) {
700 if (fbtzEntity.getCode() == M.success) { 702 if (fbtzEntity.getCode() == M.success) {
  703 + Tz_Rv_Fragment.DO_REFRESH=true;//让列表刷新
701 finish(); 704 finish();
702 } else { 705 } else {
703 Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show(); 706 Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show();
@@ -723,7 +726,7 @@ public class FbtzA_ctivity extends BaseActivity { @@ -723,7 +726,7 @@ public class FbtzA_ctivity extends BaseActivity {
723 Toast.makeText(ctx, "请输入通知的标题", Toast.LENGTH_SHORT).show(); 726 Toast.makeText(ctx, "请输入通知的标题", Toast.LENGTH_SHORT).show();
724 } 727 }
725 }else { 728 }else {
726 - Toast.makeText(ctx, "接收人不能为空", Toast.LENGTH_SHORT).show(); 729 + Toast.makeText(ctx, "请选择接收班级", Toast.LENGTH_SHORT).show();
727 } 730 }
728 731
729 } 732 }
@@ -24,6 +24,7 @@ import android.widget.LinearLayout; @@ -24,6 +24,7 @@ import android.widget.LinearLayout;
24 import android.widget.PopupWindow; 24 import android.widget.PopupWindow;
25 import android.widget.RelativeLayout; 25 import android.widget.RelativeLayout;
26 import android.widget.TextView; 26 import android.widget.TextView;
  27 +import android.widget.Toast;
27 28
28 import com.bumptech.glide.Glide; 29 import com.bumptech.glide.Glide;
29 import com.bumptech.glide.request.RequestOptions; 30 import com.bumptech.glide.request.RequestOptions;
@@ -33,6 +34,7 @@ import com.donkingliang.imageselector.utils.StringUtils; @@ -33,6 +34,7 @@ import com.donkingliang.imageselector.utils.StringUtils;
33 import com.google.gson.Gson; 34 import com.google.gson.Gson;
34 import com.kongzue.dialog.interfaces.OnMenuItemClickListener; 35 import com.kongzue.dialog.interfaces.OnMenuItemClickListener;
35 import com.kongzue.dialog.v3.BottomMenu; 36 import com.kongzue.dialog.v3.BottomMenu;
  37 +import com.kongzue.dialog.v3.WaitDialog;
36 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; 38 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
37 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack; 39 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack;
38 import com.shuyu.gsyvideoplayer.listener.LockClickListener; 40 import com.shuyu.gsyvideoplayer.listener.LockClickListener;
@@ -41,11 +43,17 @@ import com.yinhebairong.clasmanage.Config; @@ -41,11 +43,17 @@ import com.yinhebairong.clasmanage.Config;
41 import com.yinhebairong.clasmanage.R; 43 import com.yinhebairong.clasmanage.R;
42 import com.yinhebairong.clasmanage.base.BaseActivity; 44 import com.yinhebairong.clasmanage.base.BaseActivity;
43 import com.yinhebairong.clasmanage.base.instant.Layout; 45 import com.yinhebairong.clasmanage.base.instant.Layout;
  46 +import com.yinhebairong.clasmanage.entity.ActiveSignEntity;
44 import com.yinhebairong.clasmanage.entity.JxtImageEntity; 47 import com.yinhebairong.clasmanage.entity.JxtImageEntity;
45 import com.yinhebairong.clasmanage.entity.TzxqEntity; 48 import com.yinhebairong.clasmanage.entity.TzxqEntity;
46 import com.yinhebairong.clasmanage.entity.VideoEntity; 49 import com.yinhebairong.clasmanage.entity.VideoEntity;
47 import com.yinhebairong.clasmanage.m.M; 50 import com.yinhebairong.clasmanage.m.M;
  51 +import com.yinhebairong.clasmanage.ui.jxt.activity.HD.Hdxq_Activity;
  52 +import com.yinhebairong.clasmanage.ui.jxt.fragment.Hd.Hd_Rv_Fragment;
  53 +import com.yinhebairong.clasmanage.ui.jxt.fragment.Tz.Tz_Rv_Fragment;
48 import com.yinhebairong.clasmanage.ui.jxt.fragment.Tz.TzimgAdapter; 54 import com.yinhebairong.clasmanage.ui.jxt.fragment.Tz.TzimgAdapter;
  55 +import com.yinhebairong.clasmanage.ui.my.view.PromptDialog;
  56 +import com.yinhebairong.clasmanage.view.DebugLog;
49 57
50 import java.io.IOException; 58 import java.io.IOException;
51 import java.lang.ref.WeakReference; 59 import java.lang.ref.WeakReference;
@@ -75,9 +83,9 @@ public class TzxqActivity extends BaseActivity { @@ -75,9 +83,9 @@ public class TzxqActivity extends BaseActivity {
75 @BindView(R.id.include_name) 83 @BindView(R.id.include_name)
76 TextView includeName; 84 TextView includeName;
77 @BindView(R.id.tv_jlxq_sc) 85 @BindView(R.id.tv_jlxq_sc)
78 - ImageView tvJlxqSc; 86 + ImageView include_right;
79 @BindView(R.id.titie) 87 @BindView(R.id.titie)
80 - LinearLayout titie; 88 + RelativeLayout titie;
81 @BindView(R.id.jlxq_img) 89 @BindView(R.id.jlxq_img)
82 ImageView jlxqImg; 90 ImageView jlxqImg;
83 @BindView(R.id.jl_ls_name) 91 @BindView(R.id.jl_ls_name)
@@ -104,14 +112,15 @@ public class TzxqActivity extends BaseActivity { @@ -104,14 +112,15 @@ public class TzxqActivity extends BaseActivity {
104 LinearLayout llCk; 112 LinearLayout llCk;
105 TzxqEntity myTzxqEntity; 113 TzxqEntity myTzxqEntity;
106 MediaPlayer mediaPlayer; 114 MediaPlayer mediaPlayer;
  115 +
107 @Override 116 @Override
108 protected void initData() { 117 protected void initData() {
109 - if (Config.IDENTITY==0){ 118 + if (Config.IDENTITY == 0) {
110 llCk.setVisibility(View.VISIBLE); 119 llCk.setVisibility(View.VISIBLE);
111 - tvJlxqSc.setVisibility(View.VISIBLE);  
112 - }else { 120 + include_right.setVisibility(View.VISIBLE);
  121 + } else {
113 llCk.setVisibility(View.GONE); 122 llCk.setVisibility(View.GONE);
114 - tvJlxqSc.setVisibility(View.GONE); 123 + include_right.setVisibility(View.GONE);
115 } 124 }
116 includeBack.setOnClickListener(new View.OnClickListener() { 125 includeBack.setOnClickListener(new View.OnClickListener() {
117 @Override 126 @Override
@@ -125,12 +134,12 @@ public class TzxqActivity extends BaseActivity { @@ -125,12 +134,12 @@ public class TzxqActivity extends BaseActivity {
125 Bundle extras = getIntent().getExtras(); 134 Bundle extras = getIntent().getExtras();
126 TzId = extras.getString("TzId"); 135 TzId = extras.getString("TzId");
127 int isMy = extras.getInt("isMy"); 136 int isMy = extras.getInt("isMy");
128 - if (isMy==0){ 137 + if (isMy == 0) {
129 llCk.setVisibility(View.GONE); 138 llCk.setVisibility(View.GONE);
130 - tvJlxqSc.setVisibility(View.GONE);  
131 - }else { 139 + include_right.setVisibility(View.GONE);
  140 + } else {
132 llCk.setVisibility(View.VISIBLE); 141 llCk.setVisibility(View.VISIBLE);
133 - tvJlxqSc.setVisibility(View.VISIBLE); 142 + include_right.setVisibility(View.VISIBLE);
134 } 143 }
135 Api().tzxq(Config.Token, TzId) 144 Api().tzxq(Config.Token, TzId)
136 .subscribeOn(Schedulers.io()) 145 .subscribeOn(Schedulers.io())
@@ -151,7 +160,7 @@ public class TzxqActivity extends BaseActivity { @@ -151,7 +160,7 @@ public class TzxqActivity extends BaseActivity {
151 jlBj.setText(tzxqEntity.getData().getClass_name()); 160 jlBj.setText(tzxqEntity.getData().getClass_name());
152 jlTime.setText(tzxqEntity.getData().getDate()); 161 jlTime.setText(tzxqEntity.getData().getDate());
153 RequestOptions requestOptions = RequestOptions.circleCropTransform(); 162 RequestOptions requestOptions = RequestOptions.circleCropTransform();
154 - Glide.with(TzxqActivity.this).load(R.mipmap.img_teacher).apply(requestOptions).into(jlxqImg); 163 + Glide.with(TzxqActivity.this).load(R.mipmap.img_teacher).apply(requestOptions).into(jlxqImg);
155 String[] url = judgeString(tzxqEntity.getData().getContent()); //超链接判断返回数组 164 String[] url = judgeString(tzxqEntity.getData().getContent()); //超链接判断返回数组
156 String allUrl = tzxqEntity.getData().getContent(); 165 String allUrl = tzxqEntity.getData().getContent();
157 CharSequence charSequence; 166 CharSequence charSequence;
@@ -245,7 +254,7 @@ public class TzxqActivity extends BaseActivity { @@ -245,7 +254,7 @@ public class TzxqActivity extends BaseActivity {
245 tz_yck_adapter = new Tz_Yck_Adapter(R.layout.item_jxt_tzxq, tzxqEntity.getData().getList().getRe_view()); 254 tz_yck_adapter = new Tz_Yck_Adapter(R.layout.item_jxt_tzxq, tzxqEntity.getData().getList().getRe_view());
246 ckRecycle.setLayoutManager(new GridLayoutManager(TzxqActivity.this, 1)); 255 ckRecycle.setLayoutManager(new GridLayoutManager(TzxqActivity.this, 1));
247 ckRecycle.setAdapter(tz_yck_adapter); 256 ckRecycle.setAdapter(tz_yck_adapter);
248 - tvChakan.setText("已查看（"+tzxqEntity.getData().getRe_view_num()+"）"); 257 + tvChakan.setText("已查看（" + tzxqEntity.getData().getRe_view_num() + "）");
249 } 258 }
250 259
251 } 260 }
@@ -261,8 +270,10 @@ public class TzxqActivity extends BaseActivity { @@ -261,8 +270,10 @@ public class TzxqActivity extends BaseActivity {
261 } 270 }
262 }); 271 });
263 } 272 }
  273 +
264 TextView text_time; 274 TextView text_time;
265 ExecutorService executorService; 275 ExecutorService executorService;
  276 +
266 // 开启线程，修改descTv 277 // 开启线程，修改descTv
267 private void updateDescTv() { 278 private void updateDescTv() {
268 Thread thread = new Thread(new Runnable() { 279 Thread thread = new Thread(new Runnable() {
@@ -282,7 +293,9 @@ public class TzxqActivity extends BaseActivity { @@ -282,7 +293,9 @@ public class TzxqActivity extends BaseActivity {
282 executorService = Executors.newSingleThreadExecutor(); 293 executorService = Executors.newSingleThreadExecutor();
283 executorService.execute(thread); 294 executorService.execute(thread);
284 } 295 }
  296 +
285 MyHandler myHandler = new MyHandler(this); 297 MyHandler myHandler = new MyHandler(this);
  298 +
286 private static class MyHandler extends Handler { 299 private static class MyHandler extends Handler {
287 private WeakReference<Activity> mActivity; 300 private WeakReference<Activity> mActivity;
288 301
@@ -310,6 +323,7 @@ public class TzxqActivity extends BaseActivity { @@ -310,6 +323,7 @@ public class TzxqActivity extends BaseActivity {
310 } 323 }
311 } 324 }
312 } 325 }
  326 +
313 /** 327 /**
314 * 判断字符串中是否有超链接，若有，则返回超链接。 328 * 判断字符串中是否有超链接，若有，则返回超链接。
315 * 329 *
@@ -486,24 +500,24 @@ public class TzxqActivity extends BaseActivity { @@ -486,24 +500,24 @@ public class TzxqActivity extends BaseActivity {
486 500
487 @Override 501 @Override
488 protected void setEvent() { 502 protected void setEvent() {
489 - tvJlxqSc.setOnClickListener(new View.OnClickListener() { 503 + include_right.setOnClickListener(new View.OnClickListener() {
490 @Override 504 @Override
491 public void onClick(View v) { 505 public void onClick(View v) {
492 BottomMenu.show(TzxqActivity.this, new String[]{"转发", "撤回"}, new OnMenuItemClickListener() { 506 BottomMenu.show(TzxqActivity.this, new String[]{"转发", "撤回"}, new OnMenuItemClickListener() {
493 @Override 507 @Override
494 public void onClick(String text, int index) { 508 public void onClick(String text, int index) {
495 //返回参数 text 即菜单名称，index 即菜单索引 509 //返回参数 text 即菜单名称，index 即菜单索引
496 - switch (index){  
497 - case 0 : 510 + switch (index) {
  511 + case 0:
498 Intent intent = new Intent(); 512 Intent intent = new Intent();
499 - intent.setClass(TzxqActivity.this,FbtzA_ctivity.class); 513 + intent.setClass(TzxqActivity.this, FbtzA_ctivity.class);
500 Gson gson = new Gson(); 514 Gson gson = new Gson();
501 String Tzjson = gson.toJson(myTzxqEntity); 515 String Tzjson = gson.toJson(myTzxqEntity);
502 - intent.putExtra("zhuanfa",Tzjson); 516 + intent.putExtra("zhuanfa", Tzjson);
503 startActivity(intent); 517 startActivity(intent);
504 break; 518 break;
505 - case 1 :  
506 - 519 + case 1:
  520 + showNoticeDialog();
507 break; 521 break;
508 } 522 }
509 } 523 }
@@ -512,6 +526,68 @@ public class TzxqActivity extends BaseActivity { @@ -512,6 +526,68 @@ public class TzxqActivity extends BaseActivity {
512 }); 526 });
513 } 527 }
514 528
  529 + private PromptDialog mPromptDialog;
  530 +
  531 + public void showNoticeDialog() {
  532 + if (mPromptDialog == null) {
  533 + mPromptDialog = new PromptDialog(TzxqActivity.this, R.style.PromptDialog);
  534 + mPromptDialog.setTitleText("撤销通知");
  535 + mPromptDialog.setContentText("确定要撤销通知吗？");
  536 + mPromptDialog.setPositiveListener("确定", new PromptDialog.OnPositiveListener() {
  537 +
  538 + @Override
  539 + public void onClick(PromptDialog dialog) {
  540 + dialog.dismiss();
  541 + chehui();
  542 + }
  543 + });
  544 + mPromptDialog.setNegativeListener("取消",
  545 + new PromptDialog.OnNegativeListener() {
  546 + @Override
  547 + public void onClick(PromptDialog dialog) {
  548 + dialog.dismiss();
  549 + }
  550 + });
  551 + }
  552 + mPromptDialog.show();
  553 +
  554 + }
  555 +
  556 + /**
  557 + * 撤回活动
  558 + */
  559 + private void chehui() {
  560 + WaitDialog.show(TzxqActivity.this, "请稍候...");
  561 + Api().getDeleteNotice(Config.Token, TzId)
  562 + .subscribeOn(Schedulers.io())
  563 + .observeOn(AndroidSchedulers.mainThread())
  564 + .subscribe(new Observer<ActiveSignEntity>() {
  565 + @Override
  566 + public void onSubscribe(Disposable d) {
  567 +
  568 + }
  569 +
  570 + @Override
  571 + public void onNext(ActiveSignEntity addMbBean) {
  572 + WaitDialog.dismiss();
  573 + if (addMbBean.getCode() == M.success) {
  574 + Tz_Rv_Fragment.DO_REFRESH = true;
  575 + Toast.makeText(ctx, "" + addMbBean.getMsg(), Toast.LENGTH_SHORT).show();
  576 + finish();
  577 + }
  578 + }
  579 +
  580 + @Override
  581 + public void onError(Throwable e) {
  582 +
  583 + }
  584 +
  585 + @Override
  586 + public void onComplete() {
  587 +
  588 + }
  589 + });
  590 + }
515 591
516 class Audio_Adapter extends BaseQuickAdapter<VideoEntity, BaseViewHolder> { 592 class Audio_Adapter extends BaseQuickAdapter<VideoEntity, BaseViewHolder> {
517 public Audio_Adapter(int layoutResId, @Nullable List<VideoEntity> data) { 593 public Audio_Adapter(int layoutResId, @Nullable List<VideoEntity> data) {
@@ -204,7 +204,7 @@ public class All_Fragment extends BaseFragment { @@ -204,7 +204,7 @@ public class All_Fragment extends BaseFragment {
204 List<JxtAllListEntity.DataBeanX.DataBean> dataBeans = adapter.getData(); 204 List<JxtAllListEntity.DataBeanX.DataBean> dataBeans = adapter.getData();
205 Intent tzintent = new Intent(getContext(), TzxqActivity.class); 205 Intent tzintent = new Intent(getContext(), TzxqActivity.class);
206 tzintent.putExtra("TzId", dataBeans.get(position).getId() + ""); 206 tzintent.putExtra("TzId", dataBeans.get(position).getId() + "");
207 - tzintent.putExtra("isMy", dataBeans.get(position).getIs_author() + ""); 207 + tzintent.putExtra("isMy", dataBeans.get(position).getIs_author());
208 startActivity(tzintent); 208 startActivity(tzintent);
209 jxt_listAdapter.notifyDataSetChanged(); 209 jxt_listAdapter.notifyDataSetChanged();
210 break; 210 break;
@@ -320,7 +320,7 @@ public class All_Fragment extends BaseFragment { @@ -320,7 +320,7 @@ public class All_Fragment extends BaseFragment {
320 List<JxtAllListEntity.DataBeanX.DataBean> dataBeans = adapter.getData(); 320 List<JxtAllListEntity.DataBeanX.DataBean> dataBeans = adapter.getData();
321 Intent tzintent = new Intent(getContext(), TzxqActivity.class); 321 Intent tzintent = new Intent(getContext(), TzxqActivity.class);
322 tzintent.putExtra("TzId", dataBeans.get(position).getId() + ""); 322 tzintent.putExtra("TzId", dataBeans.get(position).getId() + "");
323 - tzintent.putExtra("isMy", dataBeans.get(position).getIs_author() + ""); 323 + tzintent.putExtra("isMy", dataBeans.get(position).getIs_author());
324 startActivity(tzintent); 324 startActivity(tzintent);
325 jxt_listAdapter.notifyDataSetChanged(); 325 jxt_listAdapter.notifyDataSetChanged();
326 break; 326 break;
@@ -384,6 +384,7 @@ public class Jl_Rv_Fragment extends BaseFragment { @@ -384,6 +384,7 @@ public class Jl_Rv_Fragment extends BaseFragment {
384 super.onResume(); 384 super.onResume();
385 if (DO_REFRESH) { 385 if (DO_REFRESH) {
386 setParam(1); 386 setParam(1);
  387 + DO_REFRESH=false;
387 } 388 }
388 } 389 }
389 390
@@ -4,12 +4,14 @@ package com.yinhebairong.clasmanage.ui.jxt.fragment.Tz; @@ -4,12 +4,14 @@ package com.yinhebairong.clasmanage.ui.jxt.fragment.Tz;
4 import android.content.Intent; 4 import android.content.Intent;
5 import android.support.annotation.Nullable; 5 import android.support.annotation.Nullable;
6 import android.support.v4.app.Fragment; 6 import android.support.v4.app.Fragment;
  7 +import android.support.v4.widget.SwipeRefreshLayout;
7 import android.support.v7.widget.LinearLayoutManager; 8 import android.support.v7.widget.LinearLayoutManager;
8 import android.support.v7.widget.RecyclerView; 9 import android.support.v7.widget.RecyclerView;
9 import android.view.View; 10 import android.view.View;
10 import android.widget.ImageView; 11 import android.widget.ImageView;
11 import android.widget.LinearLayout; 12 import android.widget.LinearLayout;
12 import android.widget.TextView; 13 import android.widget.TextView;
  14 +import android.widget.Toast;
13 15
14 import com.chad.library.adapter.base.BaseQuickAdapter; 16 import com.chad.library.adapter.base.BaseQuickAdapter;
15 import com.chad.library.adapter.base.BaseViewHolder; 17 import com.chad.library.adapter.base.BaseViewHolder;
@@ -23,11 +25,14 @@ import com.yinhebairong.clasmanage.m.M; @@ -23,11 +25,14 @@ import com.yinhebairong.clasmanage.m.M;
23 import com.yinhebairong.clasmanage.ui.jxt.activity.TZ.Tjtz_Activity; 25 import com.yinhebairong.clasmanage.ui.jxt.activity.TZ.Tjtz_Activity;
24 import com.yinhebairong.clasmanage.ui.jxt.activity.TZ.TzxqActivity; 26 import com.yinhebairong.clasmanage.ui.jxt.activity.TZ.TzxqActivity;
25 import com.yinhebairong.clasmanage.utils.CalendarStringtUtil; 27 import com.yinhebairong.clasmanage.utils.CalendarStringtUtil;
  28 +import com.yinhebairong.clasmanage.view.DebugLog;
26 import com.yinhebairong.clasmanage.view.pickerwheelview.builder.TimePickerBuilder; 29 import com.yinhebairong.clasmanage.view.pickerwheelview.builder.TimePickerBuilder;
27 import com.yinhebairong.clasmanage.view.pickerwheelview.listener.OnTimeSelectListener; 30 import com.yinhebairong.clasmanage.view.pickerwheelview.listener.OnTimeSelectListener;
  31 +import com.yinhebairong.clasmanage.view.pickerwheelview.utils.MyDataFormatUtil;
28 import com.yinhebairong.clasmanage.view.pickerwheelview.view.TimePickerView; 32 import com.yinhebairong.clasmanage.view.pickerwheelview.view.TimePickerView;
29 33
30 import java.text.SimpleDateFormat; 34 import java.text.SimpleDateFormat;
  35 +import java.util.ArrayList;
31 import java.util.Calendar; 36 import java.util.Calendar;
32 import java.util.List; 37 import java.util.List;
33 import java.util.Locale; 38 import java.util.Locale;
@@ -53,7 +58,17 @@ public class Tz_Rv_Fragment extends BaseFragment { @@ -53,7 +58,17 @@ public class Tz_Rv_Fragment extends BaseFragment {
53 RecyclerView dataRv; 58 RecyclerView dataRv;
54 @BindView(R.id.tv_time) 59 @BindView(R.id.tv_time)
55 TextView tv_time; 60 TextView tv_time;
  61 + @BindView(R.id.tv_week)
  62 + TextView tv_week;
  63 + @BindView(R.id.my_sw)
  64 + SwipeRefreshLayout my_sw;
  65 +
56 private TimePickerView mTimePicker3;//三级时间 年月日 66 private TimePickerView mTimePicker3;//三级时间 年月日
  67 +
  68 + //参数
  69 + private int page = 1;
  70 + private List<JxttzEntity.DataBeanX.DataBean> mList = new ArrayList<>();
  71 +
57 @Override 72 @Override
58 protected void initView(View root) { 73 protected void initView(View root) {
59 Calendar calendar = Calendar.getInstance(); 74 Calendar calendar = Calendar.getInstance();
@@ -65,37 +80,60 @@ public class Tz_Rv_Fragment extends BaseFragment { @@ -65,37 +80,60 @@ public class Tz_Rv_Fragment extends BaseFragment {
65 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); 80 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
66 String dateString = simpleDateFormat.format(calendar.getTime()); 81 String dateString = simpleDateFormat.format(calendar.getTime());
67 tv_time.setText(dateString); 82 tv_time.setText(dateString);
  83 + tv_week.setText(MyDataFormatUtil.dateToWeek(dateString));
68 84
69 mTimePicker3 = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() { 85 mTimePicker3 = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() {
70 @Override 86 @Override
71 public void onTimeSelect(String date, View v) { 87 public void onTimeSelect(String date, View v) {
72 tv_time.setText(date); 88 tv_time.setText(date);
73 - Calendar calendar = Calendar.getInstance();  
74 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);  
75 - String dateString = simpleDateFormat.format(calendar.getTime());  
76 - if (Config.IDENTITY==0){  
77 - if (dateString.equals(date)) {//今天  
78 - getDate(2, "");  
79 - } else {  
80 - getDate(2, date);  
81 - }  
82 - }else {  
83 - if (dateString.equals(date)) {//今天  
84 - getParentDate(2, "");  
85 - } else {  
86 - getParentDate(2, date);  
87 - }  
88 - } 89 + tv_week.setText(MyDataFormatUtil.dateToWeek(date));
  90 + setParam(1);
89 } 91 }
90 }).setType(new boolean[]{true, true, true, false, false, false}).isDialog(false).setFormat("yyyy-MM-dd").setSelectChangeListener(). 92 }).setType(new boolean[]{true, true, true, false, false, false}).isDialog(false).setFormat("yyyy-MM-dd").setSelectChangeListener().
91 setTextXOffset(40, 0, -40, 0, 0, 0).build(); 93 setTextXOffset(40, 0, -40, 0, 0, 0).build();
92 mTimePicker3.isBefore(false); 94 mTimePicker3.isBefore(false);
  95 +
  96 + my_sw.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
  97 + @Override
  98 + public void onRefresh() {
  99 + Toast.makeText(getActivity(), "下拉刷新成功", Toast.LENGTH_SHORT).show();
  100 + my_sw.setRefreshing(false);
  101 + setParam(1);
  102 + }
  103 + });
  104 +
  105 + jxt_tz_adapter = new Jxt_Tz_Adapter(R.layout.item_jxt_tz_item, mList);
  106 + dataRv.setLayoutManager(new LinearLayoutManager(getActivity()));
  107 + dataRv.setAdapter(jxt_tz_adapter);
  108 + jxt_tz_adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
  109 + @Override
  110 + public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
  111 + List<JxttzEntity.DataBeanX.DataBean> dataBeans = adapter.getData();
  112 + Intent tzintent = new Intent(getContext(), TzxqActivity.class);
  113 + tzintent.putExtra("TzId", dataBeans.get(position).getId() + "");
  114 + tzintent.putExtra("isMy", dataBeans.get(position).getIs_author());
  115 + startActivity(tzintent);
  116 +
  117 + }
  118 + });
  119 + jxt_tz_adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
  120 + @Override
  121 + public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
  122 + if (mList.get(position).getIs_author() == 1) {
  123 + List<JxttzEntity.DataBeanX.DataBean> dataBeans = adapter.getData();
  124 + Intent tzintent = new Intent(getContext(), Tjtz_Activity.class);
  125 + tzintent.putExtra("TzId", dataBeans.get(position).getId() + "");
  126 + startActivity(tzintent);
  127 + }
  128 + }
  129 + });
93 } 130 }
94 131
95 @Override 132 @Override
96 protected void initListener() { 133 protected void initListener() {
97 134
98 } 135 }
  136 +
99 @OnClick({R.id.jxt_matter_li}) 137 @OnClick({R.id.jxt_matter_li})
100 public void onViewClicked(View view) { 138 public void onViewClicked(View view) {
101 switch (view.getId()) { 139 switch (view.getId()) {
@@ -107,21 +145,19 @@ public class Tz_Rv_Fragment extends BaseFragment { @@ -107,21 +145,19 @@ public class Tz_Rv_Fragment extends BaseFragment {
107 break; 145 break;
108 } 146 }
109 } 147 }
  148 +
110 @Override 149 @Override
111 protected void lazyLoad() { 150 protected void lazyLoad() {
112 } 151 }
  152 +
113 @Override 153 @Override
114 protected void refreshLoad() { 154 protected void refreshLoad() {
115 - if (Config.IDENTITY == 0) {//老师  
116 - getDate(2, "");  
117 - } else {  
118 - getParentDate(2,"");  
119 - } 155 + setParam(1);
120 super.refreshLoad(); 156 super.refreshLoad();
121 } 157 }
122 158
123 - public void getDate(int type,String date) {  
124 - Api().getTzList(Config.Token, type,date) 159 + public void getDate(int type, String date) {
  160 + Api().getTzList(Config.Token, type, date,page)
125 .subscribeOn(Schedulers.io()) 161 .subscribeOn(Schedulers.io())
126 .observeOn(AndroidSchedulers.mainThread()) 162 .observeOn(AndroidSchedulers.mainThread())
127 .subscribe(new Observer<JxttzEntity>() { 163 .subscribe(new Observer<JxttzEntity>() {
@@ -133,36 +169,34 @@ public class Tz_Rv_Fragment extends BaseFragment { @@ -133,36 +169,34 @@ public class Tz_Rv_Fragment extends BaseFragment {
133 @Override 169 @Override
134 public void onNext(JxttzEntity jxttzEntity) { 170 public void onNext(JxttzEntity jxttzEntity) {
135 if (jxttzEntity.getCode() == M.success) { 171 if (jxttzEntity.getCode() == M.success) {
136 - List<JxttzEntity.DataBeanX.DataBean> data = jxttzEntity.getData().getData();  
137 - jxt_tz_adapter = new Jxt_Tz_Adapter(R.layout.item_jxt_tz_item, data);  
138 - dataRv.setLayoutManager(new LinearLayoutManager(getActivity()));  
139 - dataRv.setAdapter(jxt_tz_adapter);  
140 - jxt_tz_adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {  
141 - @Override  
142 - public void onItemClick(BaseQuickAdapter adapter, View view, int position) {  
143 - List<JxttzEntity.DataBeanX.DataBean> dataBeans = adapter.getData();  
144 - Intent tzintent = new Intent(getContext(), TzxqActivity.class);  
145 - tzintent.putExtra("TzId", dataBeans.get(position).getId() + "");  
146 - tzintent.putExtra("isMy", dataBeans.get(position).getIs_author() + "");  
147 - startActivity(tzintent);  
148 - jxt_tz_adapter.notifyDataSetChanged(); 172 + if (page == 1 || page == 0) {
  173 + dataRv.scrollToPosition(0);
  174 + mList.clear();
  175 + }
  176 + mList.addAll(jxttzEntity.getData().getData());
149 177
150 - }  
151 - });  
152 - jxt_tz_adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { 178 + page = jxttzEntity.getData().getCurrent_page() + 1;
  179 + jxt_tz_adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
153 @Override 180 @Override
154 - public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {  
155 - if (jxttzEntity.getData().getData().get(position).getIs_author()==1){  
156 - List<JxttzEntity.DataBeanX.DataBean> dataBeans = adapter.getData();  
157 - Intent tzintent = new Intent(getContext(), Tjtz_Activity.class);  
158 - tzintent.putExtra("TzId", dataBeans.get(position).getId() + "");  
159 - startActivity(tzintent);  
160 - jxt_tz_adapter.notifyDataSetChanged();  
161 - } 181 + public void onLoadMoreRequested() {
  182 + dataRv.postDelayed(new Runnable() {
  183 + @Override
  184 + public void run() {
  185 + if (jxttzEntity.getData().getCurrent_page() >= jxttzEntity.getData().getLast_page()) {
  186 + //数据全部加载完毕
  187 + jxt_tz_adapter.loadMoreEnd();
  188 + } else {
  189 + setParam(page);
  190 + }
  191 + }
  192 +
  193 + }, 1000);
162 } 194 }
163 - }); 195 + }, dataRv);
  196 + jxt_tz_adapter.notifyDataSetChanged();
164 } 197 }
165 } 198 }
  199 +
166 @Override 200 @Override
167 public void onError(Throwable e) { 201 public void onError(Throwable e) {
168 if (e.hashCode() == 401) { 202 if (e.hashCode() == 401) {
@@ -176,8 +210,8 @@ public class Tz_Rv_Fragment extends BaseFragment { @@ -176,8 +210,8 @@ public class Tz_Rv_Fragment extends BaseFragment {
176 }); 210 });
177 } 211 }
178 212
179 - public void getParentDate(int type,String date) {  
180 - Api().getTzJZlist(Config.Token, type,date) 213 + public void getParentDate(int type, String date) {
  214 + Api().getTzJZlist(Config.Token, type, date)
181 .subscribeOn(Schedulers.io()) 215 .subscribeOn(Schedulers.io())
182 .observeOn(AndroidSchedulers.mainThread()) 216 .observeOn(AndroidSchedulers.mainThread())
183 .subscribe(new Observer<TzlistJzEntity>() { 217 .subscribe(new Observer<TzlistJzEntity>() {
@@ -216,131 +250,147 @@ public class Tz_Rv_Fragment extends BaseFragment { @@ -216,131 +250,147 @@ public class Tz_Rv_Fragment extends BaseFragment {
216 }); 250 });
217 } 251 }
218 252
  253 + public static boolean DO_REFRESH = true;
  254 +
219 @Override 255 @Override
220 public void onResume() { 256 public void onResume() {
221 super.onResume(); 257 super.onResume();
  258 + if (DO_REFRESH) {
  259 + setParam(1);
  260 + DO_REFRESH=false;
  261 + }
  262 + }
  263 +
  264 + /**
  265 + * 设置参数-请求
  266 + *
  267 + * @param page 页
  268 + */
  269 + private void setParam(int page) {
  270 + DebugLog.e("wkk2====" + DO_REFRESH);
  271 + Calendar calendar = Calendar.getInstance();
  272 + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
  273 + String dateString = simpleDateFormat.format(calendar.getTime());
222 if (Config.IDENTITY == 0) {//老师 274 if (Config.IDENTITY == 0) {//老师
223 - Calendar calendar = Calendar.getInstance();  
224 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);  
225 - String dateString = simpleDateFormat.format(calendar.getTime());  
226 if (dateString.equals(tv_time.getText().toString())) {//今天 275 if (dateString.equals(tv_time.getText().toString())) {//今天
  276 + this.page = page;
227 getDate(2, ""); 277 getDate(2, "");
228 } else { 278 } else {
  279 + this.page = page;
229 getDate(2, tv_time.getText().toString()); 280 getDate(2, tv_time.getText().toString());
230 } 281 }
231 } else { 282 } else {
232 - Calendar calendar = Calendar.getInstance();  
233 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);  
234 - String dateString = simpleDateFormat.format(calendar.getTime());  
235 if (dateString.equals(tv_time.getText().toString())) {//今天 283 if (dateString.equals(tv_time.getText().toString())) {//今天
236 - getParentDate(2,"");  
237 - 284 + this.page = page;
  285 + getParentDate(2, "");
238 } else { 286 } else {
  287 + this.page = page;
239 getParentDate(2, tv_time.getText().toString()); 288 getParentDate(2, tv_time.getText().toString());
240 } 289 }
241 } 290 }
242 } 291 }
  292 +}
  293 +
  294 +class Jxt_Tz_Adapter extends BaseQuickAdapter<JxttzEntity.DataBeanX.DataBean, BaseViewHolder> {
  295 + public Jxt_Tz_Adapter(int layoutResId, @Nullable List<JxttzEntity.DataBeanX.DataBean> data) {
  296 + super(layoutResId, data);
243 } 297 }
244 298
245 - class Jxt_Tz_Adapter extends BaseQuickAdapter<JxttzEntity.DataBeanX.DataBean, BaseViewHolder> {  
246 - public Jxt_Tz_Adapter(int layoutResId, @Nullable List<JxttzEntity.DataBeanX.DataBean> data) {  
247 - super(layoutResId, data); 299 + @Override
  300 + protected void convert(BaseViewHolder helper, JxttzEntity.DataBeanX.DataBean item) {
  301 + TextView leixing_text = helper.itemView.findViewById(R.id.leixing_text);
  302 + ImageView leixin_cone = helper.itemView.findViewById(R.id.leixin_cone);
  303 + TextView state_text = helper.itemView.findViewById(R.id.state_text);
  304 + TextView title = helper.itemView.findViewById(R.id.title);
  305 + TextView content_tv = helper.itemView.findViewById(R.id.content_tv);
  306 + TextView class_tv = helper.itemView.findViewById(R.id.class_tv);
  307 + TextView teacher_tv = helper.itemView.findViewById(R.id.teacher_tv);
  308 + TextView date_tv = helper.itemView.findViewById(R.id.date_tv);
  309 + TextView state_tv = helper.itemView.findViewById(R.id.state_tv);
  310 + TextView yellow_tv = helper.itemView.findViewById(R.id.yellow_tv);
  311 + TextView gray_tv = helper.itemView.findViewById(R.id.gray_tv);
  312 + TextView massage_num = helper.itemView.findViewById(R.id.massage_num);
  313 + LinearLayout ck_lin = helper.itemView.findViewById(R.id.ck_lin);
  314 + if (item.getLabel().equals("通知")) {
  315 + leixing_text.setText(item.getLabel());
  316 + leixin_cone.setImageResource(R.mipmap.icon_worktz2);
  317 + leixing_text.setBackgroundResource(R.mipmap.icon_worktz1);
  318 + } else if (item.getLabel().equals("喜报")) {
  319 + leixing_text.setText(item.getLabel());
  320 + leixin_cone.setImageResource(R.mipmap.icon_news2);
  321 + leixing_text.setBackgroundResource(R.mipmap.icon_news1);
  322 + } else if (item.getLabel().equals("警示")) {
  323 + leixing_text.setText(item.getLabel());
  324 + leixin_cone.setImageResource(R.mipmap.icon_caution2);
  325 + leixing_text.setBackgroundResource(R.mipmap.icon_caution1);
  326 + }
  327 + title.setText(item.getTitle());
  328 + content_tv.setText(item.getContent());
  329 + class_tv.setText(item.getClass_name());
  330 + teacher_tv.setText(item.getTeacher_name());
  331 + date_tv.setText(item.getDate());
  332 + yellow_tv.setText(item.getView_num() + "");
  333 + gray_tv.setText("/" + item.getTotal_num());
  334 + helper.addOnClickListener(R.id.ck_lin);
  335 + state_tv.setText(item.getStatus_text());
  336 + if (item.getUncomment_num().equals("")) {
  337 + massage_num.setVisibility(View.GONE);
  338 + } else {
  339 + massage_num.setText(item.getUncomment_num() + "");
248 } 340 }
249 341
250 - @Override  
251 - protected void convert(BaseViewHolder helper, JxttzEntity.DataBeanX.DataBean item) {  
252 - TextView leixing_text = helper.itemView.findViewById(R.id.leixing_text);  
253 - ImageView leixin_cone = helper.itemView.findViewById(R.id.leixin_cone);  
254 - TextView state_text = helper.itemView.findViewById(R.id.state_text);  
255 - TextView title = helper.itemView.findViewById(R.id.title);  
256 - TextView content_tv = helper.itemView.findViewById(R.id.content_tv);  
257 - TextView class_tv = helper.itemView.findViewById(R.id.class_tv);  
258 - TextView teacher_tv = helper.itemView.findViewById(R.id.teacher_tv);  
259 - TextView date_tv = helper.itemView.findViewById(R.id.date_tv);  
260 - TextView state_tv = helper.itemView.findViewById(R.id.state_tv);  
261 - TextView yellow_tv = helper.itemView.findViewById(R.id.yellow_tv);  
262 - TextView gray_tv = helper.itemView.findViewById(R.id.gray_tv);  
263 - TextView massage_num = helper.itemView.findViewById(R.id.massage_num);  
264 - LinearLayout ck_lin = helper.itemView.findViewById(R.id.ck_lin);  
265 - if (item.getLabel().equals("通知")){  
266 - leixing_text.setText(item.getLabel());  
267 - leixin_cone.setImageResource(R.mipmap.icon_worktz2);  
268 - leixing_text.setBackgroundResource(R.mipmap.icon_worktz1);  
269 - }else if (item.getLabel().equals("喜报")){  
270 - leixing_text.setText(item.getLabel());  
271 - leixin_cone.setImageResource(R.mipmap.icon_news2);  
272 - leixing_text.setBackgroundResource(R.mipmap.icon_news1);  
273 - }else if (item.getLabel().equals("警示")){  
274 - leixing_text.setText(item.getLabel());  
275 - leixin_cone.setImageResource(R.mipmap.icon_caution2);  
276 - leixing_text.setBackgroundResource(R.mipmap.icon_caution1);  
277 - }  
278 - title.setText(item.getTitle());  
279 - content_tv.setText(item.getContent());  
280 - class_tv.setText(item.getClass_name());  
281 - teacher_tv.setText(item.getTeacher_name());  
282 - date_tv.setText(item.getDate());  
283 - yellow_tv.setText(item.getView_num() + "");  
284 - gray_tv.setText("/" + item.getTotal_num());  
285 - helper.addOnClickListener(R.id.ck_lin);  
286 - state_tv.setText(item.getStatus_text());  
287 - if (item.getUncomment_num().equals("")){  
288 - massage_num.setVisibility(View.GONE);  
289 - }else {  
290 - massage_num.setText(item.getUncomment_num()+"");  
291 - } 342 + }
  343 +}
292 344
293 - } 345 +class Jxt_Tz_jzAdapter extends BaseQuickAdapter<TzlistJzEntity.DataBeanX.DataBean, BaseViewHolder> {
  346 +
  347 + public Jxt_Tz_jzAdapter(int layoutResId, @Nullable List<TzlistJzEntity.DataBeanX.DataBean> data) {
  348 + super(layoutResId, data);
294 } 349 }
295 - class Jxt_Tz_jzAdapter extends BaseQuickAdapter<TzlistJzEntity.DataBeanX.DataBean,BaseViewHolder>{  
296 350
297 - public Jxt_Tz_jzAdapter(int layoutResId, @Nullable List<TzlistJzEntity.DataBeanX.DataBean> data) {  
298 - super(layoutResId, data); 351 + @Override
  352 + protected void convert(BaseViewHolder helper, TzlistJzEntity.DataBeanX.DataBean item) {
  353 + TextView leixing_text = helper.itemView.findViewById(R.id.leixing_text);
  354 + TextView title = helper.itemView.findViewById(R.id.title);
  355 + ImageView leixin_cone = helper.itemView.findViewById(R.id.leixin_cone);
  356 + TextView content_tv = helper.itemView.findViewById(R.id.content_tv);
  357 + TextView class_tv = helper.itemView.findViewById(R.id.class_tv);
  358 + TextView teacher_tv = helper.itemView.findViewById(R.id.teacher_tv);
  359 + TextView date_tv = helper.itemView.findViewById(R.id.date_tv);
  360 + TextView state_tv = helper.itemView.findViewById(R.id.state_tv);
  361 + TextView yellow_tv = helper.itemView.findViewById(R.id.yellow_tv);
  362 + TextView gray_tv = helper.itemView.findViewById(R.id.gray_tv);
  363 + TextView massage_num = helper.itemView.findViewById(R.id.massage_num);
  364 + LinearLayout ck_lin = helper.itemView.findViewById(R.id.ck_lin);
  365 + if (item.getLabel().equals("通知")) {
  366 + leixing_text.setText(item.getLabel());
  367 + leixin_cone.setImageResource(R.mipmap.icon_worktz2);
  368 + leixing_text.setBackgroundResource(R.mipmap.icon_worktz1);
  369 + } else if (item.getLabel().equals("喜报")) {
  370 + leixing_text.setText(item.getLabel());
  371 + leixin_cone.setImageResource(R.mipmap.icon_news2);
  372 + leixing_text.setBackgroundResource(R.mipmap.icon_news1);
  373 + } else if (item.getLabel().equals("警示")) {
  374 + leixing_text.setText(item.getLabel());
  375 + leixin_cone.setImageResource(R.mipmap.icon_caution2);
  376 + leixing_text.setBackgroundResource(R.mipmap.icon_caution1);
299 } 377 }
300 -  
301 - @Override  
302 - protected void convert(BaseViewHolder helper, TzlistJzEntity.DataBeanX.DataBean item) {  
303 - TextView leixing_text = helper.itemView.findViewById(R.id.leixing_text);  
304 - TextView title = helper.itemView.findViewById(R.id.title);  
305 - ImageView leixin_cone = helper.itemView.findViewById(R.id.leixin_cone);  
306 - TextView content_tv = helper.itemView.findViewById(R.id.content_tv);  
307 - TextView class_tv = helper.itemView.findViewById(R.id.class_tv);  
308 - TextView teacher_tv = helper.itemView.findViewById(R.id.teacher_tv);  
309 - TextView date_tv = helper.itemView.findViewById(R.id.date_tv);  
310 - TextView state_tv = helper.itemView.findViewById(R.id.state_tv);  
311 - TextView yellow_tv = helper.itemView.findViewById(R.id.yellow_tv);  
312 - TextView gray_tv = helper.itemView.findViewById(R.id.gray_tv);  
313 - TextView massage_num = helper.itemView.findViewById(R.id.massage_num);  
314 - LinearLayout ck_lin = helper.itemView.findViewById(R.id.ck_lin);  
315 - if (item.getLabel().equals("通知")){  
316 - leixing_text.setText(item.getLabel());  
317 - leixin_cone.setImageResource(R.mipmap.icon_worktz2);  
318 - leixing_text.setBackgroundResource(R.mipmap.icon_worktz1);  
319 - }else if (item.getLabel().equals("喜报")){  
320 - leixing_text.setText(item.getLabel());  
321 - leixin_cone.setImageResource(R.mipmap.icon_news2);  
322 - leixing_text.setBackgroundResource(R.mipmap.icon_news1);  
323 - }else if (item.getLabel().equals("警示")){  
324 - leixing_text.setText(item.getLabel());  
325 - leixin_cone.setImageResource(R.mipmap.icon_caution2);  
326 - leixing_text.setBackgroundResource(R.mipmap.icon_caution1);  
327 - }  
328 - title.setText(item.getTitle());  
329 - content_tv.setText(item.getContent());  
330 - class_tv.setText(item.getClass_name());  
331 - teacher_tv.setText(item.getTeacher_name());  
332 - date_tv.setText(item.getDate());  
333 - yellow_tv.setText(item.getView_num() + "");  
334 - gray_tv.setText("/" + item.getTotal_num());  
335 - yellow_tv.setVisibility(View.GONE);  
336 - gray_tv.setVisibility(View.GONE);  
337 - helper.addOnClickListener(R.id.ck_lin);  
338 - state_tv.setText(item.getStatus_text());  
339 - if (item.getStatus()==2){  
340 - massage_num.setVisibility(View.GONE);  
341 - }else {  
342 - massage_num.setText(1+"");  
343 - } 378 + title.setText(item.getTitle());
  379 + content_tv.setText(item.getContent());
  380 + class_tv.setText(item.getClass_name());
  381 + teacher_tv.setText(item.getTeacher_name());
  382 + date_tv.setText(item.getDate());
  383 + yellow_tv.setText(item.getView_num() + "");
  384 + gray_tv.setText("/" + item.getTotal_num());
  385 + yellow_tv.setVisibility(View.GONE);
  386 + gray_tv.setVisibility(View.GONE);
  387 + helper.addOnClickListener(R.id.ck_lin);
  388 + state_tv.setText(item.getStatus_text());
  389 + if (item.getStatus() == 2) {
  390 + massage_num.setVisibility(View.GONE);
  391 + } else {
  392 + massage_num.setText(1 + "");
344 } 393 }
345 } 394 }
  395 +}
346 396
@@ -32,7 +32,7 @@ public class TzimgAdapter extends BaseQuickAdapter<JxtImageEntity, BaseViewHolde @@ -32,7 +32,7 @@ public class TzimgAdapter extends BaseQuickAdapter<JxtImageEntity, BaseViewHolde
32 item_select_pic_video.setVisibility(View.VISIBLE); 32 item_select_pic_video.setVisibility(View.VISIBLE);
33 } 33 }
34 helper.addOnClickListener(R.id.v_delete); 34 helper.addOnClickListener(R.id.v_delete);
35 - helper.addOnClickListener(R.id.item_select_pic_video); 35 +// helper.addOnClickListener(R.id.item_select_pic_video);
36 36
37 } 37 }
38 } 38 }
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 android:layout_marginLeft="@dimen/dp_15" 70 android:layout_marginLeft="@dimen/dp_15"
71 android:layout_marginRight="@dimen/dp_15" 71 android:layout_marginRight="@dimen/dp_15"
72 android:layout_width="match_parent" 72 android:layout_width="match_parent"
73 - android:layout_height="@dimen/dp_1"> 73 + android:layout_height="1px">
74 </View> 74 </View>
75 </LinearLayout> 75 </LinearLayout>
76 <LinearLayout 76 <LinearLayout
@@ -118,7 +118,8 @@ @@ -118,7 +118,8 @@
118 android:layout_width="match_parent" 118 android:layout_width="match_parent"
119 android:layout_height="@dimen/dp_50" 119 android:layout_height="@dimen/dp_50"
120 android:id="@+id/moBan_Rv" 120 android:id="@+id/moBan_Rv"
121 - android:layout_marginRight="@dimen/dp_8" 121 + android:paddingRight="@dimen/dp_16"
  122 + android:paddingLeft="@dimen/dp_16"
122 android:layout_marginBottom="@dimen/dp_16"/> 123 android:layout_marginBottom="@dimen/dp_16"/>
123 124
124 </LinearLayout> 125 </LinearLayout>
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 android:background="@null" 48 android:background="@null"
49 android:hint="请输入账号" 49 android:hint="请输入账号"
50 android:maxLines="1" 50 android:maxLines="1"
51 - android:text="15825260252" 51 + android:text="13769183554"
52 android:textColor="@color/color_bdc4ce" 52 android:textColor="@color/color_bdc4ce"
53 android:textSize="@dimen/sp_16" /> 53 android:textSize="@dimen/sp_16" />
54 54
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout  
3 - xmlns:android="http://schemas.android.com/apk/res/android" 2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
5 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
6 android:layout_width="match_parent" 5 android:layout_width="match_parent"
7 android:layout_height="match_parent" 6 android:layout_height="match_parent"
8 - android:orientation="vertical"  
9 android:background="#F7F7F7" 7 android:background="#F7F7F7"
  8 + android:orientation="vertical"
10 tools:context=".ui.jxt.activity.TZ.TzxqActivity"> 9 tools:context=".ui.jxt.activity.TZ.TzxqActivity">
11 10
12 - <LinearLayout 11 + <RelativeLayout
13 android:id="@+id/titie" 12 android:id="@+id/titie"
14 android:layout_width="match_parent" 13 android:layout_width="match_parent"
15 - android:layout_height="wrap_content"  
16 - android:orientation="horizontal"  
17 - android:gravity="center_vertical"  
18 - > 14 + android:layout_height="@dimen/dp_45"
  15 + android:background="@color/white"
  16 + android:gravity="center_vertical">
19 17
20 <ImageView 18 <ImageView
  19 + android:id="@+id/include_back"
21 android:layout_width="wrap_content" 20 android:layout_width="wrap_content"
22 android:layout_height="wrap_content" 21 android:layout_height="wrap_content"
23 - android:src="@mipmap/back_icon" 22 + android:layout_centerVertical="true"
24 android:layout_marginLeft="@dimen/dp_6" 23 android:layout_marginLeft="@dimen/dp_6"
25 - android:id="@+id/include_back"  
26 android:padding="@dimen/dp_10" 24 android:padding="@dimen/dp_10"
27 - /> 25 + android:src="@mipmap/back_icon" />
28 26
29 <TextView 27 <TextView
30 - android:layout_width="0dp"  
31 - android:layout_weight="1" 28 + android:id="@+id/include_name"
  29 + android:layout_width="match_parent"
32 android:layout_height="match_parent" 30 android:layout_height="match_parent"
33 android:gravity="center" 31 android:gravity="center"
34 - android:textSize="@dimen/sp_16"  
35 android:text="通知详情" 32 android:text="通知详情"
36 android:textColor="@color/color_06121e" 33 android:textColor="@color/color_06121e"
37 - android:textStyle="bold"  
38 - android:id="@+id/include_name"  
39 - /> 34 + android:textSize="@dimen/sp_16"
  35 + android:textStyle="bold" />
  36 +
40 <ImageView 37 <ImageView
41 android:id="@+id/tv_jlxq_sc" 38 android:id="@+id/tv_jlxq_sc"
42 - android:layout_marginRight="@dimen/dp_16"  
43 android:layout_width="@dimen/dp_21" 39 android:layout_width="@dimen/dp_21"
44 android:layout_height="@dimen/dp_21" 40 android:layout_height="@dimen/dp_21"
  41 + android:layout_alignParentRight="true"
  42 + android:layout_centerVertical="true"
  43 + android:layout_marginRight="@dimen/dp_16"
45 android:src="@mipmap/icon_more" /> 44 android:src="@mipmap/icon_more" />
46 45
47 46
48 -  
49 - </LinearLayout> 47 + </RelativeLayout>
50 48
51 <RelativeLayout 49 <RelativeLayout
52 - android:layout_marginTop="@dimen/dp_20"  
53 android:layout_width="match_parent" 50 android:layout_width="match_parent"
54 android:layout_height="match_parent"> 51 android:layout_height="match_parent">
55 52
56 -  
57 <android.support.v4.widget.NestedScrollView 53 <android.support.v4.widget.NestedScrollView
58 android:layout_width="match_parent" 54 android:layout_width="match_parent"
59 android:layout_height="match_parent"> 55 android:layout_height="match_parent">
  56 +
60 <LinearLayout 57 <LinearLayout
61 - android:layout_below="@+id/titie"  
62 android:layout_width="match_parent" 58 android:layout_width="match_parent"
63 android:layout_height="match_parent" 59 android:layout_height="match_parent"
  60 + android:layout_below="@+id/titie"
64 android:orientation="vertical"> 61 android:orientation="vertical">
  62 +
65 <LinearLayout 63 <LinearLayout
66 android:id="@+id/teacher_lin" 64 android:id="@+id/teacher_lin"
67 android:layout_width="match_parent" 65 android:layout_width="match_parent"
68 android:layout_height="@dimen/dp_68" 66 android:layout_height="@dimen/dp_68"
69 android:background="#FFFFFF" 67 android:background="#FFFFFF"
70 android:orientation="horizontal"> 68 android:orientation="horizontal">
  69 +
71 <ImageView 70 <ImageView
72 android:id="@+id/jlxq_img" 71 android:id="@+id/jlxq_img"
73 - android:layout_marginLeft="@dimen/dp_16"  
74 android:layout_width="@dimen/dp_44" 72 android:layout_width="@dimen/dp_44"
75 android:layout_height="@dimen/dp_44" 73 android:layout_height="@dimen/dp_44"
76 android:layout_gravity="center_vertical" 74 android:layout_gravity="center_vertical"
77 - /> 75 + android:layout_marginLeft="@dimen/dp_16" />
  76 +
78 <LinearLayout 77 <LinearLayout
79 android:layout_width="wrap_content" 78 android:layout_width="wrap_content"
80 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
81 android:layout_marginLeft="@dimen/dp_8" 80 android:layout_marginLeft="@dimen/dp_8"
82 android:orientation="vertical"> 81 android:orientation="vertical">
  82 +
83 <TextView 83 <TextView
84 android:id="@+id/jl_ls_name" 84 android:id="@+id/jl_ls_name"
85 - android:layout_marginTop="@dimen/dp_12"  
86 android:layout_width="wrap_content" 85 android:layout_width="wrap_content"
87 android:layout_height="wrap_content" 86 android:layout_height="wrap_content"
88 - android:textSize="@dimen/sp_16"  
89 - android:textColor="#3D444D"/> 87 + android:layout_marginTop="@dimen/dp_12"
  88 + android:textColor="#3D444D"
  89 + android:textSize="@dimen/sp_16" />
  90 +
90 <TextView 91 <TextView
91 android:id="@+id/jl_bj" 92 android:id="@+id/jl_bj"
92 - android:layout_marginTop="@dimen/dp_4"  
93 android:layout_width="wrap_content" 93 android:layout_width="wrap_content"
94 android:layout_height="wrap_content" 94 android:layout_height="wrap_content"
  95 + android:layout_marginTop="@dimen/dp_4"
95 android:textColor="#8C9198" 96 android:textColor="#8C9198"
96 - android:textSize="@dimen/sp_12"/> 97 + android:textSize="@dimen/sp_12" />
97 </LinearLayout> 98 </LinearLayout>
  99 +
98 <TextView 100 <TextView
99 android:id="@+id/jl_time" 101 android:id="@+id/jl_time"
100 android:layout_width="wrap_content" 102 android:layout_width="wrap_content"
101 android:layout_height="wrap_content" 103 android:layout_height="wrap_content"
102 - android:textColor="#8C9198"  
103 android:layout_marginLeft="@dimen/dp_4" 104 android:layout_marginLeft="@dimen/dp_4"
104 android:layout_marginTop="@dimen/dp_38" 105 android:layout_marginTop="@dimen/dp_38"
105 - android:textSize="@dimen/sp_12"/> 106 + android:textColor="#8C9198"
  107 + android:textSize="@dimen/sp_12" />
106 108
107 109
108 </LinearLayout> 110 </LinearLayout>
109 111
110 112
111 <LinearLayout 113 <LinearLayout
112 - android:layout_marginTop="@dimen/dp_5"  
113 - android:background="@drawable/shape_solid_4_fff"  
114 android:layout_width="match_parent" 114 android:layout_width="match_parent"
115 android:layout_height="match_parent" 115 android:layout_height="match_parent"
116 android:layout_marginLeft="@dimen/dp_16" 116 android:layout_marginLeft="@dimen/dp_16"
  117 + android:layout_marginTop="@dimen/dp_5"
117 android:layout_marginRight="@dimen/dp_16" 118 android:layout_marginRight="@dimen/dp_16"
  119 + android:background="@drawable/shape_solid_4_fff"
118 android:orientation="vertical"> 120 android:orientation="vertical">
  121 +
119 <TextView 122 <TextView
  123 + android:id="@+id/tz_title_tv"
120 android:layout_width="wrap_content" 124 android:layout_width="wrap_content"
121 android:layout_height="wrap_content" 125 android:layout_height="wrap_content"
122 - android:textSize="@dimen/sp_16"  
123 android:layout_marginLeft="@dimen/dp_15" 126 android:layout_marginLeft="@dimen/dp_15"
124 - android:textStyle="bold"  
125 - android:id="@+id/tz_title_tv"  
126 android:layout_marginTop="@dimen/dp_20" 127 android:layout_marginTop="@dimen/dp_20"
127 - android:textColor="#3D444D"/> 128 + android:textColor="#3D444D"
  129 + android:textSize="@dimen/sp_16"
  130 + android:textStyle="bold" />
  131 +
128 <View 132 <View
129 android:layout_width="match_parent" 133 android:layout_width="match_parent"
130 android:layout_height="1dp" 134 android:layout_height="1dp"
131 - android:background="#EBEBEB" 135 + android:layout_marginLeft="@dimen/dp_15"
132 android:layout_marginTop="@dimen/dp_13" 136 android:layout_marginTop="@dimen/dp_13"
133 android:layout_marginRight="@dimen/dp_15" 137 android:layout_marginRight="@dimen/dp_15"
134 - android:layout_marginLeft="@dimen/dp_15"  
135 - /> 138 + android:background="#EBEBEB" />
  139 +
136 <TextView 140 <TextView
137 - android:layout_marginTop="@dimen/dp_8"  
138 android:id="@+id/tz_xqlist" 141 android:id="@+id/tz_xqlist"
139 - android:layout_marginRight="@dimen/dp_15"  
140 - android:layout_marginLeft="@dimen/dp_15"  
141 android:layout_width="match_parent" 142 android:layout_width="match_parent"
142 - android:layout_height="match_parent">  
143 - </TextView> 143 + android:layout_height="match_parent"
  144 + android:layout_marginLeft="@dimen/dp_15"
  145 + android:layout_marginTop="@dimen/dp_8"
  146 + android:layout_marginRight="@dimen/dp_15"></TextView>
144 147
145 <LinearLayout 148 <LinearLayout
146 - android:orientation="vertical"  
147 android:layout_width="match_parent" 149 android:layout_width="match_parent"
148 - android:layout_height="wrap_content"> 150 + android:layout_height="wrap_content"
  151 + android:orientation="vertical">
149 152
150 <android.support.v7.widget.RecyclerView 153 <android.support.v7.widget.RecyclerView
151 android:id="@+id/voice_recycler" 154 android:id="@+id/voice_recycler"
152 android:layout_width="match_parent" 155 android:layout_width="match_parent"
153 android:layout_height="wrap_content" 156 android:layout_height="wrap_content"
154 android:background="#FFFFFF" 157 android:background="#FFFFFF"
155 - android:paddingBottom="@dimen/dp_10"  
156 - android:paddingHorizontal="@dimen/dp_16"></android.support.v7.widget.RecyclerView> 158 + android:paddingHorizontal="@dimen/dp_16"
  159 + android:paddingBottom="@dimen/dp_10"></android.support.v7.widget.RecyclerView>
157 160
158 <android.support.v7.widget.RecyclerView 161 <android.support.v7.widget.RecyclerView
159 android:id="@+id/img_recycle" 162 android:id="@+id/img_recycle"
@@ -164,42 +167,42 @@ @@ -164,42 +167,42 @@
164 167
165 </LinearLayout> 168 </LinearLayout>
166 169
167 -<!-- <androidx.recyclerview.widget.RecyclerView-->  
168 -<!-- android:id="@+id/rv_ck"-->  
169 -<!-- android:paddingHorizontal="@dimen/dp_16"-->  
170 -<!-- android:background="#FFFFFF"-->  
171 -<!-- android:layout_width="match_parent"-->  
172 -<!-- android:layout_height="wrap_content">--> 170 + <!-- <androidx.recyclerview.widget.RecyclerView-->
  171 + <!-- android:id="@+id/rv_ck"-->
  172 + <!-- android:paddingHorizontal="@dimen/dp_16"-->
  173 + <!-- android:background="#FFFFFF"-->
  174 + <!-- android:layout_width="match_parent"-->
  175 + <!-- android:layout_height="wrap_content">-->
173 176
174 -<!-- </androidx.recyclerview.widget.RecyclerView>--> 177 + <!-- </androidx.recyclerview.widget.RecyclerView>-->
175 178
176 179
177 </LinearLayout> 180 </LinearLayout>
178 181
179 <LinearLayout 182 <LinearLayout
180 android:id="@+id/ll_ck" 183 android:id="@+id/ll_ck"
181 - android:orientation="vertical"  
182 - android:layout_marginTop="@dimen/sp_16"  
183 - android:textColor="#5B5E63"  
184 - android:background="#FFFFFF" 184 + android:layout_width="match_parent"
  185 + android:layout_height="match_parent"
185 android:layout_marginLeft="@dimen/dp_16" 186 android:layout_marginLeft="@dimen/dp_16"
  187 + android:layout_marginTop="@dimen/sp_16"
186 android:layout_marginRight="@dimen/dp_16" 188 android:layout_marginRight="@dimen/dp_16"
187 - android:layout_width="match_parent"  
188 - android:layout_height="match_parent"> 189 + android:background="#FFFFFF"
  190 + android:orientation="vertical"
  191 + android:textColor="#5B5E63">
  192 +
189 <TextView 193 <TextView
190 android:id="@+id/tv_chakan" 194 android:id="@+id/tv_chakan"
191 - android:text="已查看(0)" 195 + android:layout_width="match_parent"
  196 + android:layout_height="wrap_content"
192 android:padding="@dimen/sp_10" 197 android:padding="@dimen/sp_10"
  198 + android:text="已查看(0)"
193 android:textColor="#5B5E63" 199 android:textColor="#5B5E63"
194 - android:layout_width="match_parent"  
195 - android:textSize="@dimen/dp_14"  
196 - android:layout_height="wrap_content">  
197 - </TextView> 200 + android:textSize="@dimen/dp_14"></TextView>
  201 +
198 <android.support.v7.widget.RecyclerView 202 <android.support.v7.widget.RecyclerView
199 android:id="@+id/ck_recycle" 203 android:id="@+id/ck_recycle"
200 android:layout_width="match_parent" 204 android:layout_width="match_parent"
201 - android:layout_height="match_parent">  
202 - </android.support.v7.widget.RecyclerView> 205 + android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
203 206
204 </LinearLayout> 207 </LinearLayout>
205 208
@@ -44,12 +44,7 @@ @@ -44,12 +44,7 @@
44 44
45 </LinearLayout> 45 </LinearLayout>
46 <!-- 日期RecyclerView --> 46 <!-- 日期RecyclerView -->
47 - <android.support.v7.widget.RecyclerView  
48 - android:layout_below="@id/jxt_matter_li"  
49 - android:layout_width="match_parent"  
50 - android:layout_height="match_parent"  
51 - android:id="@+id/data_rv"></android.support.v7.widget.RecyclerView>  
52 - <androidx.swiperefreshlayout.widget.SwipeRefreshLayout 47 + <android.support.v4.widget.SwipeRefreshLayout
53 android:id="@+id/my_sw" 48 android:id="@+id/my_sw"
54 android:layout_width="match_parent" 49 android:layout_width="match_parent"
55 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
@@ -61,7 +56,7 @@ @@ -61,7 +56,7 @@
61 android:layout_height="match_parent" 56 android:layout_height="match_parent"
62 android:background="@color/bg" 57 android:background="@color/bg"
63 android:layout_below="@id/jxt_matter_li"></androidx.recyclerview.widget.RecyclerView> 58 android:layout_below="@id/jxt_matter_li"></androidx.recyclerview.widget.RecyclerView>
64 - </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> 59 + </android.support.v4.widget.SwipeRefreshLayout>
65 </RelativeLayout> 60 </RelativeLayout>
66 61
67 </RelativeLayout> 62 </RelativeLayout>
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 7
8 <RelativeLayout 8 <RelativeLayout
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 - android:background="#F7F7F7"  
11 - android:layout_height="match_parent"> 10 + android:layout_height="match_parent"
  11 + android:background="#F7F7F7">
12 <!-- 代办事项 --> 12 <!-- 代办事项 -->
13 <LinearLayout 13 <LinearLayout
14 android:id="@+id/jxt_matter_li" 14 android:id="@+id/jxt_matter_li"
@@ -34,6 +34,16 @@ @@ -34,6 +34,16 @@
34 android:textSize="@dimen/sp_15" 34 android:textSize="@dimen/sp_15"
35 android:textStyle="bold" /> 35 android:textStyle="bold" />
36 36
  37 + <TextView
  38 + android:id="@+id/tv_week"
  39 + android:layout_width="wrap_content"
  40 + android:layout_height="wrap_content"
  41 + android:layout_marginLeft="@dimen/dp_8"
  42 + android:text=""
  43 + android:textColor="@color/color_3d444d"
  44 + android:textSize="@dimen/sp_15"
  45 + android:textStyle="bold" />
  46 +
37 <View 47 <View
38 android:layout_width="@dimen/dp_0" 48 android:layout_width="@dimen/dp_0"
39 android:layout_height="wrap_content" 49 android:layout_height="wrap_content"
@@ -47,11 +57,18 @@ @@ -47,11 +57,18 @@
47 57
48 </LinearLayout> 58 </LinearLayout>
49 <!-- 日期RecyclerView --> 59 <!-- 日期RecyclerView -->
50 - <android.support.v7.widget.RecyclerView  
51 - android:layout_below="@id/jxt_matter_li" 60 + <android.support.v4.widget.SwipeRefreshLayout
  61 + android:id="@+id/my_sw"
52 android:layout_width="match_parent" 62 android:layout_width="match_parent"
53 - android:layout_height="match_parent"  
54 - android:id="@+id/data_rv"></android.support.v7.widget.RecyclerView> 63 + android:layout_height="wrap_content"
  64 + android:layout_below="@id/jxt_matter_li">
  65 +
  66 + <android.support.v7.widget.RecyclerView
  67 + android:id="@+id/data_rv"
  68 + android:layout_width="match_parent"
  69 + android:layout_height="match_parent"
  70 + android:layout_below="@id/jxt_matter_li"></android.support.v7.widget.RecyclerView>
  71 + </android.support.v4.widget.SwipeRefreshLayout>
55 </RelativeLayout> 72 </RelativeLayout>
56 73
57 </RelativeLayout> 74 </RelativeLayout>