update 1.01版本及后续追加功能

This commit is contained in:
2023-11-27 16:26:33 +08:00
parent 934a91a2f1
commit b314d9ebbe
128 changed files with 3653 additions and 355 deletions

View File

@@ -62,6 +62,6 @@ dependencies {
//common
implementation project(path: ':common')
implementation project(path: ':live')
//implementation project(path: ':live')
}

View File

@@ -21,8 +21,8 @@ import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.ReportManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.activity.LiveReportActivity;
import com.yunbao.video.R;
import com.yunbao.video.bean.VideoCommentBean;
import com.yunbao.video.http.VideoHttpUtil;
@@ -296,7 +296,7 @@ public class VideoCommentAdapter extends RefreshAdapter<VideoCommentBean> {
report.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LiveReportActivity.forward(mContext, bean.getId());
ReportManager.report(mContext, bean.getId());
}
});
}

View File

@@ -25,10 +25,10 @@ import com.yunbao.common.custom.MyLinearLayout3;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.interfaces.OnItemLongClickListener;
import com.yunbao.common.manager.ReportManager;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.live.activity.LiveReportActivity;
import com.yunbao.video.R;
import com.yunbao.video.activity.AbsVideoCommentActivity;
import com.yunbao.video.adapter.VideoCommentAdapter;
@@ -356,7 +356,7 @@ public class VideoCommentViewHolder extends AbsViewHolder implements View.OnClic
@Override
public void onClick(View v) {
//举报
LiveReportActivity.forward(mContext, bean.getId());
ReportManager.report(mContext, bean.getId());
mPopupWindow.dismiss();
}
});

View File

@@ -18,14 +18,16 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.ReportManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
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.common.bean.VideoBean;
@@ -338,7 +340,7 @@ public class VideoPlayWrapViewHolder extends AbsViewHolder implements View.OnCli
if (mVideoBean == null) {
return;
}
LiveReportActivity.forward2(mContext, mVideoBean.getId());
ReportManager.report(mContext, mVideoBean.getId());
}
}
@@ -348,7 +350,13 @@ public class VideoPlayWrapViewHolder extends AbsViewHolder implements View.OnCli
*/
public void clickAvatar() {
if (mVideoBean != null) {
RouteUtil.forwardUserHome(mContext, mVideoBean.getUid(), 2);
if(mContext.getPackageName().equals("com.shayu.onetoonenew")){//社交
Bus.get().post(new JavascriptInterfaceEvent()
.setData(mVideoBean.getUid())
.setMethod("androidOTOToHomePage"));
}else {//PD
RouteUtil.forwardUserHome(mContext, mVideoBean.getUid(), 2);
}
}
}

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/gray2"
android:orientation="vertical">
<TextView
android:id="@+id/report"
android:layout_width="90dp"
android:layout_height="45dp"
android:gravity="center"
android:text="@string/report"
android:textColor="@color/black1"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>