yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Js调用原生整改

Browse Source
This commit is contained in:
18401019693
2022-11-11 18:32:35 +08:00
parent 0b041bad7b
commit 84f352a7fb
51 changed files with 1174 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
video/src/main/java/com/yunbao/video/activity/AbsVideoPlayActivity.java
View File

@@ -9,10 +9,7 @@ import android.media.MediaMetadataRetriever;
import android.text.TextUtils;
import android.view.WindowManager;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.HtmlConfig;
import com.yunbao.common.bean.ConfigBean;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.CommonCallback;
@@ -23,9 +20,8 @@ import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.video.R;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
import com.yunbao.video.event.VideoDeleteEvent;
import com.yunbao.video.event.VideoShareEvent;
import com.yunbao.video.http.VideoHttpConsts;
import com.yunbao.video.http.VideoHttpUtil;
import com.yunbao.video.utils.VideoLocalUtil;

2
video/src/main/java/com/yunbao/video/activity/VideoEditActivity.java
View File

@@ -26,7 +26,7 @@ import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.video.R;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.video.utils.VideoLocalUtil;
import com.yunbao.video.views.VideoEditCutViewHolder;
import com.yunbao.video.views.VideoEditFilterViewHolder;

2
video/src/main/java/com/yunbao/video/activity/VideoPlayActivity.java
View File

@@ -14,7 +14,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.video.R;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
import com.yunbao.video.utils.LottieComponent;
import com.yunbao.video.utils.VideoStorge;
import com.yunbao.video.views.VideoScrollViewHolder;

2
video/src/main/java/com/yunbao/video/adapter/MusicAdapter.java
View File

@@ -16,7 +16,7 @@ import com.alibaba.fastjson.JSON;
import com.yunbao.common.Constants;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.video.R;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.video.http.VideoHttpConsts;

2
video/src/main/java/com/yunbao/video/adapter/VideoScrollAdapter.java
View File

@@ -18,7 +18,7 @@ import com.yunbao.common.utils.ClickUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.video.R;
import com.yunbao.video.activity.AbsVideoPlayActivity;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
import com.yunbao.video.utils.VideoIconUtil;
import com.yunbao.video.views.VideoPlayWrapViewHolder;

169
video/src/main/java/com/yunbao/video/bean/MusicBean.java
View File

