李明 / ClasManage · 提交

转到一个项目

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

222

内嵌 并排对比
正在显示 13 个修改的文件 包含 117 行增加 和 113 行删除
... ... @@ -502,7 +502,7 @@ public class StuEvaFragment extends BaseFragment {
if(student.size() > 0){
arr1.addAll(student);
}
if(arr2.size() > 0){
if(group.size() > 0){
arr2.addAll(group);
}
stuAdapter.notifyDataSetChanged();
... ...
... ... @@ -122,7 +122,6 @@ public class ZpglActivity extends BaseActivity {
popupWindow.dismiss();
});
}
// 数据
... ... @@ -132,12 +131,8 @@ public class ZpglActivity extends BaseActivity {
if (data.getCode() == M.success) {
List<ZplistEntity.DataBeanX.DataBean> sj = data.getData().getData();
list.addAll(sj);
if (zpglAdapter == null) {
zpglAdapter = new ZpglAdapter(R.layout.item_zpgl, list);
rv.setAdapter(zpglAdapter);
} else {
zpglAdapter.notifyDataSetChanged();
}
zpglAdapter = new ZpglAdapter(R.layout.item_zpgl, list);
rv.setAdapter(zpglAdapter);
zpglAdapter.setOnItemChildClickListener((adapter, view, position) -> {
... ...
... ... @@ -166,6 +166,8 @@ public class AddZpActivity extends BaseActivity {
String videoPath = ""; // 视频和缩略图最后上传的时候路径 , 需要拼接
int[] arrDate = new int[3]; // 数组用来存储时间
@Override
protected void initData() {
CODE1 = M.ADDCODE;
... ... @@ -289,29 +291,29 @@ public class AddZpActivity extends BaseActivity {
case R.id.add_zp_bj: // 右上角的编辑按钮
// if (zp_bj_text.getText().toString().trim().equals("编辑")) {
zp_bj_linear.setVisibility(View.GONE);
bottom.setVisibility(View.GONE);
detailbj.setVisibility(View.VISIBLE);
zp_bj_linear.setVisibility(View.GONE);
bottom.setVisibility(View.GONE);
detailbj.setVisibility(View.VISIBLE);
zp_bj_linear.setVisibility(View.INVISIBLE);
zp_bj_linear.setVisibility(View.INVISIBLE);
edit_name.setEnabled(false); // 不可编辑
edit_value.setEnabled(false);
zplx.setClickable(true);
edit_name.setEnabled(false); // 不可编辑
edit_value.setEnabled(false);
zplx.setClickable(true);
edit_kwmc.setEnabled(false);
zplevel.setClickable(true);
edit_kwmc.setEnabled(false);
zplevel.setClickable(true);
date.setClickable(true);
date.setClickable(true);
edit_xq.setEnabled(false);
add_pic.setVisibility(View.GONE);
add_video.setVisibility(View.GONE);
edit_xq.setEnabled(false);
add_pic.setVisibility(View.GONE);
add_video.setVisibility(View.GONE);
QWER = false;
QWER = false;
extra = CODE3;
picAdapter.notifyDataSetChanged();
extra = CODE3;
picAdapter.notifyDataSetChanged();
break;
case R.id.include_back:
... ... @@ -353,14 +355,16 @@ public class AddZpActivity extends BaseActivity {
}
break;
case R.id.add_zp_linear_sj: // 作品时间
new DateChooseDialog(activity) {
new DateChooseDialog(activity,arrDate) {
@Override
public void SelectSure(String tag) {
public void SelectSure(String tag, int[] selectDate) {
if (tag.equals("1")) {
dismiss();
} else {
date.setText(tag);
arrDate = selectDate;
dismiss();
M.log("arrDate", arrDate.toString());
}
}
}.show();
... ... @@ -611,14 +615,19 @@ public class AddZpActivity extends BaseActivity {
vidThu.setPoster("");
if (cursor.moveToFirst()) {
String vidurl = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Video.Media.DATA));
int id = cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Video.Media._ID));// 大小
vidThu.setVideo(vidurl);
String imguri = M.getThumbnailPathForLocalFile(activity, id);
vidThu.setPoster(imguri);
picAndVideo.clear();
postFile(vidThu.getVideo(), 2); // 视频
postFile(vidThu.getPoster(), 2); // 视频缩略图
String sub = vidurl.substring(vidurl.length() - 3, vidurl.length());
if(sub.equals("jpg") || sub.equals("png") || sub.equals("peg") || sub.equals("gif")){
M.toast(activity,"非视频文件 , 选择失败");
}else {
int id = cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Video.Media._ID));// 大小
vidThu.setVideo(vidurl);
String imguri = M.getThumbnailPathForLocalFile(activity, id);
vidThu.setPoster(imguri);
picAndVideo.clear();
postFile(vidThu.getVideo(), 2); // 视频
postFile(vidThu.getPoster(), 2); // 视频缩略图
}
}
cursor.close();
}
... ...
... ... @@ -50,6 +50,7 @@ import com.yinhebairong.clasmanage.widget.CircleImageView;
import com.yinhebairong.clasmanage.widget.DatePickerView;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import butterknife.BindView;
... ... @@ -261,7 +262,12 @@ public class PjfxActivity extends BaseActivity {
int[] month = level.getMonth();
if (month != null && month.length > 1) {
picker.setDate(month[0], month[1]);
Log.e("newValueAAA", month[0] + "--" + month[1]);
}else {
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
int monthx = calendar.get(Calendar.MONTH);
picker.setDate(year, monthx);
}
// - > 进入之后默认选中
... ...
... ... @@ -51,6 +51,7 @@ import com.yinhebairong.clasmanage.widget.CircleImageView;
import com.yinhebairong.clasmanage.widget.DatePickerView;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import butterknife.BindView;
... ... @@ -407,9 +408,13 @@ public class PjfxActivity_per extends BaseActivity {
if (month != null && month.length > 1) {
picker.setDate(month[0], month[1]);
Log.e("newValueAAA", month[0] + "--" + month[1]);
} else {
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
int monthx = calendar.get(Calendar.MONTH);
picker.setDate(year, monthx);
}
// int[] selectDate = picker.getSelectDate();
// level.setMonth(selectDate);
// - > 进入之后默认选中
if (level.getKey() != 0) {
... ... @@ -417,9 +422,9 @@ public class PjfxActivity_per extends BaseActivity {
listAdapter.notifyDataSetChanged();
if ((level.getKey() - 1) == 1) { // 1 - > 月
level.setKey(2);
picker.setVisibility(View.VISIBLE);
rv.setVisibility(View.GONE);
level.setKey(2);
if (level.getMonth() != null) {
picker.setDate(level.getMonth()[0], level.getMonth()[1]); // 数据
... ... @@ -430,17 +435,16 @@ public class PjfxActivity_per extends BaseActivity {
picker.setVisibility(View.GONE);
if ((level.getKey() - 1) == 0) {
setDate(rv, level.getKey(), 3, 1);
level.setKey(1);
setDate(rv, 0, 3, 1); // level.getKey()
} else if ((level.getKey() - 1) == 2) {
setDate(rv, 1, 2, 3);
level.setKey(3);
setDate(rv, 1, 2, 3);
} else {
setDate(rv, 2, 2, 4);
level.setKey(4);
setDate(rv, 2, 2, 4);
}
}
... ... @@ -511,9 +515,9 @@ public class PjfxActivity_per extends BaseActivity {
requestKey = level.getKey() + "";
requestValue = level.getMonth_value();
if(requestValue != null){
if (requestValue != null) {
tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), requestKey + "", requestValue);
}else {
} else {
tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), requestKey, picker.getSelectDate()[0] + "-" + "1");
}
... ... @@ -533,7 +537,7 @@ public class PjfxActivity_per extends BaseActivity {
level.setMonth(null);
level.setMonth_value("");
if (level.getKey() == 0 || level.getValue() != 1000) {
if (level.getKey() == 0 || level.getValue() == 1000) {
tb_data(requestId, Integer.valueOf(getIntent().getStringExtra(M.StuId)), "", "");
} else {
requestKey = level.getKey() + "";
... ...
... ... @@ -9,7 +9,11 @@ import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
import com.yinhebairong.clasmanage.R;
import java.util.Calendar;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
... ... @@ -28,9 +32,12 @@ public abstract class DateChooseDialog extends Dialog {
Unbinder unbinder;
String date;
public DateChooseDialog(Activity activity) {
int[] chosNum;
public DateChooseDialog(Activity activity, int[] arrDate) {
super(activity, R.style.SmrzDialog);
this.activity = activity;
this.chosNum = arrDate;
}
@Override
... ... @@ -41,16 +48,26 @@ public abstract class DateChooseDialog extends Dialog {
setViewLocation(); //底部
setCanceledOnTouchOutside(true); //外部点击
int[] selectDate = picker.getSelectDate();
date = selectDate[0] + "-" + selectDate[1] + "-" + selectDate[2];
Log.e("selectDate", date);
if (chosNum[0] != 0) {
picker.setDate(chosNum[0], chosNum[1], chosNum[2]);
}else {
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
int monthx = calendar.get(Calendar.MONTH);
int day = calendar.get(Calendar.DAY_OF_MONTH);
picker.setDate(year, monthx, day);
}
cancle.setOnClickListener(v -> {
SelectSure("0");
SelectSure("1", new int[]{}); // 这个空数组用不到
});
sure.setOnClickListener(v -> {
SelectSure(date);
int[] selectDate = picker.getSelectDate();
date = selectDate[0] + "-" + selectDate[1] + "-" + selectDate[2];
Log.e("selectDate", date);
SelectSure(date, selectDate);
});
// 数据
... ... @@ -79,6 +96,6 @@ public abstract class DateChooseDialog extends Dialog {
onWindowAttributesChanged(lp);
}
public abstract void SelectSure(String tag); //确定
public abstract void SelectSure(String tag, int[] selectDate); //确定
}
... ...
... ... @@ -20,7 +20,7 @@ import java.util.ArrayList;
public class DatePickerView extends LinearLayout {
private static final int YEAR_MIN = 2019;
private static final int YEAR_MIN = 2008;
private static final int YEAR_MAX = 2040;
private int year = YEAR_MIN;
... ...
... ... @@ -73,8 +73,8 @@
android:layout_weight="1"
android:id="@+id/pjfx_sj_recycler"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_32"
></androidx.recyclerview.widget.RecyclerView>
android:layout_marginRight="@dimen/dp_11"
></androidx.recyclerview.widget.RecyclerView> <!-- 32-->
</LinearLayout>
... ...
... ... @@ -174,9 +174,6 @@
android:visibility="gone"
/>
<!--android:layout_height="@dimen/dp_0"-->
<!--android:layout_weight="1"-->
<!-- 21 -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_group"
android:layout_width="match_parent"
... ... @@ -186,35 +183,6 @@
android:visibility="gone"
/>
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:orientation="vertical">-->
<!--<TextView-->
<!--android:id="@+id/stu"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginLeft="@dimen/dp_16"-->
<!--android:layout_marginTop="@dimen/dp_16"-->
<!--android:layout_marginBottom="@dimen/dp_12"-->
<!--android:text="学生"-->
<!--android:textColor="@color/color_06121e"-->
<!--android:textSize="@dimen/sp_16" />-->
<!--<androidx.recyclerview.widget.RecyclerView-->
<!--android:id="@+id/recycler"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:layout_marginLeft="@dimen/dp_16"-->
<!--/>-->
<!--</LinearLayout>-->
<!--</ScrollView>-->
</LinearLayout>
</LinearLayout>
... ...
... ... @@ -2,10 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_13"
>
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/item_pjfx_sj_value"
... ... @@ -45,25 +44,38 @@
android:layout_height="@dimen/dp_1"
android:layout_weight="1" />
<TextView
android:id="@+id/item_pjfx_sj_cul"
android:layout_width="@dimen/dp_30"
<LinearLayout
android:layout_width="@dimen/dp_60"
android:layout_height="wrap_content"
android:text="25"
android:textColor="@color/color_5b5e63"
android:textSize="@dimen/sp_13"
android:layout_marginRight="@dimen/dp_45"
android:gravity="center"
/>
android:layout_marginRight="@dimen/dp_15"
>
<TextView
android:id="@+id/item_pjfx_sj_last"
android:layout_width="@dimen/dp_30"
<TextView
android:id="@+id/item_pjfx_sj_cul"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="25"
android:textColor="@color/color_5b5e63"
android:textSize="@dimen/sp_13" />
</LinearLayout>
<LinearLayout
android:layout_width="@dimen/dp_60"
android:layout_height="wrap_content"
android:text="25"
android:textColor="@color/color_5b5e63"
android:textSize="@dimen/sp_13"
android:gravity="center"
/>
android:gravity="center">
<TextView
android:id="@+id/item_pjfx_sj_last"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="25"
android:textColor="@color/color_5b5e63"
android:textSize="@dimen/sp_13" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
... ...
... ... @@ -51,13 +51,6 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<!--<androidx.recyclerview.widget.RecyclerView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:id="@+id/item_goup_rv"-->
<!--android:layout_marginLeft="@dimen/dp_15"-->
<!--&gt;</androidx.recyclerview.widget.RecyclerView>-->
<include layout="@layout/item_tx_list" />
<TextView
... ...