李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 6d5dc62d4007c1e1fba3ad86160ed939dcb29c34 1 个父辈 d991d7e8

add

内嵌 并排对比
正在显示 7 个修改的文件 包含 376 行增加 和 265 行删除
... ... @@ -1400,6 +1400,15 @@ public class Fbhd_Activity extends BaseActivity {
player.startPlayLogic();
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
// 隐藏输入键盘
public void hintKbTwo() {
KeyBoardUtils.closeKeybord(contentEd, this);
... ...
... ... @@ -1043,6 +1043,14 @@ public class Hdxq_Activity extends BaseActivity {
}
}
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
}
... ...
... ... @@ -199,7 +199,7 @@ public class FbtzA_ctivity extends BaseActivity {
mediaPlayer.setLooping(false);
mediaPlayer.setVolume(0.5f, 0.5f);
Intent intent = getIntent();
if (intent.getStringExtra("zhuanfa")!=null){
if (intent.getStringExtra("zhuanfa") != null) {
String zhuanfa = intent.getStringExtra("zhuanfa");
setData(zhuanfa);
}
... ... @@ -227,28 +227,29 @@ public class FbtzA_ctivity extends BaseActivity {
xbNum.setText(Math.abs(tzxqEntity.getData().getScore()));
break;
}
if (tzxqEntity.getData().getImages()!=null){
for (int i = 0; i <tzxqEntity.getData().getImages().size() ; i++) {
if (tzxqEntity.getData().getImages() != null) {
for (int i = 0; i < tzxqEntity.getData().getImages().size(); i++) {
ImagesUrl.add(tzxqEntity.getData().getImages().get(i));
picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getImages().get(i),1));
picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getImages().get(i), 1));
}
}
if (tzxqEntity.getData().getVideo()!=null){
if (tzxqEntity.getData().getVideo() != null) {
for (int i = 0; i <tzxqEntity.getData().getAudio().size() ; i++) {
for (int i = 0; i < tzxqEntity.getData().getAudio().size(); i++) {
videoUrl.add(tzxqEntity.getData().getVideo().get(i));
picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getVideo().get(i),2,getNetVideoBitmap(tzxqEntity.getData().getVideo().get(i))));
picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getVideo().get(i), 2, getNetVideoBitmap(tzxqEntity.getData().getVideo().get(i))));
}
}
imageAdapter.setNewData(picAndVideo);
List<VideoEntity> frequencyUrl = new ArrayList<>();
if (tzxqEntity.getData().getAudio()!=null){
for (int i = 0; i <tzxqEntity.getData().getAudio().size() ; i++) {
frequencyUrl.add(new VideoEntity(tzxqEntity.getData().getAudio().get(i),false));
if (tzxqEntity.getData().getAudio() != null) {
for (int i = 0; i < tzxqEntity.getData().getAudio().size(); i++) {
frequencyUrl.add(new VideoEntity(tzxqEntity.getData().getAudio().get(i), false));
}
}
audioAdapter.setNewData(frequencyUrl);
}
public static Bitmap getNetVideoBitmap(String videoUrl) {
Bitmap bitmap = null;
... ... @@ -612,6 +613,7 @@ public class FbtzA_ctivity extends BaseActivity {
break;
}
}
@Override
protected void setEvent() {
includeBack.setOnClickListener(new View.OnClickListener() {
... ... @@ -664,8 +666,8 @@ public class FbtzA_ctivity extends BaseActivity {
links = TextUtils.join(",", links_list);
Gson gson = new Gson();
String s = gson.toJson(dataBeans);
if (itemBean!=null){
Api().fbtz(Config.Token, s, name, content, itemBean.getCall(), itemBean.getInscription(), img, audio, video, links,xbNum.getText().toString(),itemBean.getId()+"").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {
if (itemBean != null) {
Api().fbtz(Config.Token, s, name, content, itemBean.getCall(), itemBean.getInscription(), img, audio, video, links, xbNum.getText().toString(), itemBean.getId() + "").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {
@Override
public void onSubscribe(Disposable d) {
... ... @@ -674,7 +676,7 @@ public class FbtzA_ctivity extends BaseActivity {
@Override
public void onNext(FbtzEntity fbtzEntity) {
if (fbtzEntity.getCode() == M.success) {
Tz_Rv_Fragment.DO_REFRESH=true;
Tz_Rv_Fragment.DO_REFRESH = true;
finish();
} else {
Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show();
... ... @@ -692,8 +694,8 @@ public class FbtzA_ctivity extends BaseActivity {
}
});
}else {
Api().fbtz(Config.Token, s, name, content, "", "", img, audio, video, links,xbNum.getText().toString(),"").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {
} else {
Api().fbtz(Config.Token, s, name, content, "", "", img, audio, video, links, xbNum.getText().toString(), "").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {
@Override
public void onSubscribe(Disposable d) {
... ... @@ -702,7 +704,7 @@ public class FbtzA_ctivity extends BaseActivity {
@Override
public void onNext(FbtzEntity fbtzEntity) {
if (fbtzEntity.getCode() == M.success) {
Tz_Rv_Fragment.DO_REFRESH=true;
Tz_Rv_Fragment.DO_REFRESH = true;
finish();
} else {
Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show();
... ... @@ -727,7 +729,7 @@ public class FbtzA_ctivity extends BaseActivity {
} else {
Toast.makeText(ctx, "请输入通知的标题", Toast.LENGTH_SHORT).show();
}
}else {
} else {
Toast.makeText(ctx, "接收人不能为空", Toast.LENGTH_SHORT).show();
}
... ... @@ -857,12 +859,12 @@ public class FbtzA_ctivity extends BaseActivity {
dataBeans.add(new TzUserDate.DataBean(getClassListEntity.getData().get(i).getClass_id(), TextUtils.join(",", teachersId), TextUtils.join(",", parent_ids)));
}
}
}else {
} else {
Toast.makeText(this, "空", Toast.LENGTH_SHORT).show();
}
if (class_names.size()!=0){
if (class_names.size() != 0) {
ClassAdapter classAdapter = new ClassAdapter(R.layout.item_classitem, class_names);
classRv.setLayoutManager(new LinearLayoutManager(FbtzA_ctivity.this,0,false));
classRv.setLayoutManager(new LinearLayoutManager(FbtzA_ctivity.this, 0, false));
classRv.setAdapter(classAdapter);
}
classType.setText("");
... ... @@ -891,7 +893,7 @@ public class FbtzA_ctivity extends BaseActivity {
// 视频缩略图路径：MediaStore.Images.Media.DATA
String imagePath = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA));
postFile(videoPath, 2, imagePath);
DebugLog.e("压缩前==="+ FilesUtil.getFileOrFilesSize(imagePath,3));
DebugLog.e("压缩前===" + FilesUtil.getFileOrFilesSize(imagePath, 3));
}
}
imageAdapter.notifyDataSetChanged();
... ... @@ -918,8 +920,8 @@ public class FbtzA_ctivity extends BaseActivity {
@Override
public void onSuccess(File file) {
// TODO 压缩成功后调用，返回压缩后的图片文件
DebugLog.e("压缩后==="+FilesUtil.getFileOrFilesSize(file.getAbsolutePath(),3));
postFile(file.getAbsolutePath(),1,"");
DebugLog.e("压缩后===" + FilesUtil.getFileOrFilesSize(file.getAbsolutePath(), 3));
postFile(file.getAbsolutePath(), 1, "");
}
@Override
... ... @@ -945,14 +947,14 @@ public class FbtzA_ctivity extends BaseActivity {
.enqueue(new Callback<PostFiel>() {
@Override
public void onResponse(Call<PostFiel> call, Response<PostFiel> response) {
DebugLog.e("response===="+response.message());
if(response.message().contains("Too Large")){
Toast.makeText(FbtzA_ctivity.this,"文件过大",Toast.LENGTH_SHORT).show();
DebugLog.e("response====" + response.message());
if (response.message().contains("Too Large")) {
Toast.makeText(FbtzA_ctivity.this, "文件过大", Toast.LENGTH_SHORT).show();
return;
}
if (i == 1) {
ImagesUrl.add(response.body().getData().getUrl());
Log.e("Tag", "onResponse: "+ImagesUrl);
Log.e("Tag", "onResponse: " + ImagesUrl);
picAndVideo.add(new JxtImageEntity(response.body().getData().getUrl(), 1));
} else if (i == 2) {
videoUrl.add(response.body().getData().getUrl());
... ... @@ -987,9 +989,9 @@ public class FbtzA_ctivity extends BaseActivity {
Glide.with(mContext).load(item.getPath()).into(iv_picture);
item_select_pic_video.setVisibility(View.GONE);
} else if (item.getType() == 2) {
if (item.getMinPath()!=null){
if (item.getMinPath() != null) {
Glide.with(mContext).load(item.getMinPath()).into(iv_picture);
}else {
} else {
Glide.with(mContext).load(item.getMinBit()).into(iv_picture);
}
item_select_pic_video.setVisibility(View.VISIBLE);
... ... @@ -1032,6 +1034,7 @@ public class FbtzA_ctivity extends BaseActivity {
private void setAdapterTime() {
}
private void AudioPop() {
View view = LayoutInflater.from(FbtzA_ctivity.this).inflate(R.layout.pop_ly_window, null);
// 弹窗
... ... @@ -1219,7 +1222,8 @@ public class FbtzA_ctivity extends BaseActivity {
}
}
}
class ClassAdapter extends BaseQuickAdapter<String,BaseViewHolder>{
class ClassAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
public ClassAdapter(int layoutResId, @Nullable List<String> data) {
super(layoutResId, data);
... ... @@ -1232,5 +1236,15 @@ public class FbtzA_ctivity extends BaseActivity {
hdtext.setText(item);
}
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
}
... ...
... ... @@ -181,7 +181,7 @@ public class TzxqActivity extends BaseActivity {
// }
// tzXqlist.setText(charSequence);
// } else {
tzXqlist.setText(tzxqEntity.getData().getContent());
tzXqlist.setText(tzxqEntity.getData().getContent());
// }
List<String> audio = (List<String>) tzxqEntity.getData().getAudio();
List<VideoEntity> videoEntityList = new ArrayList<>();
... ... @@ -259,8 +259,8 @@ public class TzxqActivity extends BaseActivity {
ckRecycle.setAdapter(tz_yck_adapter);
tvChakan.setText("已查看（" + tzxqEntity.getData().getRe_view_num() + "）");
//如果列表和详情的数不等，刷新列表
if(getIntent().getIntExtra("view_num",0)!=tzxqEntity.getData().getRe_view_num()){
Tz_Rv_Fragment.DO_REFRESH=true;
if (getIntent().getIntExtra("view_num", 0) != tzxqEntity.getData().getRe_view_num()) {
Tz_Rv_Fragment.DO_REFRESH = true;
}
}
... ... @@ -682,4 +682,14 @@ public class TzxqActivity extends BaseActivity {
Glide.with(mContext).load(item.getPhoto()).into(ck_img);
}
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
}
\ No newline at end of file
... ...
... ... @@ -184,20 +184,21 @@ public class Fbzy_Activity extends BaseActivity {
MediaPlayer mediaPlayer;
ExecutorService executorService;
ImageAdapter imageAdapter;
TextView text_time;
TextView text_time;
com.yinhebairong.clasmanage.entity.getClassPersonListEntity getClassListEntity;
@Override
protected void initData() {
voiceRecycler.setLayoutManager(new GridLayoutManager(this,1));
audioAdapter = new AudioAdapter(R.layout.item_yinpin_layout,frequencyUrl);
voiceRecycler.setLayoutManager(new GridLayoutManager(this, 1));
audioAdapter = new AudioAdapter(R.layout.item_yinpin_layout, frequencyUrl);
imageAdapter = new ImageAdapter(R.layout.item_select_picture, picAndVideo);
voiceRecycler.setAdapter(audioAdapter);
mediaPlayer = new MediaPlayer();
mediaPlayer.setLooping(false);
mediaPlayer.setVolume(0.5f,0.5f);
mediaPlayer.setVolume(0.5f, 0.5f);
isHaveTj.setEnabled(false);
Intent intent = getIntent();
if (intent.getStringExtra("zhuanfa")!=null){
if (intent.getStringExtra("zhuanfa") != null) {
String zhuanfa = intent.getStringExtra("zhuanfa");
setData(zhuanfa);
}
... ... @@ -206,9 +207,9 @@ public class Fbzy_Activity extends BaseActivity {
private void setData(String zhuanfa) {
Gson gson = new Gson();
JxtEntity jxtEntity = gson.fromJson(zhuanfa, JxtEntity.class);
if (jxtEntity.getData().getIs_online()==0){
if (jxtEntity.getData().getIs_online() == 0) {
isHaveTj.setEnabled(false);
}else {
} else {
isHaveTj.setEnabled(true);
}
Date date = new Date(jxtEntity.getData().getDeadline());
... ... @@ -217,43 +218,44 @@ public class Fbzy_Activity extends BaseActivity {
endTimeText.setText(format);
workTitle.setText(jxtEntity.getData().getName());
contentEd.setText(jxtEntity.getData().getContent());
if (jxtEntity.getData().getImages()!=null){
for (int i = 0; i <jxtEntity.getData().getImages().size() ; i++) {
if (jxtEntity.getData().getImages() != null) {
for (int i = 0; i < jxtEntity.getData().getImages().size(); i++) {
ImagesUrl.add(jxtEntity.getData().getImages().get(i));
picAndVideo.add(new JxtImageEntity(jxtEntity.getData().getImages().get(i),1));
picAndVideo.add(new JxtImageEntity(jxtEntity.getData().getImages().get(i), 1));
}
}
switch (jxtEntity.getData().getCycle_type()){
switch (jxtEntity.getData().getCycle_type()) {
case "week":
fwTimeText.setText(jxtEntity.getData().getCycle_time()+"周");
fwTimeText.setText(jxtEntity.getData().getCycle_time() + "周");
break;
case "day":
fwTimeText.setText(jxtEntity.getData().getCycle_time()+"天");
fwTimeText.setText(jxtEntity.getData().getCycle_time() + "天");
break;
case "hour":
fwTimeText.setText(jxtEntity.getData().getCycle_time()+"时");
fwTimeText.setText(jxtEntity.getData().getCycle_time() + "时");
break;
case "minute":
fwTimeText.setText(jxtEntity.getData().getCycle_time()+"分");
fwTimeText.setText(jxtEntity.getData().getCycle_time() + "分");
break;
}
if (jxtEntity.getData().getVideo()!=null){
if (jxtEntity.getData().getVideo() != null) {
for (int i = 0; i <jxtEntity.getData().getAudio().size() ; i++) {
for (int i = 0; i < jxtEntity.getData().getAudio().size(); i++) {
videoUrl.add(jxtEntity.getData().getVideo().get(i));
picAndVideo.add(new JxtImageEntity(jxtEntity.getData().getVideo().get(i),2,getNetVideoBitmap(jxtEntity.getData().getVideo().get(i))));
picAndVideo.add(new JxtImageEntity(jxtEntity.getData().getVideo().get(i), 2, getNetVideoBitmap(jxtEntity.getData().getVideo().get(i))));
}
}
imageAdapter.setNewData(picAndVideo);
if (jxtEntity.getData().getAudio()!=null){
for (int i = 0; i <jxtEntity.getData().getAudio().size() ; i++) {
frequencyUrl.add(new VideoEntity(jxtEntity.getData().getAudio().get(i),false));
if (jxtEntity.getData().getAudio() != null) {
for (int i = 0; i < jxtEntity.getData().getAudio().size(); i++) {
frequencyUrl.add(new VideoEntity(jxtEntity.getData().getAudio().get(i), false));
}
}
audioAdapter.setNewData(frequencyUrl);
}
public static Bitmap getNetVideoBitmap(String videoUrl) {
Bitmap bitmap = null;
... ... @@ -346,11 +348,11 @@ public class Fbzy_Activity extends BaseActivity {
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.v_delete:
if (picAndVideo.get(position).getType()==1){
if (picAndVideo.get(position).getType() == 1) {
ImagesUrl.remove(picAndVideo.get(position).getPath());
}else if (picAndVideo.get(position).getType()==2){
} else if (picAndVideo.get(position).getType() == 2) {
videoUrl.remove(picAndVideo.get(position).getPath());
}else if (picAndVideo.get(position).getType()==3){
} else if (picAndVideo.get(position).getType() == 3) {
frequencyUrl.remove(picAndVideo.get(position).getPath());
}
picAndVideo.remove(position);
... ... @@ -369,8 +371,8 @@ public class Fbzy_Activity extends BaseActivity {
if (valueA.equals("0") && valueB.equals("0")) { // 取消
dismiss();
} else { // 确定
endTimeText.setText(valueA+" "+valueB);
EndTime = idA+" "+idB;
endTimeText.setText(valueA + " " + valueB);
EndTime = idA + " " + idB;
dismiss();
}
}
... ... @@ -386,9 +388,9 @@ public class Fbzy_Activity extends BaseActivity {
if (valueA.equals("0") && valueB.equals("0")) { // 取消
dismiss();
} else { // 确定
fwTimeText.setText(valueA+" "+valueB);
fwTimeText.setText(valueA + " " + valueB);
putTime = valueA;
switch (valueB){
switch (valueB) {
case "周":
putType = "week";
break;
... ... @@ -413,67 +415,67 @@ public class Fbzy_Activity extends BaseActivity {
button_tj.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (dataBeans!=null){
name = workTitle.getText().toString();
if (!name.equals("")){
content = contentEd.getText().toString();
if (!content.equals("")){
WaitDialog.show(Fbzy_Activity.this, "请稍候...");
if (isHaveTj.isEnabled()){
type = 1;
}else {
type = 0;
}
ArrayList<String> videos = new ArrayList<>();
for (int i = 0; i <frequencyUrl.size() ; i++) {
videos.add(frequencyUrl.get(i).getVideoPath());
}
audio = TextUtils.join(",",videos);
img = TextUtils.join(",",ImagesUrl);
video = TextUtils.join(",",videoUrl);
links = TextUtils.join(",",links_list);
Gson gson = new Gson();
String s = gson.toJson(dataBeans);
Api().publishTask(Config.Token,s,name,content,type,audio,video,img,links,EndTime,putType,putTime).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<getTaskStatusEntity>() {
@Override
public void onSubscribe(Disposable d) {
if (dataBeans != null) {
name = workTitle.getText().toString();
if (!name.equals("")) {
content = contentEd.getText().toString();
if (!content.equals("")) {
WaitDialog.show(Fbzy_Activity.this, "请稍候...");
if (isHaveTj.isEnabled()) {
type = 1;
} else {
type = 0;
}
ArrayList<String> videos = new ArrayList<>();
for (int i = 0; i < frequencyUrl.size(); i++) {
videos.add(frequencyUrl.get(i).getVideoPath());
}
audio = TextUtils.join(",", videos);
img = TextUtils.join(",", ImagesUrl);
video = TextUtils.join(",", videoUrl);
links = TextUtils.join(",", links_list);
Gson gson = new Gson();
String s = gson.toJson(dataBeans);
Api().publishTask(Config.Token, s, name, content, type, audio, video, img, links, EndTime, putType, putTime).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<getTaskStatusEntity>() {
@Override
public void onSubscribe(Disposable d) {
}
}
@Override
public void onNext(getTaskStatusEntity getTaskStatusEntity) {
if (getTaskStatusEntity.getCode()==1){
finish();
}
Toast.makeText(ctx, ""+getTaskStatusEntity.getMsg(), Toast.LENGTH_SHORT).show();
WaitDialog.dismiss();
@Override
public void onNext(getTaskStatusEntity getTaskStatusEntity) {
if (getTaskStatusEntity.getCode() == 1) {
finish();
}
Toast.makeText(ctx, "" + getTaskStatusEntity.getMsg(), Toast.LENGTH_SHORT).show();
WaitDialog.dismiss();
}
@Override
public void onError(Throwable e) {
@Override
public void onError(Throwable e) {
}
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}else {
Toast.makeText(Fbzy_Activity.this, "请输入作业内容", Toast.LENGTH_SHORT).show();
}
}else {
Toast.makeText(Fbzy_Activity.this, "请输入作业的标题", Toast.LENGTH_SHORT).show();
}
}else {
Toast.makeText(Fbzy_Activity.this, "请选择接受对象 ", Toast.LENGTH_SHORT).show();
}
});
} else {
Toast.makeText(Fbzy_Activity.this, "请输入作业内容", Toast.LENGTH_SHORT).show();
}
}
} else {
Toast.makeText(Fbzy_Activity.this, "请输入作业的标题", Toast.LENGTH_SHORT).show();
}
} else {
Toast.makeText(Fbzy_Activity.this, "请选择接受对象 ", Toast.LENGTH_SHORT).show();
}
}
});
imageAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
imgPop(picAndVideo,position);
imgPop(picAndVideo, position);
}
});
audioAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
... ... @@ -481,19 +483,19 @@ public class Fbzy_Activity extends BaseActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
text_time = view.findViewById(R.id.text_time);
List<VideoEntity> data = audioAdapter.getData();
for (int i = 0; i <data.size() ; i++) {
for (int i = 0; i < data.size(); i++) {
data.get(i).setChecked(false);
}
try {
if (mediaPlayer.isPlaying()){
if (mediaPlayer.isPlaying()) {
mediaPlayer.reset();
data.get(position).setChecked(true);
mediaPlayer.setDataSource(data.get(position).getVideoPath());
mediaPlayer.prepare();
mediaPlayer.start();
updateDescTv();
}else {
} else {
mediaPlayer.reset();
mediaPlayer.setDataSource(data.get(position).getVideoPath());
mediaPlayer.prepare();
... ... @@ -526,6 +528,7 @@ public class Fbzy_Activity extends BaseActivity {
}
});
}
@OnClick({R.id.ly_img, R.id.tp_img, R.id.sp_img, R.id.lj_img})
public void onViewClicked(View view) {
switch (view.getId()) {
... ... @@ -576,7 +579,9 @@ public class Fbzy_Activity extends BaseActivity {
break;
}
}
List<ZyUserDate.DataBean> dataBeans;
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
... ... @@ -604,26 +609,26 @@ public class Fbzy_Activity extends BaseActivity {
}
for (int j = 0; j < getClassListEntity.getData().get(i).getStudent().size(); j++) {
if (getClassListEntity.getData().get(i).getStudent().get(j).isChecked()) {
parent_ids.add(getClassListEntity.getData().get(i).getStudent().get(j).getId()+"");
parent_ids.add(getClassListEntity.getData().get(i).getStudent().get(j).getId() + "");
}
}
dataBeans.add(new ZyUserDate.DataBean(getClassListEntity.getData().get(i).getClass_id(), TextUtils.join(",", teachersId), TextUtils.join(",", parent_ids)));
}
}
}else {
} else {
Toast.makeText(this, "空", Toast.LENGTH_SHORT).show();
}
String names = TextUtils.join(",", class_names);
if (class_names.size()!=0){
if (class_names.size() != 0) {
ClassAdapter classAdapter = new ClassAdapter(R.layout.item_classitem, class_names);
classRv.setLayoutManager(new LinearLayoutManager(Fbzy_Activity.this,0,false));
classRv.setLayoutManager(new LinearLayoutManager(Fbzy_Activity.this, 0, false));
classRv.setAdapter(classAdapter);
}
classType.setText("");
} else if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) {
ArrayList<String> Imags = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
for (int i = 0; i <Imags.size() ; i++) {
postFile(Imags.get(i),1,"");
for (int i = 0; i < Imags.size(); i++) {
postFile(Imags.get(i), 1, "");
}
imageAdapter.notifyDataSetChanged();
} else if (requestCode == VIDEO_CODE && resultCode == RESULT_OK) {
... ... @@ -643,13 +648,14 @@ public class Fbzy_Activity extends BaseActivity {
String videoPath = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Video.Media.DATA));
// 视频缩略图路径：MediaStore.Images.Media.DATA
String imagePath = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA));
postFile(videoPath,2,imagePath);
postFile(videoPath, 2, imagePath);
}
}
imageAdapter.notifyDataSetChanged();
}
}
class ClassAdapter extends BaseQuickAdapter<String,BaseViewHolder>{
class ClassAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
public ClassAdapter(int layoutResId, @Nullable List<String> data) {
super(layoutResId, data);
... ... @@ -662,6 +668,7 @@ public class Fbzy_Activity extends BaseActivity {
hdtext.setText(item);
}
}
/**
* 处理权限申请的回调。
*
... ... @@ -682,8 +689,9 @@ public class Fbzy_Activity extends BaseActivity {
}
}
}
/*--------------------------------------------文件上传----------------------------------------------------------*/
private void postFile(String fielpath, int type,String imagePath) {
private void postFile(String fielpath, int type, String imagePath) {
// 上传文件
Retrofit sRetrofit = new Retrofit.Builder()
.baseUrl(Config.BASE_IP)
... ... @@ -697,18 +705,19 @@ public class Fbzy_Activity extends BaseActivity {
.enqueue(new Callback<PostFiel>() {
@Override
public void onResponse(Call<PostFiel> call, Response<PostFiel> response) {
if (type==1){
if (type == 1) {
ImagesUrl.add(response.body().getData().getUrl());
picAndVideo.add(new JxtImageEntity(response.body().getData().getUrl(),1));
}else if (type==2){
picAndVideo.add(new JxtImageEntity(response.body().getData().getUrl(), 1));
} else if (type == 2) {
videoUrl.add(response.body().getData().getUrl());
picAndVideo.add(new JxtImageEntity(response.body().getData().getUrl(),2,imagePath));
}else if (type==3){
frequencyUrl.add(new VideoEntity(response.body().getData().getUrl(),false));
picAndVideo.add(new JxtImageEntity(response.body().getData().getUrl(), 2, imagePath));
} else if (type == 3) {
frequencyUrl.add(new VideoEntity(response.body().getData().getUrl(), false));
}
audioAdapter.notifyDataSetChanged();
imageAdapter.notifyDataSetChanged();
}
@Override
public void onFailure(Call<PostFiel> call, Throwable t) {
Log.e("onFailure", t.getMessage().toString());
... ... @@ -716,9 +725,10 @@ public class Fbzy_Activity extends BaseActivity {
});
}
/*--------------------------------------------超链接Popwindow----------------------------------------------------------*/
private void showLinkPop(){
View view = LayoutInflater.from(Fbzy_Activity.this).inflate(R.layout.pop_link_layout,null);
private void showLinkPop() {
View view = LayoutInflater.from(Fbzy_Activity.this).inflate(R.layout.pop_link_layout, null);
// 弹窗
final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
EditText link_edit = view.findViewById(R.id.link_edit);
... ... @@ -734,28 +744,28 @@ public class Fbzy_Activity extends BaseActivity {
setBackgroundAlpha(1f);
}
});
popupWindow.showAtLocation(view,Gravity.BOTTOM,0,M.getNavigationBarHeight(this));
popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, M.getNavigationBarHeight(this));
sure_text.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
CharSequence charSequence;
if (!TextUtils.isEmpty(link_edit.getText().toString())){
if (!isLink(link_edit.getText().toString())){
if (!TextUtils.isEmpty(link_edit.getText().toString())) {
if (!isLink(link_edit.getText().toString())) {
Toast.makeText(ctx, "请输入正确的超链接", Toast.LENGTH_SHORT).show();
}else {
String str = "<font color='#0099cc'> <a href=\""+link_edit.getText().toString()+"\">"+link_edit.getText().toString()+"</a></font>";
links_list.add(str);
} else {
String str = "<font color='#0099cc'> <a href=\"" + link_edit.getText().toString() + "\">" + link_edit.getText().toString() + "</a></font>";
links_list.add(str);
}
}else {
} else {
Toast.makeText(ctx, "链接地址不能为空", Toast.LENGTH_SHORT).show();
}
for (int i = 0; i <links_list.size() ; i++) {
for (int i = 0; i < links_list.size(); i++) {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
charSequence = Html.fromHtml(links_list.get(i),Html.FROM_HTML_MODE_LEGACY);
contentEd.setText(contentEd.getText().toString()+charSequence);
charSequence = Html.fromHtml(links_list.get(i), Html.FROM_HTML_MODE_LEGACY);
contentEd.setText(contentEd.getText().toString() + charSequence);
} else {
charSequence = Html.fromHtml(links_list.get(i));
contentEd.setText(contentEd.getText().toString()+charSequence);
contentEd.setText(contentEd.getText().toString() + charSequence);
}
}
... ... @@ -763,23 +773,26 @@ public class Fbzy_Activity extends BaseActivity {
});
}
/**
* 判断字符串中是否有超链接，若有，则返回超链接。
*
* @param str
* @return
*/
public static String[] judgeString(String str){
public static String[] judgeString(String str) {
Matcher m = Pattern.compile("(((https|http)?://)?([a-z0-9]+[.])|(www.))"
+ "\\w+[.|\\/]([a-z0-9]{0,})?[[.]([a-z0-9]{0,})]+((/[\\S&&[^,;\u4E00-\u9FA5]]+)+)?([.][a-z0-9]{0,}+|/?)").matcher(str);
String[] url = new String[str.length()/5];
String[] url = new String[str.length() / 5];
int count = 0;
while(m.find()){
while (m.find()) {
count++;
url[count] = m.group();
}
return url;
}
public static boolean isLink(String str){
public static boolean isLink(String str) {
Pattern httpPattern;
//初始化正则
httpPattern = Pattern
... ... @@ -788,16 +801,18 @@ public class Fbzy_Activity extends BaseActivity {
if (httpPattern.matcher(str).matches()) {
return true;
//这是一个网址链接
}else{
} else {
return false;
//这不是一个网址链接
}
}
/*--------------------------------------------------------------------------图片适配器----------------------------------------------------------------*/
class ImageAdapter extends BaseQuickAdapter<JxtImageEntity, BaseViewHolder> {
public ImageAdapter(int layoutResId, @Nullable List<JxtImageEntity> data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, JxtImageEntity item) {
SquareImageView iv_picture = helper.itemView.findViewById(R.id.iv_picture);
... ... @@ -815,6 +830,7 @@ public class Fbzy_Activity extends BaseActivity {
helper.addOnClickListener(R.id.item_select_pic_video);
}
}
/*--------------------------------------------录音PopWindow----------------------------------------------------------*/
private Handler handler = new Handler();
CircularProgressBar Circular_bar;
... ... @@ -846,6 +862,7 @@ public class Fbzy_Activity extends BaseActivity {
private void setAdapterTime() {
}
private void AudioPop() {
View view = LayoutInflater.from(Fbzy_Activity.this).inflate(R.layout.pop_ly_window, null);
// 弹窗
... ... @@ -1033,6 +1050,7 @@ public class Fbzy_Activity extends BaseActivity {
}
}
}
/*--------------------------------------------查看大图详情----------------------------------------------------------*/
float x1 = 0, x2 = 0; // 滑动坐标轴
int pageSze; // 页数
... ... @@ -1040,6 +1058,7 @@ public class Fbzy_Activity extends BaseActivity {
GSYVideoOptionBuilder gsyVideoOption;
private boolean isPlay;
private void imgPop(List<JxtImageEntity> imgList, int pageSze1) {
this.pageSze = pageSze1;
View view = LayoutInflater.from(Fbzy_Activity.this).inflate(R.layout.pop_zpgl_image, null);
... ... @@ -1177,6 +1196,7 @@ public class Fbzy_Activity extends BaseActivity {
//开始播放了才能旋转和全屏
isPlay = true;
}
@Override
public void onQuitFullscreen(String url, Object... objects) {
super.onQuitFullscreen(url, objects);
... ... @@ -1191,10 +1211,21 @@ public class Fbzy_Activity extends BaseActivity {
player.startPlayLogic();
}
public void setBackgroundAlpha(float bgAlpha) {
WindowManager.LayoutParams lp = getWindow()
.getAttributes();
lp.alpha = bgAlpha;
getWindow().setAttributes(lp);
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
}
... ...
... ... @@ -1059,4 +1059,14 @@ public class ZyxqPerActivity extends BaseActivity {
Glide.with(mContext).load(item.getPhoto()).into(ck_img);
}
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
}
... ...
... ... @@ -181,7 +181,7 @@ public class Zyxq_Activity extends BaseActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode==7788){
if (requestCode == 7788) {
setData();
}
... ... @@ -208,20 +208,20 @@ public class Zyxq_Activity extends BaseActivity {
List<StudentCkEntity> studentCkEntities = new ArrayList<>();
List<StudentCkEntity> unstudentCkEntities = new ArrayList<>();
for (int i = 0; i < comment_list.size(); i++) {
studentCkEntities.add(new StudentCkEntity(comment_list.get(i).getId()+"",comment_list.get(i).getStudent_id(),comment_list.get(i).getParent_name(),comment_list.get(i).getStudent_name(),comment_list.get(i).getPhoto(),comment_list.get(i).getGender(),comment_list.get(i).getSubmit_time(),comment_list.get(i).getEvaluate_level_id(),false));
studentCkEntities.add(new StudentCkEntity(comment_list.get(i).getId() + "", comment_list.get(i).getStudent_id(), comment_list.get(i).getParent_name(), comment_list.get(i).getStudent_name(), comment_list.get(i).getPhoto(), comment_list.get(i).getGender(), comment_list.get(i).getSubmit_time(), comment_list.get(i).getEvaluate_level_id(), false));
}
List<JxtEntity.DataBean.UncommentListBean> uncomment_list = jxtEntity.getData().getUncomment_list();
for (int i = 0; i < uncomment_list.size(); i++) {
unstudentCkEntities.add(new StudentCkEntity(uncomment_list.get(i).getId()+"",uncomment_list.get(i).getStudent_id(), uncomment_list.get(i).getParent_name(), uncomment_list.get(i).getStudent_name(), uncomment_list.get(i).getPhoto(),uncomment_list.get(i).getGender(),uncomment_list.get(i).getSubmit_time(),uncomment_list.get(i).getEvaluate_level_id(), false));
unstudentCkEntities.add(new StudentCkEntity(uncomment_list.get(i).getId() + "", uncomment_list.get(i).getStudent_id(), uncomment_list.get(i).getParent_name(), uncomment_list.get(i).getStudent_name(), uncomment_list.get(i).getPhoto(), uncomment_list.get(i).getGender(), uncomment_list.get(i).getSubmit_time(), uncomment_list.get(i).getEvaluate_level_id(), false));
}
zy_rv_wck_fragment.setNewdata(unstudentCkEntities);
zy_rv_ck_fragment.setNewdata(studentCkEntities);
if ( jxtEntity.getData().getIs_online()==0){
tabNames.set(0,("已点评" + "(" + studentCkEntities.size() + ")"));
tabNames.set(1,"未点评" + "(" + unstudentCkEntities.size() + ")");
}else {
tabNames.set(0,"已提交" + "(" + studentCkEntities.size() + ")");
tabNames.set(1,"未提交" + "(" + unstudentCkEntities.size() + ")");
if (jxtEntity.getData().getIs_online() == 0) {
tabNames.set(0, ("已点评" + "(" + studentCkEntities.size() + ")"));
tabNames.set(1, "未点评" + "(" + unstudentCkEntities.size() + ")");
} else {
tabNames.set(0, "已提交" + "(" + studentCkEntities.size() + ")");
tabNames.set(1, "未提交" + "(" + unstudentCkEntities.size() + ")");
}
fragmentAdater.notifyDataSetChanged();
}
... ... @@ -229,7 +229,7 @@ public class Zyxq_Activity extends BaseActivity {
@Override
public void onError(Throwable e) {
Log.e("错误请求", "onError: "+e );
Log.e("错误请求", "onError: " + e);
}
@Override
... ... @@ -237,7 +237,7 @@ public class Zyxq_Activity extends BaseActivity {
}
});
Api().getTaskEvaluateOption(Config.Token,zyId)
Api().getTaskEvaluateOption(Config.Token, zyId)
.subscribeOn(Schedulers.io())
//需要在主线程更新UI
.observeOn(AndroidSchedulers.mainThread())
... ... @@ -271,7 +271,7 @@ public class Zyxq_Activity extends BaseActivity {
mediaPlayer.setLooping(false);
mediaPlayer.setVolume(0.5f, 0.5f);
includeName.setText("作业详情");
myaudio = new AudioAdapter(R.layout.item_yinpin_layout,frequencyUrl,true);
myaudio = new AudioAdapter(R.layout.item_yinpin_layout, frequencyUrl, true);
Bundle extras = getIntent().getExtras();
zyId = extras.getString("ZyId");
getData();
... ... @@ -297,11 +297,11 @@ public class Zyxq_Activity extends BaseActivity {
title.setText(jxtEntity.getData().getName());
}
class_id = jxtEntity.getData().getClass_id();
if (!StringUtils.isEmptyString(jxtEntity.getData().getTeacher_name())){
if (!StringUtils.isEmptyString(jxtEntity.getData().getTeacher_name())) {
teacherName.setText(jxtEntity.getData().getTeacher_name());
}
classText.setText(jxtEntity.getData().getClass_name());
if (!StringUtils.isEmptyString(jxtEntity.getData().getDate())){
if (!StringUtils.isEmptyString(jxtEntity.getData().getDate())) {
dateText.setText(jxtEntity.getData().getDate());
}
String[] url = judgeString(jxtEntity.getData().getContent()); //超链接判断返回数组
... ... @@ -325,10 +325,10 @@ public class Zyxq_Activity extends BaseActivity {
}
RequestOptions requestOptions = RequestOptions.circleCropTransform();
Glide.with(Zyxq_Activity.this).load(jxtEntity.getData().getTeacher_photo()).apply(requestOptions).into(teacherImg);
if ( jxtEntity.getData().getIs_online()==0){
if (jxtEntity.getData().getIs_online() == 0) {
tabNames.add("已点评" + "(" + jxtEntity.getData().getComment_num() + ")");
tabNames.add("未点评" + "(" + jxtEntity.getData().getUncomment_num() + ")");
}else {
} else {
tabNames.add("已提交" + "(" + jxtEntity.getData().getComment_num() + ")");
tabNames.add("未提交" + "(" + jxtEntity.getData().getUncomment_num() + ")");
}
... ... @@ -337,45 +337,45 @@ public class Zyxq_Activity extends BaseActivity {
List<StudentCkEntity> unstudentCkEntities = new ArrayList<>();
fragmentList.clear();
for (int i = 0; i < comment_list.size(); i++) {
studentCkEntities.add(new StudentCkEntity(comment_list.get(i).getId()+"",comment_list.get(i).getStudent_id(),comment_list.get(i).getParent_name(),comment_list.get(i).getStudent_name(),comment_list.get(i).getPhoto(),comment_list.get(i).getGender(),comment_list.get(i).getSubmit_time(),comment_list.get(i).getEvaluate_level_id(),false));
studentCkEntities.add(new StudentCkEntity(comment_list.get(i).getId() + "", comment_list.get(i).getStudent_id(), comment_list.get(i).getParent_name(), comment_list.get(i).getStudent_name(), comment_list.get(i).getPhoto(), comment_list.get(i).getGender(), comment_list.get(i).getSubmit_time(), comment_list.get(i).getEvaluate_level_id(), false));
}
List<JxtEntity.DataBean.UncommentListBean> uncomment_list = jxtEntity.getData().getUncomment_list();
for (int i = 0; i < uncomment_list.size(); i++) {
unstudentCkEntities.add(new StudentCkEntity(uncomment_list.get(i).getId()+"",uncomment_list.get(i).getStudent_id(), uncomment_list.get(i).getParent_name(), uncomment_list.get(i).getStudent_name(), uncomment_list.get(i).getPhoto(),uncomment_list.get(i).getGender(),uncomment_list.get(i).getSubmit_time(),uncomment_list.get(i).getEvaluate_level_id(), false));
unstudentCkEntities.add(new StudentCkEntity(uncomment_list.get(i).getId() + "", uncomment_list.get(i).getStudent_id(), uncomment_list.get(i).getParent_name(), uncomment_list.get(i).getStudent_name(), uncomment_list.get(i).getPhoto(), uncomment_list.get(i).getGender(), uncomment_list.get(i).getSubmit_time(), uncomment_list.get(i).getEvaluate_level_id(), false));
}
zy_rv_ck_fragment = new Zy_Rv_ck_Fragment(studentCkEntities,Zyxq_Activity.this,jxtEntity.getData().getIs_online());
zy_rv_ck_fragment = new Zy_Rv_ck_Fragment(studentCkEntities, Zyxq_Activity.this, jxtEntity.getData().getIs_online());
fragmentList.add(zy_rv_ck_fragment);
zy_rv_wck_fragment = new Zy_Rv_Wck_Fragment(unstudentCkEntities, 1,Zyxq_Activity.this,jxtEntity.getData().getIs_online());
zy_rv_wck_fragment = new Zy_Rv_Wck_Fragment(unstudentCkEntities, 1, Zyxq_Activity.this, jxtEntity.getData().getIs_online());
fragmentList.add(zy_rv_wck_fragment);
List<String> audio = jxtEntity.getData().getAudio();
List<VideoEntity> videoEntityList = new ArrayList<>();
for (int i = 0; i < audio.size(); i++) {
videoEntityList.add(new VideoEntity(audio.get(i), false));
}
audioAdapter = new AudioAdapter(R.layout.item_yinpin_layout, videoEntityList,false);
audioAdapter = new AudioAdapter(R.layout.item_yinpin_layout, videoEntityList, false);
voiceRv.setLayoutManager(new LinearLayoutManager(Zyxq_Activity.this));
voiceRv.setAdapter(audioAdapter);
fragmentAdater = new MyAdapter(getSupportFragmentManager());
vp.setAdapter(fragmentAdater);
tabLayout.setupWithViewPager(vp);
if (jxtEntity.getData().getIs_online()==0){
if (jxtEntity.getData().getIs_online() == 0) {
tabLayout.getTabAt(1).select();
}else {
} else {
tabLayout.getTabAt(0).select();
}
tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
if (jxtEntity.getData().getIs_online()==0){
if (tab.getPosition()==0){
if (jxtEntity.getData().getIs_online() == 0) {
if (tab.getPosition() == 0) {
checkLayout.setVisibility(View.GONE);
}else {
} else {
checkLayout.setVisibility(View.VISIBLE);
}
}else {
if (tab.getPosition()==0){
} else {
if (tab.getPosition() == 0) {
checkLayout.setVisibility(View.VISIBLE);
}else {
} else {
checkLayout.setVisibility(View.GONE);
}
}
... ... @@ -511,7 +511,7 @@ public class Zyxq_Activity extends BaseActivity {
}
});
Api().getTaskEvaluateOption(Config.Token,zyId)
Api().getTaskEvaluateOption(Config.Token, zyId)
.subscribeOn(Schedulers.io())
//需要在主线程更新UI
.observeOn(AndroidSchedulers.mainThread())
... ... @@ -558,7 +558,9 @@ public class Zyxq_Activity extends BaseActivity {
executorService = Executors.newSingleThreadExecutor();
executorService.execute(thread);
}
MyHandler myHandler = new MyHandler(this);
private static class MyHandler extends Handler {
private WeakReference<Activity> mActivity;
... ... @@ -605,24 +607,26 @@ public class Zyxq_Activity extends BaseActivity {
}
return url;
}
public void setAllChecked(boolean isChecked){
public void setAllChecked(boolean isChecked) {
allCheck.setEnabled(isChecked);
}
@Override
protected void setEvent() {
allCheckLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (myJxtEntity.getData().getIs_online()==0){
if (allCheck.isEnabled()){
if (myJxtEntity.getData().getIs_online() == 0) {
if (allCheck.isEnabled()) {
zy_rv_wck_fragment.checkedAllStudent(false);
}else {
} else {
zy_rv_wck_fragment.checkedAllStudent(true);
}
}else {
if (allCheck.isEnabled()){
} else {
if (allCheck.isEnabled()) {
zy_rv_ck_fragment.checkedAllStudent(false);
}else {
} else {
zy_rv_ck_fragment.checkedAllStudent(true);
}
}
... ... @@ -661,14 +665,15 @@ public class Zyxq_Activity extends BaseActivity {
fbButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (zy_rv_ck_fragment.getCheckedId().size()!=0||zy_rv_wck_fragment.getCheckedId().size()!=0){
if (zy_rv_ck_fragment.getCheckedId().size() != 0 || zy_rv_wck_fragment.getCheckedId().size() != 0) {
yjdpPop();
}else {
} else {
Toast.makeText(Zyxq_Activity.this, "请先选择点评的学生", Toast.LENGTH_SHORT).show();
}
}
});
}
private void optionPop() {
View view = LayoutInflater.from(Zyxq_Activity.this).inflate(R.layout.popup_tzxq, null);
// 弹窗
... ... @@ -695,40 +700,40 @@ public class Zyxq_Activity extends BaseActivity {
return false; //位于“取消”位置的按钮点击后无法关闭对话框
}
})
.setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
Api().delTask(Config.Token,zyId)
.subscribeOn(Schedulers.io())
//需要在主线程更新UI
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<FbtzEntity>() {
@Override
public void onSubscribe(Disposable d) {
.setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
Api().delTask(Config.Token, zyId)
.subscribeOn(Schedulers.io())
//需要在主线程更新UI
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<FbtzEntity>() {
@Override
public void onSubscribe(Disposable d) {
}
}
@Override
public void onNext(FbtzEntity fbtzEntity) {
if (fbtzEntity.getCode()==M.success){
Toast.makeText(Zyxq_Activity.this, "撤回成功", Toast.LENGTH_SHORT).show();
finish();
}
}
@Override
public void onNext(FbtzEntity fbtzEntity) {
if (fbtzEntity.getCode() == M.success) {
Toast.makeText(Zyxq_Activity.this, "撤回成功", Toast.LENGTH_SHORT).show();
finish();
}
}
@Override
public void onError(Throwable e) {
@Override
public void onError(Throwable e) {
}
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
return false;
}
});
}
});
return false;
}
});
tydpPopupwindow.dismiss();
}
});
... ... @@ -739,7 +744,7 @@ public class Zyxq_Activity extends BaseActivity {
intent.setClass(Zyxq_Activity.this, Fbzy_Activity.class);
Gson gson = new Gson();
String Tzjson = gson.toJson(myJxtEntity);
intent.putExtra("zhuanfa",Tzjson);
intent.putExtra("zhuanfa", Tzjson);
startActivity(intent);
finish();
tydpPopupwindow.dismiss();
... ... @@ -772,7 +777,8 @@ public class Zyxq_Activity extends BaseActivity {
/*--------------------------------------------音频适配器----------------------------------------------------------*/
class AudioAdapter extends BaseQuickAdapter<VideoEntity, BaseViewHolder> {
boolean isSet;
public AudioAdapter(int layoutResId, @Nullable List<VideoEntity> data,boolean isSet) {
public AudioAdapter(int layoutResId, @Nullable List<VideoEntity> data, boolean isSet) {
super(layoutResId, data);
this.isSet = isSet;
}
... ... @@ -785,10 +791,10 @@ public class Zyxq_Activity extends BaseActivity {
RelativeLayout father_layout = helper.itemView.findViewById(R.id.father_layout);
ViewGroup.LayoutParams layoutParams = father_layout.getLayoutParams();
DisplayMetrics dm = new DisplayMetrics();
if (isSet){
if (isSet) {
delet_text.setVisibility(View.VISIBLE);
helper.addOnClickListener(R.id.delet_text);
}else {
} else {
delet_text.setVisibility(View.GONE);
}
getWindowManager().getDefaultDisplay().getMetrics(dm);
... ... @@ -821,16 +827,18 @@ public class Zyxq_Activity extends BaseActivity {
}
}
PopupWindow tydpPopupwindow;
PopupWindow tydpPopupwindowOnle;
String studentIds;
/*--------------------------------------------统一点评Pop----------------------------------------------------------*/
EditText edit_content;
public void yjdpPop() {
View view = LayoutInflater.from(Zyxq_Activity.this).inflate(R.layout.pop_tydp_layout, null);
// 弹窗
tydpPopupwindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
tydpPopupwindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
tydpPopupwindow.setOutsideTouchable(true);
tydpPopupwindow.setTouchable(true);
tydpPopupwindow.setFocusable(true);
... ... @@ -843,16 +851,16 @@ public class Zyxq_Activity extends BaseActivity {
WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
lp.alpha = 0.7f;
activity.getWindow().setAttributes(lp);
if (voiced_rv.getAdapter()!=null){
if (voiced_rv.getAdapter() != null) {
myaudio.notifyDataSetChanged();
}
if (!TextUtils.isEmpty(contentStr)){
if (!TextUtils.isEmpty(contentStr)) {
edit_content.setText(contentStr);
}
RecyclerView recyclerView = view.findViewById(R.id.item_rv);
recyclerView.setLayoutManager(new GridLayoutManager(this, 5));
recyclerView.setAdapter(itemAdapter);
tydpPopupwindow.showAtLocation(view, Gravity.BOTTOM,0,M.getNavigationBarHeight(this));
tydpPopupwindow.showAtLocation(view, Gravity.BOTTOM, 0, M.getNavigationBarHeight(this));
view.findViewById(R.id.close_img).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
... ... @@ -890,24 +898,24 @@ public class Zyxq_Activity extends BaseActivity {
public void onClick(View v) {
List<getTaskEvaluateOptionEntity.DataBean> data = itemAdapter.getData();
int id = 0;
for (int i = 0; i <data.size(); i++) {
if (data.get(i).isChecked()){
for (int i = 0; i < data.size(); i++) {
if (data.get(i).isChecked()) {
id = data.get(i).getId();
}
}
List<String> myAudio = new ArrayList<>();
for (int i = 0; i <myaudio.getData().size() ; i++) {
for (int i = 0; i < myaudio.getData().size(); i++) {
myAudio.add(myaudio.getData().get(i).getVideoPath());
}
String audio = TextUtils.join(",", myAudio);
WaitDialog.show(Zyxq_Activity.this, "请稍候...");
if(zy_rv_wck_fragment.getCheckedId().size()!=0){
if (zy_rv_wck_fragment.getCheckedId().size() != 0) {
studentIds = zy_rv_wck_fragment.getStudentIds();
}else if (zy_rv_ck_fragment.getCheckedId().size()!=0){
} else if (zy_rv_ck_fragment.getCheckedId().size() != 0) {
studentIds = zy_rv_ck_fragment.getStudentIds();
}
Api().setTaskEvaluate(Config.Token,zyId+"",id+"",studentIds,edit_content.getText().toString(),audio)
.subscribeOn(Schedulers.io())
Api().setTaskEvaluate(Config.Token, zyId + "", id + "", studentIds, edit_content.getText().toString(), audio)
.subscribeOn(Schedulers.io())
//需要在主线程更新UI
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<setTaskEvaluateEntity>() {
... ... @@ -918,12 +926,12 @@ public class Zyxq_Activity extends BaseActivity {
@Override
public void onNext(setTaskEvaluateEntity setTaskEvaluateEntity) {
if (setTaskEvaluateEntity.getCode() == M.success){
if (setTaskEvaluateEntity.getCode() == M.success) {
tydpPopupwindow.dismiss();
setData();
}else {
} else {
WaitDialog.dismiss();
Toast.makeText(ctx, ""+setTaskEvaluateEntity.getMsg(), Toast.LENGTH_SHORT).show();
Toast.makeText(ctx, "" + setTaskEvaluateEntity.getMsg(), Toast.LENGTH_SHORT).show();
}
}
... ... @@ -940,6 +948,7 @@ public class Zyxq_Activity extends BaseActivity {
}
});
}
public void yjdpPop(String myStudentId) {
View view = LayoutInflater.from(Zyxq_Activity.this).inflate(R.layout.pop_tydp_layout, null);
// 弹窗
... ... @@ -956,16 +965,16 @@ public class Zyxq_Activity extends BaseActivity {
WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
lp.alpha = 0.7f;
activity.getWindow().setAttributes(lp);
if (voiced_rv.getAdapter()!=null){
if (voiced_rv.getAdapter() != null) {
myaudio.notifyDataSetChanged();
}
if (!TextUtils.isEmpty(contentStr)){
if (!TextUtils.isEmpty(contentStr)) {
edit_content.setText(contentStr);
}
RecyclerView recyclerView = view.findViewById(R.id.item_rv);
recyclerView.setLayoutManager(new GridLayoutManager(this, 5));
recyclerView.setAdapter(itemAdapter);
tydpPopupwindowOnle.showAtLocation(view, Gravity.BOTTOM,0,M.getNavigationBarHeight(this));
tydpPopupwindowOnle.showAtLocation(view, Gravity.BOTTOM, 0, M.getNavigationBarHeight(this));
view.findViewById(R.id.close_img).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
... ... @@ -1003,18 +1012,18 @@ public class Zyxq_Activity extends BaseActivity {
public void onClick(View v) {
List<getTaskEvaluateOptionEntity.DataBean> data = itemAdapter.getData();
int id = 0;
for (int i = 0; i <data.size(); i++) {
if (data.get(i).isChecked()){
for (int i = 0; i < data.size(); i++) {
if (data.get(i).isChecked()) {
id = data.get(i).getId();
}
}
List<String> myAudio = new ArrayList<>();
for (int i = 0; i <myaudio.getData().size() ; i++) {
for (int i = 0; i < myaudio.getData().size(); i++) {
myAudio.add(myaudio.getData().get(i).getVideoPath());
}
String audio = TextUtils.join(",", myAudio);
WaitDialog.show(Zyxq_Activity.this, "请稍候...");
Api().setTaskEvaluate(Config.Token,zyId+"",id+"",myStudentId,edit_content.getText().toString(),audio)
Api().setTaskEvaluate(Config.Token, zyId + "", id + "", myStudentId, edit_content.getText().toString(), audio)
.subscribeOn(Schedulers.io())
//需要在主线程更新UI
.observeOn(AndroidSchedulers.mainThread())
... ... @@ -1026,11 +1035,11 @@ public class Zyxq_Activity extends BaseActivity {
@Override
public void onNext(setTaskEvaluateEntity setTaskEvaluateEntity) {
if (setTaskEvaluateEntity.getCode() == M.success){
if (setTaskEvaluateEntity.getCode() == M.success) {
tydpPopupwindowOnle.dismiss();
setData();
}else {
Toast.makeText(ctx, ""+setTaskEvaluateEntity.getMsg(), Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(ctx, "" + setTaskEvaluateEntity.getMsg(), Toast.LENGTH_SHORT).show();
}
}
... ... @@ -1047,6 +1056,7 @@ public class Zyxq_Activity extends BaseActivity {
}
});
}
class ItemAdapter extends BaseQuickAdapter<getTaskEvaluateOptionEntity.DataBean, BaseViewHolder> {
public ItemAdapter(int layoutResId, @Nullable List<getTaskEvaluateOptionEntity.DataBean> data) {
... ... @@ -1231,9 +1241,11 @@ public class Zyxq_Activity extends BaseActivity {
player.startPlayLogic();
}
public void setButtonNum(int num){
dpdrSure.setText("点评作业（"+num+")");
public void setButtonNum(int num) {
dpdrSure.setText("点评作业（" + num + ")");
}
/*--------------------------------------------录音PopWindow----------------------------------------------------------*/
private Handler handler = new Handler();
CircularProgressBar Circular_bar;
... ... @@ -1269,7 +1281,7 @@ public class Zyxq_Activity extends BaseActivity {
private void setTime() {
//日期，api 24暂定
time = time+1000;
time = time + 1000;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("mm:ss");
Date date = new Date(time);
int mybar = (int) (time / 1000);
... ... @@ -1277,7 +1289,8 @@ public class Zyxq_Activity extends BaseActivity {
String format = simpleDateFormat.format(date);
time_text.setText(format);
}
private void endTime(){
private void endTime() {
time = 0;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("mm:ss");
Date date = new Date(time);
... ... @@ -1286,13 +1299,14 @@ public class Zyxq_Activity extends BaseActivity {
String format = simpleDateFormat.format(date);
time_text.setText("10分钟以内");
}
private void AudioPop(){
View view = LayoutInflater.from(Zyxq_Activity.this).inflate(R.layout.pop_ly_window,null);
private void AudioPop() {
View view = LayoutInflater.from(Zyxq_Activity.this).inflate(R.layout.pop_ly_window, null);
// 弹窗
final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
tydpPopupwindow.dismiss();
ImageView ly_but = view.findViewById(R.id.ly_but);
time_text= view.findViewById(R.id.time_text);
time_text = view.findViewById(R.id.time_text);
TextView ly_style = view.findViewById(R.id.ly_style);
Circular_bar = view.findViewById(R.id.Circular_bar);
Circular_bar.setMax(600);
... ... @@ -1300,13 +1314,13 @@ public class Zyxq_Activity extends BaseActivity {
RelativeLayout luyi_rl = view.findViewById(R.id.luyi_rl);
LinearLayout ly_li = view.findViewById(R.id.ly_li);
ViewGroup.LayoutParams layoutParams = ly_li.getLayoutParams();
layoutParams.height = layoutParams.height+M.getNavigationBarHeight(this);
layoutParams.height = layoutParams.height + M.getNavigationBarHeight(this);
ly_li.setLayoutParams(layoutParams);
popupWindow.setOutsideTouchable(true);
popupWindow.setTouchable(true);
popupWindow.setFocusable(true);
setBackgroundAlpha(0.5f);//设置屏幕透明度
popupWindow.showAtLocation(view,Gravity.BOTTOM,0,M.getNavigationBarHeight(this));
popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, M.getNavigationBarHeight(this));
Circular_bar.setVisibility(View.GONE);
AudioUtils audioUtils = new AudioUtils(Zyxq_Activity.this);
luyi_rl.setOnClickListener(new View.OnClickListener() {
... ... @@ -1317,14 +1331,14 @@ public class Zyxq_Activity extends BaseActivity {
int checkSelfPermission = ContextCompat.checkSelfPermission(Zyxq_Activity.this,
Manifest.permission.RECORD_AUDIO);
if (permission == PackageManager.PERMISSION_GRANTED) {
if (checkSelfPermission==PackageManager.PERMISSION_GRANTED){
if (ly_but.isEnabled()){
if (checkSelfPermission == PackageManager.PERMISSION_GRANTED) {
if (ly_but.isEnabled()) {
ly_but.setEnabled(false);
Circular_bar.setVisibility(View.VISIBLE);
ly_style.setText("点击结束录音");
handler.postDelayed(runnable, 1000);
audioUtils.StratAudio();
}else {
} else {
ly_but.setEnabled(true);
Circular_bar.setVisibility(View.GONE);
audioUtils.EndAudio();
... ... @@ -1335,7 +1349,7 @@ public class Zyxq_Activity extends BaseActivity {
popupWindow.dismiss();
endTime();
}
}else {
} else {
//没有权限，申请权限。
ActivityCompat.requestPermissions(Zyxq_Activity.this,
new String[]{Manifest.permission.RECORD_AUDIO}, 1);
... ... @@ -1355,13 +1369,14 @@ public class Zyxq_Activity extends BaseActivity {
}
});
}
private void AudioPop(String id){
View view = LayoutInflater.from(Zyxq_Activity.this).inflate(R.layout.pop_ly_window,null);
private void AudioPop(String id) {
View view = LayoutInflater.from(Zyxq_Activity.this).inflate(R.layout.pop_ly_window, null);
// 弹窗
final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
tydpPopupwindowOnle.dismiss();
ImageView ly_but = view.findViewById(R.id.ly_but);
time_text= view.findViewById(R.id.time_text);
time_text = view.findViewById(R.id.time_text);
TextView ly_style = view.findViewById(R.id.ly_style);
Circular_bar = view.findViewById(R.id.Circular_bar);
Circular_bar.setMax(600);
... ... @@ -1369,13 +1384,13 @@ public class Zyxq_Activity extends BaseActivity {
RelativeLayout luyi_rl = view.findViewById(R.id.luyi_rl);
LinearLayout ly_li = view.findViewById(R.id.ly_li);
ViewGroup.LayoutParams layoutParams = ly_li.getLayoutParams();
layoutParams.height = layoutParams.height+M.getNavigationBarHeight(this);
layoutParams.height = layoutParams.height + M.getNavigationBarHeight(this);
ly_li.setLayoutParams(layoutParams);
popupWindow.setOutsideTouchable(true);
popupWindow.setTouchable(true);
popupWindow.setFocusable(true);
setBackgroundAlpha(0.5f);//设置屏幕透明度
popupWindow.showAtLocation(view,Gravity.BOTTOM,0,M.getNavigationBarHeight(this));
popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, M.getNavigationBarHeight(this));
Circular_bar.setVisibility(View.GONE);
AudioUtils audioUtils = new AudioUtils(Zyxq_Activity.this);
luyi_rl.setOnClickListener(new View.OnClickListener() {
... ... @@ -1386,14 +1401,14 @@ public class Zyxq_Activity extends BaseActivity {
int checkSelfPermission = ContextCompat.checkSelfPermission(Zyxq_Activity.this,
Manifest.permission.RECORD_AUDIO);
if (permission == PackageManager.PERMISSION_GRANTED) {
if (checkSelfPermission==PackageManager.PERMISSION_GRANTED){
if (ly_but.isEnabled()){
if (checkSelfPermission == PackageManager.PERMISSION_GRANTED) {
if (ly_but.isEnabled()) {
ly_but.setEnabled(false);
Circular_bar.setVisibility(View.VISIBLE);
ly_style.setText("点击结束录音");
handler.postDelayed(runnable, 1000);
audioUtils.StratAudio();
}else {
} else {
ly_but.setEnabled(true);
Circular_bar.setVisibility(View.GONE);
audioUtils.EndAudio();
... ... @@ -1404,7 +1419,7 @@ public class Zyxq_Activity extends BaseActivity {
popupWindow.dismiss();
endTime();
}
}else {
} else {
//没有权限，申请权限。
ActivityCompat.requestPermissions(Zyxq_Activity.this,
new String[]{Manifest.permission.RECORD_AUDIO}, 1);
... ... @@ -1424,6 +1439,7 @@ public class Zyxq_Activity extends BaseActivity {
}
});
}
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (requestCode == PERMISSION_WRITE_EXTERNAL_REQUEST_CODE) {
if (grantResults.length > 0
... ... @@ -1436,12 +1452,14 @@ public class Zyxq_Activity extends BaseActivity {
}
}
}
public void setBackgroundAlpha(float bgAlpha) {
WindowManager.LayoutParams lp = getWindow()
.getAttributes();
lp.alpha = bgAlpha;
getWindow().setAttributes(lp);
}
/*--------------------------------------------文件上传----------------------------------------------------------*/
private void postFile(String fielpath) {
// 上传文件
... ... @@ -1458,9 +1476,10 @@ public class Zyxq_Activity extends BaseActivity {
@Override
public void onResponse(Call<PostFiel> call, Response<PostFiel> response) {
List<VideoEntity> data = myaudio.getData();
data.add(new VideoEntity(response.body().getData().getUrl(),false));
data.add(new VideoEntity(response.body().getData().getUrl(), false));
myaudio.notifyDataSetChanged();
}
@Override
public void onFailure(Call<PostFiel> call, Throwable t) {
... ... @@ -1468,5 +1487,15 @@ public class Zyxq_Activity extends BaseActivity {
});
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
}
... ...