@@ -1,169 +0,0 @@
package com.yunbao.video.bean;
import android.os.Parcel;
import android.os.Parcelable;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Created by cxf on 2018/6/20.
*/
public class MusicBean implements Parcelable {
private int id;
private String title;
private String author;
private String imgUrl;
private String length;
private String fileUrl;
private String useNum;
private String localPath;//本地存储的路径
private int collect;//是否收藏
private boolean expand;
private long mDuration;
public MusicBean() {
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getAuthor() {
return author;
}
public void setAuthor(String author) {
this.author = author;
}
@JSONField(name = "img_url")
public String getImgUrl() {
return imgUrl;
}
@JSONField(name = "img_url")
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
public String getLength() {
return length;
}
public void setLength(String length) {
this.length = length;
}
@JSONField(name = "file_url")
public String getFileUrl() {
return fileUrl;
}
@JSONField(name = "file_url")
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
@JSONField(name = "use_nums")
public String getUseNum() {
return useNum;
}
@JSONField(name = "use_nums")
public void setUseNum(String useNum) {
this.useNum = useNum;
}
public String getLocalPath() {
return localPath;
}
public void setLocalPath(String localPath) {
this.localPath = localPath;
}
public boolean isExpand() {
return expand;
}
public void setExpand(boolean expand) {
this.expand = expand;
}
@JSONField(name = "iscollect")
public int getCollect() {
return collect;
}
@JSONField(name = "iscollect")
public void setCollect(int collect) {
this.collect = collect;
}
public long getDuration() {
return mDuration;
}
public void setDuration(long duration) {
mDuration = duration;
}
@Override
public int describeContents() {
return 0;
}
public MusicBean(Parcel in) {
this.id = in.readInt();
this.title = in.readString();
this.author = in.readString();
this.imgUrl = in.readString();
this.length = in.readString();
this.fileUrl = in.readString();
this.useNum = in.readString();
this.localPath = in.readString();
this.collect = in.readInt();
this.mDuration=in.readLong();
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(this.id);
dest.writeString(this.title);
dest.writeString(this.author);
dest.writeString(this.imgUrl);
dest.writeString(this.length);
dest.writeString(this.fileUrl);
dest.writeString(this.useNum);
dest.writeString(this.localPath);
dest.writeInt(this.collect);
dest.writeLong(this.mDuration);
}
public static final Creator<MusicBean> CREATOR = new Creator<MusicBean>() {
@Override
public MusicBean[] newArray(int size) {
return new MusicBean[size];
}
@Override
public MusicBean createFromParcel(Parcel in) {
return new MusicBean(in);
}
};
}

351
video/src/main/java/com/yunbao/video/bean/VideoBean.java
View File

@@ -1,351 +0,0 @@
package com.yunbao.video.bean;
import android.os.Parcel;
import android.os.Parcelable;
import com.alibaba.fastjson.annotation.JSONField;
import com.yunbao.common.bean.UserBean;
/**
* Created by cxf on 2017/10/25.
*/
public class VideoBean implements Parcelable {
private String id;
private String uid;
private String title;
private String thumb;
private String thumbs;
private String href;
private String likeNum;
private String viewNum;
private String commentNum;
private String stepNum;
private String shareNum;
private String addtime;
private String lat;
private String lng;
private String city;
private UserBean userBean;
private String datetime;
private String distance;
private int step;//是否踩过
private int like;//是否赞过
private int attent;//是否关注过作者
private int status;
private int musicId;
private MusicBean musicInfo;
public VideoBean() {
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getUid() {
return uid;
}
public void setUid(String uid) {
this.uid = uid;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getThumb() {
return thumb;
}
public void setThumb(String thumb) {
this.thumb = thumb;
}
@JSONField(name = "thumb_s")
public String getThumbs() {
return thumbs;
}
@JSONField(name = "thumb_s")
public void setThumbs(String thumbs) {
this.thumbs = thumbs;
}
public String getHref() {
return href;
}
public void setHref(String href) {
this.href = href;
}
@JSONField(name = "likes")
public String getLikeNum() {
return likeNum;
}
@JSONField(name = "likes")
public void setLikeNum(String likeNum) {
this.likeNum = likeNum;
}
@JSONField(name = "views")
public String getViewNum() {
return viewNum;
}
@JSONField(name = "views")
public void setViewNum(String viewNum) {
this.viewNum = viewNum;
}
@JSONField(name = "comments")
public String getCommentNum() {
return commentNum;
}
@JSONField(name = "comments")
public void setCommentNum(String commentNum) {
this.commentNum = commentNum;
}
@JSONField(name = "steps")
public String getStepNum() {
return stepNum;
}
@JSONField(name = "steps")
public void setStepNum(String stepNum) {
this.stepNum = stepNum;
}
@JSONField(name = "shares")
public String getShareNum() {
return shareNum;
}
@JSONField(name = "shares")
public void setShareNum(String shareNum) {
this.shareNum = shareNum;
}
public String getAddtime() {
return addtime;
}
public void setAddtime(String addtime) {
this.addtime = addtime;
}
public String getLat() {
return lat;
}
public void setLat(String lat) {
this.lat = lat;
}
public String getLng() {
return lng;
}
public void setLng(String lng) {
this.lng = lng;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
@JSONField(name = "userinfo")
public UserBean getUserBean() {
return userBean;
}
@JSONField(name = "userinfo")
public void setUserBean(UserBean userBean) {
this.userBean = userBean;
}
public String getDatetime() {
return datetime;
}
public void setDatetime(String datetime) {
this.datetime = datetime;
}
@JSONField(name = "isstep")
public int getStep() {
return step;
}
@JSONField(name = "isstep")
public void setStep(int step) {
this.step = step;
}
@JSONField(name = "islike")
public int getLike() {
return like;
}
@JSONField(name = "islike")
public void setLike(int like) {
this.like = like;
}
@JSONField(name = "isattent")
public int getAttent() {
return attent;
}
@JSONField(name = "isattent")
public void setAttent(int attent) {
this.attent = attent;
}
public String getDistance() {
return distance;
}
public void setDistance(String distance) {
this.distance = distance;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
@JSONField(name = "music_id")
public int getMusicId() {
return musicId;
}
@JSONField(name = "music_id")
public void setMusicId(int musicId) {
this.musicId = musicId;
}
@JSONField(name = "musicinfo")
public MusicBean getMusicInfo() {
return musicInfo;
}
@JSONField(name = "musicinfo")
public void setMusicInfo(MusicBean musicInfo) {
this.musicInfo = musicInfo;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(this.id);
dest.writeString(this.uid);
dest.writeString(this.title);
dest.writeString(this.thumb);
dest.writeString(this.thumbs);
dest.writeString(this.href);
dest.writeString(this.likeNum);
dest.writeString(this.viewNum);
dest.writeString(this.commentNum);
dest.writeString(this.stepNum);
dest.writeString(this.shareNum);
dest.writeString(this.addtime);
dest.writeString(this.lat);
dest.writeString(this.lng);
dest.writeString(this.city);
dest.writeString(this.datetime);
dest.writeInt(this.like);
dest.writeInt(this.attent);
dest.writeString(this.distance);
dest.writeInt(this.step);
dest.writeParcelable(this.userBean, flags);
dest.writeInt(this.status);
dest.writeInt(this.musicId);
dest.writeParcelable(this.musicInfo, flags);
}
public VideoBean(Parcel in) {
this.id = in.readString();
this.uid = in.readString();
this.title = in.readString();
this.thumb = in.readString();
this.thumbs = in.readString();
this.href = in.readString();
this.likeNum = in.readString();
this.viewNum = in.readString();
this.commentNum = in.readString();
this.stepNum = in.readString();
this.shareNum = in.readString();
this.addtime = in.readString();
this.lat = in.readString();
this.lng = in.readString();
this.city = in.readString();
this.datetime = in.readString();
this.like = in.readInt();
this.attent = in.readInt();
this.distance = in.readString();
this.step = in.readInt();
this.userBean = in.readParcelable(UserBean.class.getClassLoader());
this.status = in.readInt();
this.musicId = in.readInt();
this.musicInfo = in.readParcelable(MusicBean.class.getClassLoader());
}
public static final Creator<VideoBean> CREATOR = new Creator<VideoBean>() {
@Override
public VideoBean[] newArray(int size) {
return new VideoBean[size];
}
@Override
public VideoBean createFromParcel(Parcel in) {
return new VideoBean(in);
}
};
@Override
public String toString() {
return "VideoBean{" +
"title='" + title + '\'' +
",href='" + href + '\'' +
",id='" + id + '\'' +
",uid='" + uid + '\'' +
",userNiceName='" + userBean.getUserNiceName() + '\'' +
",thumb='" + thumb + '\'' +
'}';
}
public String getTag() {
return "VideoBean" + this.getId() + this.hashCode();
}
}

2
video/src/main/java/com/yunbao/video/dialog/VideoMusicClassDialog.java
View File

@@ -17,7 +17,7 @@ import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.video.R;
import com.yunbao.video.adapter.MusicAdapter;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.video.http.VideoHttpConsts;
import com.yunbao.video.http.VideoHttpUtil;
import com.yunbao.video.interfaces.VideoMusicActionListener;

2
video/src/main/java/com/yunbao/video/dialog/VideoShareDialogFragment.java
View File

@@ -12,7 +12,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.bean.ConfigBean;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.video.R;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
/**
* Created by cxf on 2018/10/19.

2
video/src/main/java/com/yunbao/video/interfaces/VideoMusicActionListener.java
View File

@@ -1,7 +1,7 @@
package com.yunbao.video.interfaces;
import com.yunbao.video.adapter.MusicAdapter;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
/**
* Created by cxf on 2018/12/7.

2
video/src/main/java/com/yunbao/video/utils/VideoStorge.java
View File

@@ -1,6 +1,6 @@
package com.yunbao.video.utils;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
import com.yunbao.video.interfaces.VideoScrollDataHelper;
import java.util.HashMap;

2
video/src/main/java/com/yunbao/video/views/VideoEditMusicViewHolder.java
View File

@@ -8,7 +8,7 @@ import android.widget.TextView;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.video.R;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.video.custom.RangeSlider;
/**

2
video/src/main/java/com/yunbao/video/views/VideoMusicCollectViewHolder.java
View File

@@ -9,7 +9,7 @@ import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.video.R;
import com.yunbao.video.adapter.MusicAdapter;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.video.http.VideoHttpUtil;
import com.yunbao.video.interfaces.VideoMusicActionListener;

2
video/src/main/java/com/yunbao/video/views/VideoMusicHotViewHolder.java
View File

@@ -9,7 +9,7 @@ import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.video.R;
import com.yunbao.video.adapter.MusicAdapter;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.video.http.VideoHttpUtil;
import com.yunbao.video.interfaces.VideoMusicActionListener;

2
video/src/main/java/com/yunbao/video/views/VideoMusicSearchViewHolder.java
View File

@@ -10,7 +10,7 @@ import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.video.R;
import com.yunbao.video.adapter.MusicAdapter;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.video.http.VideoHttpUtil;
import com.yunbao.video.interfaces.VideoMusicActionListener;

2
video/src/main/java/com/yunbao/video/views/VideoMusicViewHolder.java
View File

@@ -34,7 +34,7 @@ import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.video.R;
import com.yunbao.video.adapter.MusicAdapter;
import com.yunbao.video.adapter.MusicClassAdapter;
import com.yunbao.video.bean.MusicBean;
import com.yunbao.common.bean.MusicBean;
import com.yunbao.video.bean.MusicClassBean;
import com.yunbao.video.dialog.VideoMusicClassDialog;
import com.yunbao.video.http.VideoHttpConsts;

2
video/src/main/java/com/yunbao/video/views/VideoPlayViewHolder.java
View File

@@ -18,7 +18,7 @@ import com.tencent.rtmp.ui.TXCloudVideoView;
import com.yunbao.common.utils.L;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.video.R;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
import com.yunbao.video.http.VideoHttpConsts;
import com.yunbao.video.http.VideoHttpUtil;

2
video/src/main/java/com/yunbao/video/views/VideoPlayWrapViewHolder.java
View File

@@ -28,7 +28,7 @@ import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.live.activity.LiveReportActivity;
import com.yunbao.video.R;
import com.yunbao.video.activity.AbsVideoPlayActivity;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
import com.yunbao.video.dialog.VideoShareDialogFragment;
import com.yunbao.video.event.VideoLikeEvent;
import com.yunbao.video.http.VideoHttpUtil;

2
video/src/main/java/com/yunbao/video/views/VideoScrollViewHolder.java
View File

@@ -12,7 +12,7 @@ import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.video.R;
import com.yunbao.video.activity.AbsVideoPlayActivity;
import com.yunbao.video.adapter.VideoScrollAdapter;
import com.yunbao.video.bean.VideoBean;
import com.yunbao.common.bean.VideoBean;
import com.yunbao.video.custom.VideoLoadingBar;
import com.yunbao.video.event.VideoCommentEvent;
import com.yunbao.video.event.VideoLikeEvent;