李明 / ClasManage · 提交

转到一个项目

作者 liming
提交 9dfa84b289c9b44d1e5d2c62ff5b63c593656d28 1 个父辈 3be03dc3

222

内嵌 并排对比
正在显示 13 个修改的文件 包含 117 行增加 和 113 行删除
@@ -502,7 +502,7 @@ public class StuEvaFragment extends BaseFragment { @@ -502,7 +502,7 @@ public class StuEvaFragment extends BaseFragment {
502 if(student.size() > 0){ 502 if(student.size() > 0){
503 arr1.addAll(student); 503 arr1.addAll(student);
504 } 504 }
505 - if(arr2.size() > 0){ 505 + if(group.size() > 0){
506 arr2.addAll(group); 506 arr2.addAll(group);
507 } 507 }
508 stuAdapter.notifyDataSetChanged(); 508 stuAdapter.notifyDataSetChanged();
@@ -122,7 +122,6 @@ public class ZpglActivity extends BaseActivity { @@ -122,7 +122,6 @@ public class ZpglActivity extends BaseActivity {
122 popupWindow.dismiss(); 122 popupWindow.dismiss();
123 }); 123 });
124 124
125 -  
126 } 125 }
127 126
128 // 数据 127 // 数据
@@ -132,12 +131,8 @@ public class ZpglActivity extends BaseActivity { @@ -132,12 +131,8 @@ public class ZpglActivity extends BaseActivity {
132 if (data.getCode() == M.success) { 131 if (data.getCode() == M.success) {
133 List<ZplistEntity.DataBeanX.DataBean> sj = data.getData().getData(); 132 List<ZplistEntity.DataBeanX.DataBean> sj = data.getData().getData();
134 list.addAll(sj); 133 list.addAll(sj);
135 - if (zpglAdapter == null) {  
136 - zpglAdapter = new ZpglAdapter(R.layout.item_zpgl, list);  
137 - rv.setAdapter(zpglAdapter);  
138 - } else {  
139 - zpglAdapter.notifyDataSetChanged();  
140 - } 134 + zpglAdapter = new ZpglAdapter(R.layout.item_zpgl, list);
  135 + rv.setAdapter(zpglAdapter);
141 136
142 zpglAdapter.setOnItemChildClickListener((adapter, view, position) -> { 137 zpglAdapter.setOnItemChildClickListener((adapter, view, position) -> {
143 138
@@ -166,6 +166,8 @@ public class AddZpActivity extends BaseActivity { @@ -166,6 +166,8 @@ public class AddZpActivity extends BaseActivity {
166 166
167 String videoPath = ""; // 视频和缩略图最后上传的时候路径 , 需要拼接 167 String videoPath = ""; // 视频和缩略图最后上传的时候路径 , 需要拼接
168 168
  169 + int[] arrDate = new int[3]; // 数组用来存储时间
  170 +
169 @Override 171 @Override
170 protected void initData() { 172 protected void initData() {
171 CODE1 = M.ADDCODE; 173 CODE1 = M.ADDCODE;
@@ -289,29 +291,29 @@ public class AddZpActivity extends BaseActivity { @@ -289,29 +291,29 @@ public class AddZpActivity extends BaseActivity {
289 case R.id.add_zp_bj: // 右上角的编辑按钮 291 case R.id.add_zp_bj: // 右上角的编辑按钮
290 // if (zp_bj_text.getText().toString().trim().equals("编辑")) { 292 // if (zp_bj_text.getText().toString().trim().equals("编辑")) {
291 293
292 - zp_bj_linear.setVisibility(View.GONE);  
293 - bottom.setVisibility(View.GONE);  
294 - detailbj.setVisibility(View.VISIBLE); 294 + zp_bj_linear.setVisibility(View.GONE);
  295 + bottom.setVisibility(View.GONE);
  296 + detailbj.setVisibility(View.VISIBLE);
295 297
296 - zp_bj_linear.setVisibility(View.INVISIBLE); 298 + zp_bj_linear.setVisibility(View.INVISIBLE);
297 299
298 - edit_name.setEnabled(false); // 不可编辑  
299 - edit_value.setEnabled(false);  
300 - zplx.setClickable(true); 300 + edit_name.setEnabled(false); // 不可编辑
  301 + edit_value.setEnabled(false);
  302 + zplx.setClickable(true);
301 303
302 - edit_kwmc.setEnabled(false);  
303 - zplevel.setClickable(true); 304 + edit_kwmc.setEnabled(false);
  305 + zplevel.setClickable(true);
304 306
305 - date.setClickable(true); 307 + date.setClickable(true);
306 308
307 - edit_xq.setEnabled(false);  
308 - add_pic.setVisibility(View.GONE);  
309 - add_video.setVisibility(View.GONE); 309 + edit_xq.setEnabled(false);
  310 + add_pic.setVisibility(View.GONE);
  311 + add_video.setVisibility(View.GONE);
310 312
311 - QWER = false; 313 + QWER = false;
312 314
313 - extra = CODE3;  
314 - picAdapter.notifyDataSetChanged(); 315 + extra = CODE3;
  316 + picAdapter.notifyDataSetChanged();
315 317
316 break; 318 break;
317 case R.id.include_back: 319 case R.id.include_back:
@@ -353,14 +355,16 @@ public class AddZpActivity extends BaseActivity { @@ -353,14 +355,16 @@ public class AddZpActivity extends BaseActivity {
353 } 355 }
354 break; 356 break;
355 case R.id.add_zp_linear_sj: // 作品时间 357 case R.id.add_zp_linear_sj: // 作品时间
356 - new DateChooseDialog(activity) { 358 + new DateChooseDialog(activity,arrDate) {
357 @Override 359 @Override
358 - public void SelectSure(String tag) { 360 + public void SelectSure(String tag, int[] selectDate) {
359 if (tag.equals("1")) { 361 if (tag.equals("1")) {
360 dismiss(); 362 dismiss();
361 } else { 363 } else {
362 date.setText(tag); 364 date.setText(tag);
  365 + arrDate = selectDate;
363 dismiss(); 366 dismiss();
  367 + M.log("arrDate", arrDate.toString());
364 } 368 }
365 } 369 }
366 }.show(); 370 }.show();
@@ -611,14 +615,19 @@ public class AddZpActivity extends BaseActivity { @@ -611,14 +615,19 @@ public class AddZpActivity extends BaseActivity {
611 vidThu.setPoster(""); 615 vidThu.setPoster("");
612 if (cursor.moveToFirst()) { 616 if (cursor.moveToFirst()) {
613 String vidurl = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Video.Media.DATA)); 617 String vidurl = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Video.Media.DATA));
614 - int id = cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Video.Media._ID));// 大小  
615 - vidThu.setVideo(vidurl);  
616 - String imguri = M.getThumbnailPathForLocalFile(activity, id);  
617 - vidThu.setPoster(imguri);  
618 -  
619 - picAndVideo.clear();  
620 - postFile(vidThu.getVideo(), 2); // 视频  
621 - postFile(vidThu.getPoster(), 2); // 视频缩略图 618 + String sub = vidurl.substring(vidurl.length() - 3, vidurl.length());
  619 + if(sub.equals("jpg") || sub.equals("png") || sub.equals("peg") || sub.equals("gif")){
  620 + M.toast(activity,"非视频文件 , 选择失败");
  621 + }else {
  622 + int id = cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Video.Media._ID));// 大小
  623 + vidThu.setVideo(vidurl);
  624 + String imguri = M.getThumbnailPathForLocalFile(activity, id);
  625 + vidThu.setPoster(imguri);
  626 +
  627 + picAndVideo.clear();
  628 + postFile(vidThu.getVideo(), 2); // 视频
  629 + postFile(vidThu.getPoster(), 2); // 视频缩略图
  630 + }
622 } 631 }
623 cursor.close(); 632 cursor.close();
624 } 633 }
@@ -50,6 +50,7 @@ import com.yinhebairong.clasmanage.widget.CircleImageView; @@ -50,6 +50,7 @@ import com.yinhebairong.clasmanage.widget.CircleImageView;
50 import com.yinhebairong.clasmanage.widget.DatePickerView; 50 import com.yinhebairong.clasmanage.widget.DatePickerView;
51 51
52 import java.util.ArrayList; 52 import java.util.ArrayList;
  53 +import java.util.Calendar;
53 import java.util.List; 54 import java.util.List;
54 55
55 import butterknife.BindView; 56 import butterknife.BindView;
@@ -261,7 +262,12 @@ public class PjfxActivity extends BaseActivity { @@ -261,7 +262,12 @@ public class PjfxActivity extends BaseActivity {
261 int[] month = level.getMonth(); 262 int[] month = level.getMonth();
262 if (month != null && month.length > 1) { 263 if (month != null && month.length > 1) {
263 picker.setDate(month[0], month[1]); 264 picker.setDate(month[0], month[1]);
264 - Log.e("newValueAAA", month[0] + "--" + month[1]); 265 + }else {
  266 + Calendar calendar = Calendar.getInstance();
  267 + int year = calendar.get(Calendar.YEAR);
  268 + int monthx = calendar.get(Calendar.MONTH);
  269 +
  270 + picker.setDate(year, monthx);
265 } 271 }
266 272
267 // - > 进入之后默认选中 273 // - > 进入之后默认选中
@@ -51,6 +51,7 @@ import com.yinhebairong.clasmanage.widget.CircleImageView; @@ -51,6 +51,7 @@ import com.yinhebairong.clasmanage.widget.CircleImageView;
51 import com.yinhebairong.clasmanage.widget.DatePickerView; 51 import com.yinhebairong.clasmanage.widget.DatePickerView;
52 52
53 import java.util.ArrayList; 53 import java.util.ArrayList;
  54 +import java.util.Calendar;
54 import java.util.List; 55 import java.util.List;
55 56
56 import butterknife.BindView; 57 import butterknife.BindView;
@@ -407,9 +408,13 @@ public class PjfxActivity_per extends BaseActivity { @@ -407,9 +408,13 @@ public class PjfxActivity_per extends BaseActivity {
407 if (month != null && month.length > 1) { 408 if (month != null && month.length > 1) {
408 picker.setDate(month[0], month[1]); 409 picker.setDate(month[0], month[1]);
409 Log.e("newValueAAA", month[0] + "--" + month[1]); 410 Log.e("newValueAAA", month[0] + "--" + month[1]);
  411 + } else {
  412 + Calendar calendar = Calendar.getInstance();
  413 + int year = calendar.get(Calendar.YEAR);
  414 + int monthx = calendar.get(Calendar.MONTH);
  415 +
  416 + picker.setDate(year, monthx);
410 } 417 }
411 -// int[] selectDate = picker.getSelectDate();  
412 -// level.setMonth(selectDate);  
413 418
414 // - > 进入之后默认选中 419 // - > 进入之后默认选中
415 if (level.getKey() != 0) { 420 if (level.getKey() != 0) {
@@ -417,9 +422,9 @@ public class PjfxActivity_per extends BaseActivity { @@ -417,9 +422,9 @@ public class PjfxActivity_per extends BaseActivity {
417 listAdapter.notifyDataSetChanged(); 422 listAdapter.notifyDataSetChanged();
418 423
419 if ((level.getKey() - 1) == 1) { // 1 - > 月 424 if ((level.getKey() - 1) == 1) { // 1 - > 月
  425 + level.setKey(2);
420 picker.setVisibility(View.VISIBLE); 426 picker.setVisibility(View.VISIBLE);
421 rv.setVisibility(View.GONE); 427 rv.setVisibility(View.GONE);
422 - level.setKey(2);  
423 428
424 if (level.getMonth() != null) { 429 if (level.getMonth() != null) {
425 picker.setDate(level.getMonth()[0], level.getMonth()[1]); // 数据 430 picker.setDate(level.getMonth()[0], level.getMonth()[1]); // 数据
@@ -430,17 +435,16 @@ public class PjfxActivity_per extends BaseActivity { @@ -430,17 +435,16 @@ public class PjfxActivity_per extends BaseActivity {
430 picker.setVisibility(View.GONE); 435 picker.setVisibility(View.GONE);
431 436
432 if ((level.getKey() - 1) == 0) { 437 if ((level.getKey() - 1) == 0) {
433 - setDate(rv, level.getKey(), 3, 1);  
434 level.setKey(1); 438 level.setKey(1);
  439 + setDate(rv, 0, 3, 1); // level.getKey()
435 440
436 } else if ((level.getKey() - 1) == 2) { 441 } else if ((level.getKey() - 1) == 2) {
437 - setDate(rv, 1, 2, 3);  
438 level.setKey(3); 442 level.setKey(3);
  443 + setDate(rv, 1, 2, 3);
439 444
440 } else { 445 } else {
441 - setDate(rv, 2, 2, 4);  
442 level.setKey(4); 446 level.setKey(4);
443 - 447 + setDate(rv, 2, 2, 4);
444 } 448 }
445 449
446 } 450 }
@@ -511,9 +515,9 @@ public class PjfxActivity_per extends BaseActivity { @@ -511,9 +515,9 @@ public class PjfxActivity_per extends BaseActivity {
511 requestKey = level.getKey() + ""; 515 requestKey = level.getKey() + "";
512 requestValue = level.getMonth_value(); 516 requestValue = level.getMonth_value();
513 517
514 - if(requestValue != null){ 518 + if (requestValue != null) {
515 tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), requestKey + "", requestValue); 519 tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), requestKey + "", requestValue);
516 - }else { 520 + } else {
517 tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), requestKey, picker.getSelectDate()[0] + "-" + "1"); 521 tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), requestKey, picker.getSelectDate()[0] + "-" + "1");
518 } 522 }
519 523
@@ -533,7 +537,7 @@ public class PjfxActivity_per extends BaseActivity { @@ -533,7 +537,7 @@ public class PjfxActivity_per extends BaseActivity {
533 level.setMonth(null); 537 level.setMonth(null);
534 level.setMonth_value(""); 538 level.setMonth_value("");
535 539
536 - if (level.getKey() == 0 || level.getValue() != 1000) { 540 + if (level.getKey() == 0 || level.getValue() == 1000) {
537 tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), "", ""); 541 tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), "", "");
538 } else { 542 } else {
539 requestKey = level.getKey() + ""; 543 requestKey = level.getKey() + "";
@@ -9,7 +9,11 @@ import android.view.ViewGroup; @@ -9,7 +9,11 @@ import android.view.ViewGroup;
9 import android.view.Window; 9 import android.view.Window;
10 import android.view.WindowManager; 10 import android.view.WindowManager;
11 import android.widget.TextView; 11 import android.widget.TextView;
  12 +
12 import com.yinhebairong.clasmanage.R; 13 import com.yinhebairong.clasmanage.R;
  14 +
  15 +import java.util.Calendar;
  16 +
13 import butterknife.BindView; 17 import butterknife.BindView;
14 import butterknife.ButterKnife; 18 import butterknife.ButterKnife;
15 import butterknife.Unbinder; 19 import butterknife.Unbinder;
@@ -28,9 +32,12 @@ public abstract class DateChooseDialog extends Dialog { @@ -28,9 +32,12 @@ public abstract class DateChooseDialog extends Dialog {
28 Unbinder unbinder; 32 Unbinder unbinder;
29 String date; 33 String date;
30 34
31 - public DateChooseDialog(Activity activity) { 35 + int[] chosNum;
  36 +
  37 + public DateChooseDialog(Activity activity, int[] arrDate) {
32 super(activity, R.style.SmrzDialog); 38 super(activity, R.style.SmrzDialog);
33 this.activity = activity; 39 this.activity = activity;
  40 + this.chosNum = arrDate;
34 } 41 }
35 42
36 @Override 43 @Override
@@ -41,16 +48,26 @@ public abstract class DateChooseDialog extends Dialog { @@ -41,16 +48,26 @@ public abstract class DateChooseDialog extends Dialog {
41 setViewLocation(); //底部 48 setViewLocation(); //底部
42 setCanceledOnTouchOutside(true); //外部点击 49 setCanceledOnTouchOutside(true); //外部点击
43 50
44 - int[] selectDate = picker.getSelectDate();  
45 - date = selectDate[0] + "-" + selectDate[1] + "-" + selectDate[2];  
46 - Log.e("selectDate", date); 51 + if (chosNum[0] != 0) {
  52 + picker.setDate(chosNum[0], chosNum[1], chosNum[2]);
  53 + }else {
  54 + Calendar calendar = Calendar.getInstance();
  55 + int year = calendar.get(Calendar.YEAR);
  56 + int monthx = calendar.get(Calendar.MONTH);
  57 + int day = calendar.get(Calendar.DAY_OF_MONTH);
  58 +
  59 + picker.setDate(year, monthx, day);
  60 + }
47 61
48 cancle.setOnClickListener(v -> { 62 cancle.setOnClickListener(v -> {
49 - SelectSure("0"); 63 + SelectSure("1", new int[]{}); // 这个空数组用不到
50 }); 64 });
51 65
52 sure.setOnClickListener(v -> { 66 sure.setOnClickListener(v -> {
53 - SelectSure(date); 67 + int[] selectDate = picker.getSelectDate();
  68 + date = selectDate[0] + "-" + selectDate[1] + "-" + selectDate[2];
  69 + Log.e("selectDate", date);
  70 + SelectSure(date, selectDate);
54 }); 71 });
55 72
56 // 数据 73 // 数据
@@ -79,6 +96,6 @@ public abstract class DateChooseDialog extends Dialog { @@ -79,6 +96,6 @@ public abstract class DateChooseDialog extends Dialog {
79 onWindowAttributesChanged(lp); 96 onWindowAttributesChanged(lp);
80 } 97 }
81 98
82 - public abstract void SelectSure(String tag); //确定 99 + public abstract void SelectSure(String tag, int[] selectDate); //确定
83 100
84 } 101 }
@@ -20,7 +20,7 @@ import java.util.ArrayList; @@ -20,7 +20,7 @@ import java.util.ArrayList;
20 public class DatePickerView extends LinearLayout { 20 public class DatePickerView extends LinearLayout {
21 21
22 22
23 - private static final int YEAR_MIN = 2019; 23 + private static final int YEAR_MIN = 2008;
24 private static final int YEAR_MAX = 2040; 24 private static final int YEAR_MAX = 2040;
25 25
26 private int year = YEAR_MIN; 26 private int year = YEAR_MIN;
@@ -73,8 +73,8 @@ @@ -73,8 +73,8 @@
73 android:layout_weight="1" 73 android:layout_weight="1"
74 android:id="@+id/pjfx_sj_recycler" 74 android:id="@+id/pjfx_sj_recycler"
75 android:layout_marginLeft="@dimen/dp_16" 75 android:layout_marginLeft="@dimen/dp_16"
76 - android:layout_marginRight="@dimen/dp_32"  
77 - ></androidx.recyclerview.widget.RecyclerView> 76 + android:layout_marginRight="@dimen/dp_11"
  77 + ></androidx.recyclerview.widget.RecyclerView> <!-- 32-->
78 78
79 </LinearLayout> 79 </LinearLayout>
80 80
@@ -174,9 +174,6 @@ @@ -174,9 +174,6 @@
174 android:visibility="gone" 174 android:visibility="gone"
175 /> 175 />
176 176
177 - <!--android:layout_height="@dimen/dp_0"-->  
178 - <!--android:layout_weight="1"-->  
179 - <!-- 21 -->  
180 <androidx.recyclerview.widget.RecyclerView 177 <androidx.recyclerview.widget.RecyclerView
181 android:id="@+id/rv_group" 178 android:id="@+id/rv_group"
182 android:layout_width="match_parent" 179 android:layout_width="match_parent"
@@ -186,35 +183,6 @@ @@ -186,35 +183,6 @@
186 android:visibility="gone" 183 android:visibility="gone"
187 /> 184 />
188 185
189 - <!--<LinearLayout-->  
190 - <!--android:layout_width="match_parent"-->  
191 - <!--android:layout_height="match_parent"-->  
192 - <!--android:orientation="vertical">-->  
193 -  
194 - <!--<TextView-->  
195 - <!--android:id="@+id/stu"-->  
196 - <!--android:layout_width="wrap_content"-->  
197 - <!--android:layout_height="wrap_content"-->  
198 - <!--android:layout_marginLeft="@dimen/dp_16"-->  
199 - <!--android:layout_marginTop="@dimen/dp_16"-->  
200 - <!--android:layout_marginBottom="@dimen/dp_12"-->  
201 - <!--android:text="学生"-->  
202 - <!--android:textColor="@color/color_06121e"-->  
203 - <!--android:textSize="@dimen/sp_16" />-->  
204 -  
205 - <!--<androidx.recyclerview.widget.RecyclerView-->  
206 - <!--android:id="@+id/recycler"-->  
207 - <!--android:layout_width="match_parent"-->  
208 - <!--android:layout_height="match_parent"-->  
209 - <!--android:layout_marginLeft="@dimen/dp_16"-->  
210 - <!--/>-->  
211 -  
212 -  
213 -  
214 - <!--</LinearLayout>-->  
215 -  
216 - <!--</ScrollView>-->  
217 -  
218 </LinearLayout> 186 </LinearLayout>
219 187
220 </LinearLayout> 188 </LinearLayout>
@@ -2,10 +2,9 @@ @@ -2,10 +2,9 @@
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="wrap_content" 4 android:layout_height="wrap_content"
5 - android:gravity="center_vertical"  
6 - android:orientation="horizontal"  
7 android:layout_marginTop="@dimen/dp_13" 5 android:layout_marginTop="@dimen/dp_13"
8 - > 6 + android:gravity="center_vertical"
  7 + android:orientation="horizontal">
9 8
10 <TextView 9 <TextView
11 android:id="@+id/item_pjfx_sj_value" 10 android:id="@+id/item_pjfx_sj_value"
@@ -45,25 +44,38 @@ @@ -45,25 +44,38 @@
45 android:layout_height="@dimen/dp_1" 44 android:layout_height="@dimen/dp_1"
46 android:layout_weight="1" /> 45 android:layout_weight="1" />
47 46
48 - <TextView  
49 - android:id="@+id/item_pjfx_sj_cul"  
50 - android:layout_width="@dimen/dp_30" 47 + <LinearLayout
  48 + android:layout_width="@dimen/dp_60"
51 android:layout_height="wrap_content" 49 android:layout_height="wrap_content"
52 - android:text="25"  
53 - android:textColor="@color/color_5b5e63"  
54 - android:textSize="@dimen/sp_13"  
55 - android:layout_marginRight="@dimen/dp_45"  
56 android:gravity="center" 50 android:gravity="center"
57 - /> 51 + android:layout_marginRight="@dimen/dp_15"
  52 + >
58 53
59 - <TextView  
60 - android:id="@+id/item_pjfx_sj_last"  
61 - android:layout_width="@dimen/dp_30" 54 + <TextView
  55 + android:id="@+id/item_pjfx_sj_cul"
  56 + android:layout_width="wrap_content"
  57 + android:layout_height="wrap_content"
  58 + android:gravity="center"
  59 + android:text="25"
  60 + android:textColor="@color/color_5b5e63"
  61 + android:textSize="@dimen/sp_13" />
  62 +
  63 + </LinearLayout>
  64 +
  65 + <LinearLayout
  66 + android:layout_width="@dimen/dp_60"
62 android:layout_height="wrap_content" 67 android:layout_height="wrap_content"
63 - android:text="25"  
64 - android:textColor="@color/color_5b5e63"  
65 - android:textSize="@dimen/sp_13"  
66 - android:gravity="center"  
67 - /> 68 + android:gravity="center">
  69 +
  70 + <TextView
  71 + android:id="@+id/item_pjfx_sj_last"
  72 + android:layout_width="wrap_content"
  73 + android:layout_height="wrap_content"
  74 + android:gravity="center"
  75 + android:text="25"
  76 + android:textColor="@color/color_5b5e63"
  77 + android:textSize="@dimen/sp_13" />
  78 +
  79 + </LinearLayout>
68 80
69 </LinearLayout> 81 </LinearLayout>
@@ -51,13 +51,6 @@ @@ -51,13 +51,6 @@
51 android:gravity="center_vertical" 51 android:gravity="center_vertical"
52 android:orientation="horizontal"> 52 android:orientation="horizontal">
53 53
54 - <!--<androidx.recyclerview.widget.RecyclerView-->  
55 - <!--android:layout_width="wrap_content"-->  
56 - <!--android:layout_height="wrap_content"-->  
57 - <!--android:id="@+id/item_goup_rv"-->  
58 - <!--android:layout_marginLeft="@dimen/dp_15"-->  
59 - <!--&gt;</androidx.recyclerview.widget.RecyclerView>-->  
60 -  
61 <include layout="@layout/item_tx_list" /> 54 <include layout="@layout/item_tx_list" />
62 55
63 <TextView 56 <TextView