李明 / ClasManage · 提交

转到一个项目

作者 liming
提交 37b5106cb913639246f5db5fd060e9a8f71822e6 1 个父辈 5e12d200

作品管理, 评价分析功能页面

内嵌 并排对比
正在显示 11 个修改的文件 包含 326 行增加 和 178 行删除
package com.yinhebairong.clasmanage.bean;
public class AddZpJson {
String video;
String poster;
public String getPoster() {
return poster;
}
public AddZpJson setPoster(String poster) {
this.poster = poster;
return this;
}
public String getVideo() {
return video;
}
public AddZpJson setVideo(String video) {
this.video = video;
return this;
}
@Override
public String toString() {
return "[{\"video\":\"" + video + "\"" + "," + "\"poster\"" + ":" + "\"" + poster + "\"" + "}]";
}
}
... ...
... ... @@ -46,4 +46,7 @@ public class BaseBean {
public void setData(Object data) {
this.data = data;
}
}
... ...
... ... @@ -4,11 +4,12 @@ import java.util.List;
public class ZpDetailEntity {
/**
* code : 1
* msg : 作品详情
* time : 1576803845
* data : {"id":4,"student_id":845,"name":"测试","type":"体育类","publications":"人民日报","push_time":"0019-12-16","content":"冬爷爷悄悄地走了，春姑娘迈着轻盈的步伐来到了人间。春天在哪里呢？让我们找一找吧。春天在哪里？春天在公园里。走进公园，首先映入眼帘的是一大片碧绿如丝绒般的草地，一朵朵鲜花把草地装点的更加生机勃勃。大片大片的桃花，白的似雪，粉的如霞无数朵白\u2026兰在阳光下随风摇摆着，像是穿着白色连衣裙的少女在枝头翩翩起舞。小燕子从南方赶来，为春光增添了许多生趣。小麻雀在枝头\u201c叽叽喳喳\u201d地唱着，仿佛在说：\u201c春天来了，春天来了，快快播种\u201d。一片片竹林疏疏朗朗，青翠欲滴。柳树姑娘迎着春风，摆动着她那刚长出新芽的\u201c长头发\u201d。这不禁让我想起了唐代诗人贺知章的《咏柳》： 作者：卞琪浩一 链接：https://www.jianshu.com/p/b156d4b85af2 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。","create_time":1576640000,"video":"","images":[],"student_name":"王棋民","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80"}
* time : 1577424189
* data : {"id":17,"student_id":885,"name":"这种","type":"文章类","publications":"我们","push_time":"2019-06-26","content":"不会是这样一","create_time":1577355746,"video":[{"video":"http://tusmartedu.w.brotop.cn/uploads/20191226/119fc61e6c5d3129730552ccaa7137f8.mp4","poster":"http://tusmartedu.w.brotop.cn/uploads/20191226/afb3a642492be13773767c17a2a64518.jpg"}],"images":["http://tusmartedu.w.brotop.cn/uploads/20191227/c8fa61624f0095237f636daa56aec955.jpg"],"student_name":"张奥童","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80","score_id":2738}
*/
private int code;
... ... @@ -50,22 +51,23 @@ public class ZpDetailEntity {
public static class DataBean {
/**
* id : 4
* student_id : 845
* name : 测试
* type : 体育类
* publications : 人民日报
* push_time : 0019-12-16
* content : 冬爷爷悄悄地走了，春姑娘迈着轻盈的步伐来到了人间。春天在哪里呢？让我们找一找吧。春天在哪里？春天在公园里。走进公园，首先映入眼帘的是一大片碧绿如丝绒般的草地，一朵朵鲜花把草地装点的更加生机勃勃。大片大片的桃花，白的似雪，粉的如霞无数朵白…兰在阳光下随风摇摆着，像是穿着白色连衣裙的少女在枝头翩翩起舞。小燕子从南方赶来，为春光增添了许多生趣。小麻雀在枝头“叽叽喳喳”地唱着，仿佛在说：“春天来了，春天来了，快快播种”。一片片竹林疏疏朗朗，青翠欲滴。柳树姑娘迎着春风，摆动着她那刚长出新芽的“长头发”。这不禁让我想起了唐代诗人贺知章的《咏柳》： 作者：卞琪浩一 链接：https://www.jianshu.com/p/b156d4b85af2 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
* create_time : 1576640000
* video :
* images : []
* student_name : 王棋民
* id : 17
* student_id : 885
* name : 这种
* type : 文章类
* publications : 我们
* push_time : 2019-06-26
* content : 不会是这样一
* create_time : 1577355746
* video : [{"video":"http://tusmartedu.w.brotop.cn/uploads/20191226/119fc61e6c5d3129730552ccaa7137f8.mp4","poster":"http://tusmartedu.w.brotop.cn/uploads/20191226/afb3a642492be13773767c17a2a64518.jpg"}]
* images : ["http://tusmartedu.w.brotop.cn/uploads/20191227/c8fa61624f0095237f636daa56aec955.jpg"]
* student_name : 张奥童
* opus_level_name : 国家级
* prize_level_name : 一等奖
* class_id : 117
* opus_level : 40
* prize_level : 80
* score_id : 2738
*/
private int id;
... ... @@ -76,13 +78,14 @@ public class ZpDetailEntity {
private String push_time;
private String content;
private int create_time;
private String video;
private String student_name;
private String opus_level_name;
private String prize_level_name;
private int class_id;
private String opus_level;
private String prize_level;
private int score_id;
private List<VideoBean> video;
private List<String> images;
public int getId() {
... ... @@ -149,14 +152,6 @@ public class ZpDetailEntity {
this.create_time = create_time;
}
public String getVideo() {
return video;
}
public void setVideo(String video) {
this.video = video;
}
public String getStudent_name() {
return student_name;
}
... ... @@ -205,6 +200,22 @@ public class ZpDetailEntity {
this.prize_level = prize_level;
}
public int getScore_id() {
return score_id;
}
public void setScore_id(int score_id) {
this.score_id = score_id;
}
public List<VideoBean> getVideo() {
return video;
}
public void setVideo(List<VideoBean> video) {
this.video = video;
}
public List<String> getImages() {
return images;
}
... ... @@ -212,5 +223,31 @@ public class ZpDetailEntity {
public void setImages(List<String> images) {
this.images = images;
}
public static class VideoBean {
/**
* video : http://tusmartedu.w.brotop.cn/uploads/20191226/119fc61e6c5d3129730552ccaa7137f8.mp4
* poster : http://tusmartedu.w.brotop.cn/uploads/20191226/afb3a642492be13773767c17a2a64518.jpg
*/
private String video;
private String poster;
public String getVideo() {
return video;
}
public void setVideo(String video) {
this.video = video;
}
public String getPoster() {
return poster;
}
public void setPoster(String poster) {
this.poster = poster;
}
}
}
}
... ...
package com.yinhebairong.clasmanage.entity;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ZplistEntity {
/**
* code : 1
* msg : 作品列表
* time : 1576664651
* data : {"total":2,"per_page":10,"current_page":1,"last_page":1,"data":[{"id":3,"student_id":845,"name":"测试","type":"体育类","publications":"人民日报","push_time":"0019-12-16","content":"冬爷爷悄悄地走了，春姑娘迈着轻盈的步伐来到了人间。春天在哪里呢？让我们找一找吧。春天在哪里？春天在公园里。走进公园，首先映入眼帘的是一大片碧绿如丝绒般的草地，一朵朵鲜花把草地装点的更加生机勃勃。大片大片的桃花，白的似雪，粉的如霞无数朵白\u2026兰在阳光下随风摇摆着，像是穿着白色连衣裙的少女在枝头翩翩起舞。小燕子从南方赶来，为春光增添了许多生趣。小麻雀在枝头\u201c叽叽喳喳\u201d地唱着，仿佛在说：\u201c春天来了，春天来了，快快播种\u201d。一片片竹林疏疏朗朗，青翠欲滴。柳树姑娘迎着春风，摆动着她那刚长出新芽的\u201c长头发\u201d。这不禁让我想起了唐代诗人贺知章的《咏柳》： 作者：卞琪浩一 链接：https://www.jianshu.com/p/b156d4b85af2 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。","create_time":1576639944,"video":"","images":[],"student_name":"王棋民","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80"},{"id":4,"student_id":845,"name":"测试","type":"体育类","publications":"人民日报","push_time":"0019-12-16","content":"冬爷爷悄悄地走了，春姑娘迈着轻盈的步伐来到了人间。春天在哪里呢？让我们找一找吧。春天在哪里？春天在公园里。走进公园，首先映入眼帘的是一大片碧绿如丝绒般的草地，一朵朵鲜花把草地装点的更加生机勃勃。大片大片的桃花，白的似雪，粉的如霞无数朵白\u2026兰在阳光下随风摇摆着，像是穿着白色连衣裙的少女在枝头翩翩起舞。小燕子从南方赶来，为春光增添了许多生趣。小麻雀在枝头\u201c叽叽喳喳\u201d地唱着，仿佛在说：\u201c春天来了，春天来了，快快播种\u201d。一片片竹林疏疏朗朗，青翠欲滴。柳树姑娘迎着春风，摆动着她那刚长出新芽的\u201c长头发\u201d。这不禁让我想起了唐代诗人贺知章的《咏柳》： 作者：卞琪浩一 链接：https://www.jianshu.com/p/b156d4b85af2 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。","create_time":1576640000,"video":"","images":[],"student_name":"王棋民","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80"}]}
* time : 1577415075
* data : {"total":3,"per_page":10,"current_page":1,"last_page":1,"data":[{"id":17,"student_id":885,"name":"这种","type":"文章类","publications":"我们","push_time":"2019-06-26","content":"不会是这样一","create_time":1577355746,"video":[{"video":"http://tusmartedu.w.brotop.cn/uploads/20191226/119fc61e6c5d3129730552ccaa7137f8.mp4","poster":"http://tusmartedu.w.brotop.cn/uploads/20191226/afb3a642492be13773767c17a2a64518.jpg"}],"images":["http://tusmartedu.w.brotop.cn/uploads/20191227/c8fa61624f0095237f636daa56aec955.jpg"],"student_name":"张奥童","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80","score_id":2738},{"id":19,"student_id":855,"name":"这","type":"文章类","publications":"今天","push_time":"2019-07-26","content":"一起吃东西没有","create_time":1577413063,"video":[{"video":"","poster":""}],"images":["http://tusmartedu.w.brotop.cn/uploads/20191227/f1230238e9d0ccc36cdaae12bdfae592.jpg","http://tusmartedu.w.brotop.cn/uploads/20191227/86ce99596c173e3b5fe186484831c0ed.jpg"],"student_name":"王乔楚","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80","score_id":3052},{"id":22,"student_id":866,"name":"今天","type":"文章类","publications":"你的","push_time":"2019-06-26","content":"de\u2006fen","create_time":1577414973,"video":[{"video":"","poster":""}],"images":[],"student_name":"王然","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80","score_id":3055}]}
*/
private int code;
... ... @@ -50,11 +52,11 @@ public class ZplistEntity {
public static class DataBeanX {
/**
* total : 2
* total : 3
* per_page : 10
* current_page : 1
* last_page : 1
* data : [{"id":3,"student_id":845,"name":"测试","type":"体育类","publications":"人民日报","push_time":"0019-12-16","content":"冬爷爷悄悄地走了，春姑娘迈着轻盈的步伐来到了人间。春天在哪里呢？让我们找一找吧。春天在哪里？春天在公园里。走进公园，首先映入眼帘的是一大片碧绿如丝绒般的草地，一朵朵鲜花把草地装点的更加生机勃勃。大片大片的桃花，白的似雪，粉的如霞无数朵白\u2026兰在阳光下随风摇摆着，像是穿着白色连衣裙的少女在枝头翩翩起舞。小燕子从南方赶来，为春光增添了许多生趣。小麻雀在枝头\u201c叽叽喳喳\u201d地唱着，仿佛在说：\u201c春天来了，春天来了，快快播种\u201d。一片片竹林疏疏朗朗，青翠欲滴。柳树姑娘迎着春风，摆动着她那刚长出新芽的\u201c长头发\u201d。这不禁让我想起了唐代诗人贺知章的《咏柳》： 作者：卞琪浩一 链接：https://www.jianshu.com/p/b156d4b85af2 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。","create_time":1576639944,"video":"","images":[],"student_name":"王棋民","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80"},{"id":4,"student_id":845,"name":"测试","type":"体育类","publications":"人民日报","push_time":"0019-12-16","content":"冬爷爷悄悄地走了，春姑娘迈着轻盈的步伐来到了人间。春天在哪里呢？让我们找一找吧。春天在哪里？春天在公园里。走进公园，首先映入眼帘的是一大片碧绿如丝绒般的草地，一朵朵鲜花把草地装点的更加生机勃勃。大片大片的桃花，白的似雪，粉的如霞无数朵白\u2026兰在阳光下随风摇摆着，像是穿着白色连衣裙的少女在枝头翩翩起舞。小燕子从南方赶来，为春光增添了许多生趣。小麻雀在枝头\u201c叽叽喳喳\u201d地唱着，仿佛在说：\u201c春天来了，春天来了，快快播种\u201d。一片片竹林疏疏朗朗，青翠欲滴。柳树姑娘迎着春风，摆动着她那刚长出新芽的\u201c长头发\u201d。这不禁让我想起了唐代诗人贺知章的《咏柳》： 作者：卞琪浩一 链接：https://www.jianshu.com/p/b156d4b85af2 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。","create_time":1576640000,"video":"","images":[],"student_name":"王棋民","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80"}]
* data : [{"id":17,"student_id":885,"name":"这种","type":"文章类","publications":"我们","push_time":"2019-06-26","content":"不会是这样一","create_time":1577355746,"video":[{"video":"http://tusmartedu.w.brotop.cn/uploads/20191226/119fc61e6c5d3129730552ccaa7137f8.mp4","poster":"http://tusmartedu.w.brotop.cn/uploads/20191226/afb3a642492be13773767c17a2a64518.jpg"}],"images":["http://tusmartedu.w.brotop.cn/uploads/20191227/c8fa61624f0095237f636daa56aec955.jpg"],"student_name":"张奥童","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80","score_id":2738},{"id":19,"student_id":855,"name":"这","type":"文章类","publications":"今天","push_time":"2019-07-26","content":"一起吃东西没有","create_time":1577413063,"video":[{"video":"","poster":""}],"images":["http://tusmartedu.w.brotop.cn/uploads/20191227/f1230238e9d0ccc36cdaae12bdfae592.jpg","http://tusmartedu.w.brotop.cn/uploads/20191227/86ce99596c173e3b5fe186484831c0ed.jpg"],"student_name":"王乔楚","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80","score_id":3052},{"id":22,"student_id":866,"name":"今天","type":"文章类","publications":"你的","push_time":"2019-06-26","content":"de\u2006fen","create_time":1577414973,"video":[{"video":"","poster":""}],"images":[],"student_name":"王然","opus_level_name":"国家级","prize_level_name":"一等奖","class_id":117,"opus_level":"40","prize_level":"80","score_id":3055}]
*/
private int total;
... ... @@ -105,22 +107,23 @@ public class ZplistEntity {
public static class DataBean {
/**
* id : 3
* student_id : 845
* name : 测试
* type : 体育类
* publications : 人民日报
* push_time : 0019-12-16
* content : 冬爷爷悄悄地走了，春姑娘迈着轻盈的步伐来到了人间。春天在哪里呢？让我们找一找吧。春天在哪里？春天在公园里。走进公园，首先映入眼帘的是一大片碧绿如丝绒般的草地，一朵朵鲜花把草地装点的更加生机勃勃。大片大片的桃花，白的似雪，粉的如霞无数朵白…兰在阳光下随风摇摆着，像是穿着白色连衣裙的少女在枝头翩翩起舞。小燕子从南方赶来，为春光增添了许多生趣。小麻雀在枝头“叽叽喳喳”地唱着，仿佛在说：“春天来了，春天来了，快快播种”。一片片竹林疏疏朗朗，青翠欲滴。柳树姑娘迎着春风，摆动着她那刚长出新芽的“长头发”。这不禁让我想起了唐代诗人贺知章的《咏柳》： 作者：卞琪浩一 链接：https://www.jianshu.com/p/b156d4b85af2 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
* create_time : 1576639944
* video :
* images : []
* student_name : 王棋民
* id : 17
* student_id : 885
* name : 这种
* type : 文章类
* publications : 我们
* push_time : 2019-06-26
* content : 不会是这样一
* create_time : 1577355746
* video : [{"video":"http://tusmartedu.w.brotop.cn/uploads/20191226/119fc61e6c5d3129730552ccaa7137f8.mp4","poster":"http://tusmartedu.w.brotop.cn/uploads/20191226/afb3a642492be13773767c17a2a64518.jpg"}]
* images : ["http://tusmartedu.w.brotop.cn/uploads/20191227/c8fa61624f0095237f636daa56aec955.jpg"]
* student_name : 张奥童
* opus_level_name : 国家级
* prize_level_name : 一等奖
* class_id : 117
* opus_level : 40
* prize_level : 80
* score_id : 2738
*/
private int id;
... ... @@ -131,13 +134,14 @@ public class ZplistEntity {
private String push_time;
private String content;
private int create_time;
private String video;
private String student_name;
private String opus_level_name;
private String prize_level_name;
private int class_id;
private String opus_level;
private String prize_level;
private int score_id;
private List<VideoBean> video;
private List<String> images;
public int getId() {
... ... @@ -204,14 +208,6 @@ public class ZplistEntity {
this.create_time = create_time;
}
public String getVideo() {
return video;
}
public void setVideo(String video) {
this.video = video;
}
public String getStudent_name() {
return student_name;
}
... ... @@ -260,6 +256,22 @@ public class ZplistEntity {
this.prize_level = prize_level;
}
public int getScore_id() {
return score_id;
}
public void setScore_id(int score_id) {
this.score_id = score_id;
}
public List<VideoBean> getVideo() {
return video;
}
public void setVideo(List<VideoBean> video) {
this.video = video;
}
public List<String> getImages() {
return images;
}
... ... @@ -267,6 +279,41 @@ public class ZplistEntity {
public void setImages(List<String> images) {
this.images = images;
}
public static class VideoBean {
/**
* video : http://tusmartedu.w.brotop.cn/uploads/20191226/119fc61e6c5d3129730552ccaa7137f8.mp4
* poster : http://tusmartedu.w.brotop.cn/uploads/20191226/afb3a642492be13773767c17a2a64518.jpg
*/
private String video;
private String poster;
// private HashMap<String,String> videoMap;
public String getVideo() {
return video;
}
public void setVideo(String video) {
this.video = video;
}
public String getPoster() {
return poster;
}
public void setPoster(String poster) {
this.poster = poster;
}
// public HashMap<String, String> getVideoMap() {
// return videoMap;
// }
//
// public void setVideoMap(HashMap<String, String> videoMap) {
// this.videoMap = videoMap;
// }
}
}
}
}
... ...
... ... @@ -220,7 +220,7 @@ public class M {
if (progressDialog != null) progressDialog.dismiss();
}
// ------------------------------------------------- 获取视频第一帧 ---------------------------------------------------------------------------------
// ------------------------------------------------- 获取网络视频第一帧 ---------------------------------------------------------------------------------
public static Bitmap getNetVideoBitmap(String videoUrl) {
Bitmap bitmap = null;
... ... @@ -238,6 +238,35 @@ public class M {
return bitmap;
}
// ------------------------------------------ 本地视频对应的id 获取缩略图地址 -------------------------------------------
public static String[] thumbColumns = {MediaStore.Video.Thumbnails.DATA};
public static String getThumbnailPathForLocalFile(Context context, long fileId) {
MediaStore.Video.Thumbnails.getThumbnail(context.getContentResolver(),
fileId, MediaStore.Video.Thumbnails.MICRO_KIND, null);
Cursor thumbCursor = null;
try {
thumbCursor = context.getContentResolver().query(
MediaStore.Video.Thumbnails.EXTERNAL_CONTENT_URI,
thumbColumns, MediaStore.Video.Thumbnails.VIDEO_ID + " = "
+ fileId, null, null);
if (thumbCursor.moveToFirst()) {
String thumbPath = thumbCursor.getString(thumbCursor
.getColumnIndex(MediaStore.Video.Thumbnails.DATA));
return thumbPath;
}
} finally {
thumbCursor.close();
}
return null;
}
// -------------------------------------------------- Gilde加载图片 ---------------------------------------------------------------------------------
// implementation 'com.github.bumptech.glide:glide:4.8.0'
... ...
... ... @@ -492,9 +492,12 @@ public class StuEvaFragment extends BaseFragment {
if (data.getCode() == M.success) {
student = data.getData().getStudent();
group = data.getData().getGroup();
arr1.addAll(student);
arr2.addAll(group);
if(student.size() > 0){
arr1.addAll(student);
}
if(arr2.size() > 0){
arr2.addAll(group);
}
stuAdapter.notifyDataSetChanged();
groupAdapter.notifyDataSetChanged();
}
... ...
... ... @@ -51,6 +51,7 @@ import com.yinhebairong.clasmanage.widget.SupportPopupWindow;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import butterknife.BindView;
... ... @@ -75,6 +76,7 @@ public class ZpglActivity extends BaseActivity {
List<ZplistEntity.DataBeanX.DataBean> list = new ArrayList<>();
ZpglAdapter zpglAdapter;
HashMap<String, String> map = new HashMap<>(); // map
@Override
protected void setEvent() {
... ... @@ -100,8 +102,6 @@ public class ZpglActivity extends BaseActivity {
});
setRv(rv, 1, 0, 0);
// zpglAdapter = new ZpglAdapter(R.layout.item_zpgl, list);
// rv.setAdapter(zpglAdapter);
}
... ... @@ -167,9 +167,8 @@ public class ZpglActivity extends BaseActivity {
intent.putExtra(M.TypeTag, M.BJCODE);
intent.putExtra(M.ZpId, list.get(position).getId() + "");
startActivity(intent);
// M.toast(activity, "编辑");
break;
case R.id.zpgl_item:
case R.id.zpgl_item: // 详情
Intent itemDetail = new Intent(activity, AddZpActivity.class);
itemDetail.putExtra(M.TypeTag, M.DETAILCODE);
itemDetail.putExtra(M.ZpId, list.get(position).getId() + "");
... ... @@ -179,8 +178,6 @@ public class ZpglActivity extends BaseActivity {
});
// list.addAll(sj);
// zpglAdapter.notifyDataSetChanged();
}
});
}
... ... @@ -203,7 +200,7 @@ public class ZpglActivity extends BaseActivity {
// ---------------------------------------------------------- adapter ---------------------------------------------------------------------------------
class ZpglAdapter extends BaseQuickAdapter<ZplistEntity.DataBeanX.DataBean, BaseViewHolder> {
int id;
int id = -1;
public ZpglAdapter(int layoutResId, @Nullable List<ZplistEntity.DataBeanX.DataBean> data) {
super(layoutResId, data);
... ... @@ -236,15 +233,27 @@ public class ZpglActivity extends BaseActivity {
// 二级数据源
List<String> picAndVideo = new ArrayList<>();
if (item.getVideo() != null && !item.getVideo().equals("")) {
picAndVideo.add(item.getVideo() + "");
if (item.getVideo().size() > 0) {
if (item.getVideo().get(0).getPoster() != null && !item.getVideo().get(0).getPoster().equals("")) {
picAndVideo.add(item.getVideo().get(0).getPoster() + "");
map.put(item.getVideo().get(0).getPoster(), item.getVideo().get(0).getVideo());
}
}
if (item.getImages() != null) {
picAndVideo.addAll(item.getImages());
}
picAndVideo.addAll(item.getImages());
RecyclerView zpgl_rv = helper.getView(R.id.zpgl_rv);
setRv(zpgl_rv, 0, 0, 3);
if (item.getImages().size() > 0) {
ImagesAdapter imagesAdapter = new ImagesAdapter(R.layout.item_image, picAndVideo); // item.getImages()
ImagesAdapter imagesAdapter;
if (picAndVideo.size() > 0) {
if (item.getVideo().size() > 0) {
imagesAdapter = new ImagesAdapter(R.layout.item_image, picAndVideo, item.getVideo().get(0).getPoster() + "");
} else {
imagesAdapter = new ImagesAdapter(R.layout.item_image, picAndVideo, "");
}
// item.getImages()
zpgl_rv.setAdapter(imagesAdapter);
// 点击
imagesAdapter.setOnItemChildClickListener((adapter, view, position) -> {
... ... @@ -252,9 +261,8 @@ public class ZpglActivity extends BaseActivity {
switch (view.getId()) {
case R.id.item_image:
String str = picAndVideo.get(position);
String substr = str.substring(str.length() - 3, str.length());
if (substr.equals("jpg") || substr.equals("png") || substr.equals("peg") || substr.equals("gif")) {
imgPop(picAndVideo, position);
if (map.get(str) != null) {
imgPop(picAndVideo, position); // 视频
} else {
imgPop(picAndVideo, position);
}
... ... @@ -275,8 +283,11 @@ public class ZpglActivity extends BaseActivity {
class ImagesAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
public ImagesAdapter(int layoutResId, @Nullable List<String> data) {
String img;
public ImagesAdapter(int layoutResId, @Nullable List<String> data, String img) {
super(layoutResId, data);
this.img = img;
}
@Override
... ... @@ -284,15 +295,13 @@ public class ZpglActivity extends BaseActivity {
ImageView video = helper.getView(R.id.item_select_pic_video);
helper.addOnClickListener(R.id.item_image);
String value = item.substring(item.length() - 3, item.length());
if (!value.equals("png") && !value.equals("jpg")) {
if (item.equals(img)) {
video.setVisibility(View.VISIBLE);
} else {
video.setVisibility(View.GONE);
}
M.Glide(item, helper.getView(R.id.item_image), activity);
}
}
... ... @@ -319,14 +328,14 @@ public class ZpglActivity extends BaseActivity {
// 初始值
pop_value.setText((pageSze + 1) + "/" + imgList.size());
String saa = imgList.get(pageSze);
String substr = saa.substring(saa.length() - 3, saa.length());
if (substr.equals("jpg") || substr.equals("png") || substr.equals("peg") || substr.equals("gif")) {
M.Glide(imgList.get(pageSze), pop_img, activity);
} else {
if (map.get(saa) != null) {
pop_img.setVisibility(View.GONE);
player.setVisibility(View.VISIBLE);
player_gs.setVisibility(View.VISIBLE);
setplay(gsyVideoOption, imgList.get(pageSze));
setplay(gsyVideoOption, map.get(saa) + "");
M.log("setplayx", map.get(saa) + "");
} else {
M.Glide(imgList.get(pageSze), pop_img, activity);
}
// 弹窗
... ... @@ -373,15 +382,7 @@ public class ZpglActivity extends BaseActivity {
if ((pageSze - 1) >= 0) {
pageSze--;
String jian = imgList.get(pageSze);
String subj = jian.substring(jian.length() - 3, jian.length());
if (subj.equals("jpg") || subj.equals("png") || subj.equals("peg") || subj.equals("gif")) {
pop_img.setVisibility(View.VISIBLE);
// video.setVisibility(View.GONE);
player.setVisibility(View.GONE);
player_gs.setVisibility(View.GONE);
M.Glide(imgList.get(pageSze), pop_img, activity);
pop_value.setText((pageSze + 1) + "/" + imgList.size());
} else {
if (map.get(jian) != null) {
pop_img.setVisibility(View.GONE);
pop_img.setVisibility(View.GONE);
player.setVisibility(View.VISIBLE);
... ... @@ -389,9 +390,16 @@ public class ZpglActivity extends BaseActivity {
if (gsyVideoOption == null) {
gsyVideoOption = new GSYVideoOptionBuilder();
}
setplay(gsyVideoOption, imgList.get(pageSze));
setplay(gsyVideoOption, map.get(jian) + "");
pop_value.setText((pageSze + 1) + "/" + imgList.size());
} else {
pop_img.setVisibility(View.VISIBLE);
player.setVisibility(View.GONE);
player_gs.setVisibility(View.GONE);
M.Glide(imgList.get(pageSze), pop_img, activity);
pop_value.setText((pageSze + 1) + "/" + imgList.size());
}
M.log("video", imgList.get(pageSze));
} else {
M.toast(activity, "已是第一页");
... ... @@ -400,15 +408,7 @@ public class ZpglActivity extends BaseActivity {
if ((pageSze + 1) < imgList.size()) {
pageSze++;
String zen = imgList.get(pageSze);
String subz = zen.substring(zen.length() - 3, zen.length());
if (subz.equals("jpg") || subz.equals("png") || subz.equals("peg") || subz.equals("gif")) {
pop_img.setVisibility(View.VISIBLE);
// video.setVisibility(View.GONE);
player.setVisibility(View.GONE);
player_gs.setVisibility(View.GONE);
M.Glide(imgList.get(pageSze), pop_img, activity);
pop_value.setText((pageSze + 1) + "/" + imgList.size());
} else {
if (map.get(zen) != null) {
pop_img.setVisibility(View.GONE);
pop_img.setVisibility(View.GONE);
player.setVisibility(View.VISIBLE);
... ... @@ -416,9 +416,16 @@ public class ZpglActivity extends BaseActivity {
if (gsyVideoOption == null) {
gsyVideoOption = new GSYVideoOptionBuilder();
}
setplay(gsyVideoOption, imgList.get(pageSze));
setplay(gsyVideoOption, map.get(zen) + "");
pop_value.setText((pageSze + 1) + "/" + imgList.size());
} else {
pop_img.setVisibility(View.VISIBLE);
player.setVisibility(View.GONE);
player_gs.setVisibility(View.GONE);
M.Glide(imgList.get(pageSze), pop_img, activity);
pop_value.setText((pageSze + 1) + "/" + imgList.size());
}
} else {
M.toast(activity, "已是最后一页");
}
... ...
... ... @@ -5,6 +5,7 @@ import android.content.ContentResolver;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
... ... @@ -33,6 +34,7 @@ import com.yinhebairong.clasmanage.Config;
import com.yinhebairong.clasmanage.R;
import com.yinhebairong.clasmanage.base.BaseActivity;
import com.yinhebairong.clasmanage.base.instant.Layout;
import com.yinhebairong.clasmanage.bean.AddZpJson;
import com.yinhebairong.clasmanage.entity.PostFiel;
import com.yinhebairong.clasmanage.entity.TjxzListEntity;
import com.yinhebairong.clasmanage.entity.ZpDetailEntity;
... ... @@ -44,7 +46,9 @@ import com.yinhebairong.clasmanage.widget.ZpdjChooseDialog;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
... ... @@ -149,7 +153,9 @@ public class AddZpActivity extends BaseActivity {
List<String> imageArr = new ArrayList<>(); // 保存图片的
List<String> picAndVideo = new ArrayList<>(); // 视频和图片
String videoPath = ""; // 视频路径
// List<String> vidThu = new ArrayList<>(); // 视频和缩略图
AddZpJson vidThu = new AddZpJson();
// List<AddZpJson> vidThu = new ArrayList<>();
List<TjxzListEntity.DataBean> nameList = new ArrayList<>(); // 输入框名称数据
int stuid = -1; // 这个用来判断, 只是输入的话, 是无效的, 只有点击之后才会起作用, 不然不可添加作品
... ... @@ -162,6 +168,8 @@ public class AddZpActivity extends BaseActivity {
boolean QWER = false; // 用来判断编辑
String videoPath = ""; // 视频和缩略图最后上传的时候路径 , 需要拼接
@Override
protected void initData() {
CODE1 = M.ADDCODE;
... ... @@ -169,14 +177,14 @@ public class AddZpActivity extends BaseActivity {
CODE3 = M.DETAILCODE;
extra = getIntent().getStringExtra(M.TypeTag);
if (extra.equals(CODE1)) {
if (extra.equals(M.ADDCODE)) {
name.setText("添加作品");
zp_bj_linear.setVisibility(View.INVISIBLE);
bottom.setVisibility(View.VISIBLE);
detailbj.setVisibility(View.GONE);
QWER = true;
} else if (extra.equals(CODE2)) {
} else if (extra.equals(M.BJCODE)) {
name.setText("编辑作品");
zp_bj_linear.setVisibility(View.VISIBLE);
bottom.setVisibility(View.VISIBLE);
... ... @@ -209,18 +217,6 @@ public class AddZpActivity extends BaseActivity {
detailDate();
}
// switch (extra) {
// case CODE1: // 添加作品
//
// break;
// case CODE2: // 编辑作品
//
// detailDate();
// break;
// case M.DETAILCODE: // 作品详情
//
// break;
// }
setRv(rv, 0, 0, 3);
picAdapter = new ImageAdapter(R.layout.item_select_picture, picAndVideo); // 图片选择
... ... @@ -264,38 +260,24 @@ public class AddZpActivity extends BaseActivity {
}
});
// edit
// edit_name.setOnEditorActionListener((v, actionId, event) -> {
// if (null != event && KeyEvent.KEYCODE_ENTER == event.getKeyCode()) {
// switch (event.getAction()) {
// case KeyEvent.ACTION_UP:
// searName(M.getEditTextString(edit_name));
//// stuid = -1;
// return true;
// default:
// return true;
// }
// }
// return false;
// });
// 选择器
picAdapter.setOnItemChildClickListener((adapter, view, position) -> {
switch (view.getId()) {
case R.id.v_delete: // 删除
if (videoPath.equals("")) {
imageArr.remove(position);
picAndVideo.remove(position);
} else {
if (vidThu.getVideo() != null && !vidThu.getVideo().equals("")) {
if (position == 0) {
videoPath = "";
vidThu.setVideo("");
vidThu.setPoster("");
picAndVideo.remove(position);
} else {
picAndVideo.remove(position);
imageArr.remove((position - 1));
}
} else {
imageArr.remove(position);
picAndVideo.remove(position);
}
picAdapter.notifyDataSetChanged();
... ... @@ -309,27 +291,15 @@ public class AddZpActivity extends BaseActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.add_zp_bj: // 右上角的编辑按钮
if (zp_bj_text.getText().toString().trim().equals("编辑")) {
zp_bj_text.setText("取消编辑");
edit_name.setEnabled(true); // 不可编辑
edit_value.setEnabled(true);
zplx.setClickable(false);
// if (zp_bj_text.getText().toString().trim().equals("编辑")) {
edit_kwmc.setEnabled(true);
zplevel.setClickable(false);
zp_bj_linear.setVisibility(View.GONE);
bottom.setVisibility(View.GONE);
detailbj.setVisibility(View.VISIBLE);
date.setClickable(false);
zp_bj_linear.setVisibility(View.INVISIBLE);
edit_xq.setEnabled(true);
add_pic.setVisibility(View.VISIBLE);
add_video.setVisibility(View.VISIBLE);
} else {
zp_bj_text.setText("编辑");
edit_name.setEnabled(false); // 编辑
edit_name.setEnabled(false); // 不可编辑
edit_value.setEnabled(false);
zplx.setClickable(true);
... ... @@ -340,10 +310,13 @@ public class AddZpActivity extends BaseActivity {
edit_xq.setEnabled(false);
add_pic.setVisibility(View.GONE);
add_video.setVisibility(View.GONE);
}
QWER = false;
extra = CODE3;
picAdapter.notifyDataSetChanged();
break;
case R.id.include_back:
this.finish();
... ... @@ -363,8 +336,8 @@ public class AddZpActivity extends BaseActivity {
}.show();
break;
case R.id.add_zp_linear_level: // 作品等级
if(!zplx.getText().toString().trim().equals("请选择作品类型")){
new ZpdjChooseDialog(activity, valueA, valueB,zplx.getText().toString().trim()) {
if (!zplx.getText().toString().trim().equals("请选择作品类型")) {
new ZpdjChooseDialog(activity, valueA, valueB, zplx.getText().toString().trim()) {
@Override
public void SelectSure(String valueA, String valueB, int idA, int idB) {
if (valueA.equals("0") && valueB.equals("0")) { // 取消
... ... @@ -379,7 +352,7 @@ public class AddZpActivity extends BaseActivity {
}
}
}.show();
}else {
} else {
M.toast(activity, "请选择作品类型");
}
break;
... ... @@ -449,12 +422,15 @@ public class AddZpActivity extends BaseActivity {
queImage = queImage + "," + imageArr.get(i);
}
}
post(); // 添加 | 编辑作品
} else {
M.toast(activity, "请检查是否有信息未填写");
}
break;
case R.id.detaik_bj: // 详情之后的编辑
zp_bj_linear.setVisibility(View.VISIBLE);
zp_bj_linear.setVisibility(View.VISIBLE);
bottom.setVisibility(View.VISIBLE);
detailbj.setVisibility(View.GONE);
... ... @@ -470,11 +446,12 @@ public class AddZpActivity extends BaseActivity {
edit_xq.setEnabled(true);
add_pic.setVisibility(View.VISIBLE);
add_video.setVisibility(View.VISIBLE);
QWER = true;
extra = CODE2;
picAdapter.notifyDataSetChanged();
break;
}
}
... ... @@ -518,7 +495,12 @@ public class AddZpActivity extends BaseActivity {
M.log("获奖等级", M.getEditTextString(edit_value) + "--" + zplx.getText() + "--" + M.getEditTextString(edit_kwmc) + "--" + AddZpActivity.this.valueA + "--" + AddZpActivity.this.valueB + "--" +
date.getText() + "--" + M.getEditTextString(edit_xq));
if (extra.equals(CODE1)) {
if (vidThu.getVideo() != null && !vidThu.getVideo().equals("")) {
videoPath = vidThu.toString();
}
M.log("videoPath", videoPath);
if (extra.equals(M.ADDCODE)) {
Api().add_opus(Config.Token, stuid, M.getEditTextString(edit_value), zplx.getText() + "", M.getEditTextString(edit_kwmc), idA + "", idB + "", date.getText() + "",
M.getEditTextString(edit_xq), videoPath, queImage).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {
if (data.getCode() == M.success) {
... ... @@ -532,9 +514,6 @@ public class AddZpActivity extends BaseActivity {
});
} else {
if (bj_zpId != -1) {
M.log("imageArr", queImage + "");
Api().bj_opus(Config.Token, bj_zpId, stuid, M.getEditTextString(edit_value), zplx.getText() + "", M.getEditTextString(edit_kwmc), idA + "", idB + "", date.getText() + "",
M.getEditTextString(edit_xq), videoPath, queImage).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {
if (data.getCode() == M.success) {
... ... @@ -577,17 +556,20 @@ public class AddZpActivity extends BaseActivity {
if (type == 1) {
imageArr.add(url); // 图片
picAndVideo.add(url); // 图片
Log.e("picAndVideo55", imageArr.toString());
} else {
videoPath = url; // 视频
picAndVideo.add(videoPath);
picAndVideo.addAll(imageArr);
Log.e("picAndVideo11", imageArr.toString());
String sub = url.substring(url.length() - 3, url.length());
if (sub.equals("jpg") || sub.equals("png") || sub.equals("peg") || sub.equals("gif")) {
vidThu.setPoster(url);
} else {
vidThu.setVideo(url);
picAndVideo.add(vidThu.getVideo() + "");
picAndVideo.addAll(imageArr);
}
Log.e("vidThu", vidThu.toString());
}
picAdapter.notifyDataSetChanged();
}
}
... ... @@ -606,7 +588,7 @@ public class AddZpActivity extends BaseActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_CODE && data != null) {
if(extra == CODE1){ // 处于添加页面的时候 直接添加
if (extra == CODE1) { // 处于添加页面的时候 直接添加
imageArr.clear();
}
List<String> images = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
... ... @@ -621,10 +603,18 @@ public class AddZpActivity extends BaseActivity {
ContentResolver cr = this.getContentResolver();
Cursor cursor = cr.query(uri, null, null, null, null);
if (cursor != null) {
vidThu.setVideo("");
vidThu.setPoster("");
if (cursor.moveToFirst()) {
videoPath = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Video.Media.DATA));
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(videoPath, 2); // 视频
postFile(vidThu.getVideo(), 2); // 视频
postFile(vidThu.getPoster(), 2); // 视频缩略图
}
cursor.close();
}
... ... @@ -663,21 +653,24 @@ public class AddZpActivity extends BaseActivity {
protected void convert(BaseViewHolder helper, String item) {
View v = helper.getView(R.id.v_delete);
if (extra.equals(CODE1) || extra.equals(CODE2)) {
if (extra.equals(M.ADDCODE) || extra.equals(M.BJCODE)) {
v.setVisibility(View.VISIBLE);
} else {
v.setVisibility(View.INVISIBLE);
}
M.Glide(item, helper.getView(R.id.iv_picture), activity);
ImageView video = helper.getView(R.id.item_select_pic_video); // 视频标记
helper.addOnClickListener(R.id.v_delete); // sc
String value = item.substring(item.length() - 3, item.length());
ImageView iv_picture = helper.getView(R.id.iv_picture);
if (!value.equals("png") && !value.equals("jpg")) {
video.setVisibility(View.VISIBLE);
M.Glide(vidThu.getPoster(), iv_picture, activity);
} else {
video.setVisibility(View.GONE);
M.Glide(item, iv_picture, activity);
}
}
... ... @@ -717,7 +710,13 @@ public class AddZpActivity extends BaseActivity {
String push_time = detail.getPush_time();
String content = detail.getContent();
int create_time = detail.getCreate_time();
videoPath = detail.getVideo();
if (detail.getVideo().size() > 0) {
if (detail.getVideo().get(0).getPoster() != null && !detail.getVideo().get(0).getPoster().equals("")) {
vidThu.setPoster(detail.getVideo().get(0).getPoster());
vidThu.setVideo(detail.getVideo().get(0).getVideo());
}
}
List<String> images = detail.getImages();
String student_name = detail.getStudent_name();
String opus_level_name = detail.getOpus_level_name();
... ... @@ -734,15 +733,15 @@ public class AddZpActivity extends BaseActivity {
date.setText(push_time + "");
edit_xq.setText(content + "");
if (!videoPath.equals("")) {
picAndVideo.add(videoPath);
if (vidThu.getVideo() != null && !vidThu.getVideo().equals("")) {
picAndVideo.add(vidThu.getVideo());
picAdapter.notifyDataSetChanged();
}
if (images.size() > 0) {
imageArr.addAll(images);
picAndVideo.addAll(imageArr);
picAdapter.notifyDataSetChanged();
M.log("imageArr", imageArr.toString());
}
}
... ...
... ... @@ -52,13 +52,10 @@ public class BjxzAcitivty extends BaseActivity {
@BindView(R.id.bjxz_js)
TextView bjxzJs;
// List<BjxzEntity.DataBean.CurrentBean> dqlist = new ArrayList<>();
// List<BjxzEntity.DataBean.OtherBean> othlist = new ArrayList<>();
CulAdapter culAdapter;
OtherAdapter otherAdapter;
// List<String> postId = new ArrayList<>(); // 最后上传的id
List<List<BjxzItem>> itemlist = new ArrayList<>(); // itemList.get(0) 的数据是最后需要上传的数据
String postid = "";
... ...
... ... @@ -38,7 +38,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="3716"
android:text=""
android:textColor="@color/color_8c9198"
android:textSize="@dimen/sp_15"
android:layout_marginRight="@dimen/dp_15"
... ...
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
... ...