Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

common/src/main/java/com/yunbao/common/adapter/CommentAdapter.java

@@ -103,6 +103,15 @@ public class CommentAdapter extends RecyclerView.Adapter {
                     }
                 }
             });
+            report1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        CommentBean.ReplyComment bean = (CommentBean.ReplyComment) v.getTag();
+                        onItemClickListener.onReport(bean);
+                    }
+                }
+            });
             replyTextView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

common/src/main/java/com/yunbao/common/adapter/CommentVideoAdapter.java

@@ -32,7 +32,7 @@ public class CommentVideoAdapter extends RefreshAdapter<CommentBean> {
         this.onItemClickListener = onItemClickListener;
     }
 
-    public CommentVideoAdapter(Context content, String authorId,CommentVideoAdapter.onItemClickListener onItemClickListener ) {
+    public CommentVideoAdapter(Context content, String authorId, CommentVideoAdapter.onItemClickListener onItemClickListener) {
         super(content);
         this.onItemClickListener = onItemClickListener;
         this.mContext = content;
@@ -94,6 +94,15 @@ public class CommentVideoAdapter extends RefreshAdapter<CommentBean> {
             author = itemView.findViewById(R.id.author);
             del1 = itemView.findViewById(R.id.del1);
             report1 = itemView.findViewById(R.id.report1);
+            report1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        CommentBean.ReplyComment bean = (CommentBean.ReplyComment) v.getTag();
+                        onItemClickListener.onReport(bean);
+                    }
+                }
+            });
             report.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

common/src/main/java/com/yunbao/common/utils/RouteUtil.java

@@ -62,6 +62,7 @@ public class RouteUtil {
                 .withString(Constants.TO_UID, uid)
                 .navigation();
     }
+
     public static void forwardCommunity(String id) {
         ARouter.getInstance().build(PATH_COMMUNITY)
                 .withString(Constants.TO_COMMUNITY_ID, id)
@@ -71,6 +72,7 @@ public class RouteUtil {
     public static void forwardVideoActivity() {
 
     }
+
     public static final String PATH_ADDRESSBOOK = "/main/MsgAddressBookActivity";
 
 
@@ -156,14 +158,17 @@ public class RouteUtil {
      * 跳转到个人主页
      */
     public static void forwardMainUserHome(Context context, String toUid, boolean fromLiveRoom, String fromLiveUid, int intoIndex) {
-        String url = HtmlConfig.PERSONAL + "?touid=" + toUid + "&isHomePage=1" + "&fromType=0";
+        ARouter.getInstance().build(PATH_USER_HOME)
+                .withString(Constants.TO_UID, toUid)
+                .navigation();
+      /*  String url = HtmlConfig.PERSONAL + "?touid=" + toUid + "&isHomePage=1" + "&fromType=0";
         if (!"".equals(Constants.chatActionUrl)) {
             url = Constants.chatActionUrl;
         }
         Constants.myUrl = url + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&t=" + System.currentTimeMillis() + "&isZh=" + ((IMLoginManager.get(context).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
         ARouter.getInstance().build(PATH_MYWEBVIEWACTIVTITY)
                 .withString(Constants.URL, url)
-                .navigation();
+                .navigation();*/
     }
 
 
@@ -399,8 +404,8 @@ public class RouteUtil {
 
     public static void forwardVideoPlayActivity(ActiveBean bean) {
         ARouter.getInstance().build(PATH_VIDEO_PLAY)
-                .withParcelable("ActiveBean",bean)
+                .withParcelable("ActiveBean", bean)
-                .withString(Constants.VIDEO_KEY,Constants.VIDEO_SINGLE)
+                .withString(Constants.VIDEO_KEY, Constants.VIDEO_SINGLE)
                 .navigation();
     }
 }

common/src/main/res/layout/activity_user_home.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/main_bg"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.yunbao.common.views.MyScrollview

main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java

@@ -490,8 +490,8 @@ public class UserHomeActivity extends AbsActivity {
                         itemLayout03.setVisibility(View.VISIBLE);
                         itemLayout04.setVisibility(View.VISIBLE);
                     } else {
-                        itemLayout01.setVisibility(View.GONE);
+                        itemLayout03.setVisibility(View.VISIBLE);
-                        itemLayout02.setVisibility(View.GONE);
+                        itemLayout04.setVisibility(View.VISIBLE);
                     }
                     moreText.setText("收起");
                     ImgLoader.display(mContext, R.mipmap.icon_up, moreIcon);

main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java

@@ -29,6 +29,7 @@ import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.PluginManager;
 import com.yunbao.common.utils.ProcessResultUtil;
+import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.LiveConfig;
@@ -37,6 +38,7 @@ import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.bean.LiveKsyConfigBean;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.main.R;
+import com.yunbao.main.activity.CommunitySendActivity;
 import com.yunbao.main.activity.MyWebViewActivity;
 import com.yunbao.main.interfaces.MainStartChooseCallback;
 
@@ -165,13 +167,13 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
             if (isAnchor) {
                 String[] permissions;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    permissions=new String[]{
+                    permissions = new String[]{
                             Manifest.permission.READ_MEDIA_IMAGES,
                             Manifest.permission.CAMERA,
                             Manifest.permission.RECORD_AUDIO
                     };
-                }else{
+                } else {
-                    permissions=new String[]{
+                    permissions = new String[]{
                             Manifest.permission.READ_EXTERNAL_STORAGE,
                             Manifest.permission.WRITE_EXTERNAL_STORAGE,
                             Manifest.permission.CAMERA,
@@ -191,13 +193,13 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
             if (isAnchor) {
                 String[] permissions;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    permissions=new String[]{
+                    permissions = new String[]{
                             Manifest.permission.READ_MEDIA_IMAGES,
                             Manifest.permission.CAMERA,
                             Manifest.permission.RECORD_AUDIO
                     };
-                }else{
+                } else {
-                    permissions=new String[]{
+                    permissions = new String[]{
                             Manifest.permission.READ_EXTERNAL_STORAGE,
                             Manifest.permission.WRITE_EXTERNAL_STORAGE,
                             Manifest.permission.CAMERA,
@@ -244,9 +246,9 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
                         LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
                     });
                 } else {
-                    String tips="需要下載開播插件，是否下載";
+                    String tips = "需要下載開播插件，是否下載";
-                    if(!WordUtil.isNewZh()){
+                    if (!WordUtil.isNewZh()) {
-                        tips="You need to download the plug-in, whether to download";
+                        tips = "You need to download the plug-in, whether to download";
                     }
                     DialogUitl.showSimpleDialog(mContext, tips, new DialogUitl.SimpleCallback() {
                         @Override
@@ -270,7 +272,9 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
     private Runnable mStartVideoRunnable = new Runnable() {
         @Override
         public void run() {
-            String mBeautySdkType = CommonAppConfig.getInstance().getBeautySdkType();
+            Intent intent = new Intent(mContext, CommunitySendActivity.class);
+            startActivity(intent);
+            /*String mBeautySdkType = CommonAppConfig.getInstance().getBeautySdkType();
             if ("2".equals(mBeautySdkType)) {
                 Constants.myIntoIndex = 2;
                 Intent intent = new Intent(mContext, MyWebViewActivity.class);
@@ -281,7 +285,7 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
                 Intent intent = new Intent(mContext, MyWebViewActivity.class);
                 intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
                 CommonAppContext.getTopActivity().startActivity(intent);
-            }
+            }*/
         }
     };
 

video/src/main/java/com/yunbao/video/activity/VideoPlayActivity.java

@@ -52,6 +52,7 @@ public class VideoPlayActivity extends AbsVideoPlayActivity {
         context.startActivity(intent);
     }
 
+
     public static void forwardSingle(Context context, ActiveBean videoBean) {
         if (videoBean == null) {
             return;

video/src/main/java/com/yunbao/video/views/VideoCommentViewHolder.java

@@ -16,7 +16,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
@@ -24,7 +23,6 @@ import com.alibaba.fastjson.JSON;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
-import com.yunbao.common.adapter.CommentAdapter;
 import com.yunbao.common.adapter.CommentVideoAdapter;
 import com.yunbao.common.adapter.RefreshAdapter;
 import com.yunbao.common.bean.CommentBean;
@@ -33,9 +31,6 @@ import com.yunbao.common.custom.MyLinearLayout3;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.http.live.LiveNetManager;
-import com.yunbao.common.interfaces.OnItemClickListener;
-import com.yunbao.common.interfaces.OnItemLongClickListener;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
@@ -43,8 +38,6 @@ 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;
-import com.yunbao.video.bean.VideoCommentBean;
 import com.yunbao.video.event.VideoCommentEvent;
 import com.yunbao.video.http.VideoHttpConsts;
 import com.yunbao.video.http.VideoHttpUtil;

video/src/main/java/com/yunbao/video/views/VideoPlayWrapViewHolder.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 
 import androidx.core.content.ContextCompat;
 
+import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
@@ -30,6 +31,7 @@ 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.utils.DialogUitl;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
@@ -137,6 +139,29 @@ public class VideoPlayWrapViewHolder extends AbsViewHolder implements View.OnCli
 
             }
         });
+        findViewById(R.id.btn_more).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                SparseArray<String> array = new SparseArray<>();
+                array.append(0, "举报");
+                array.append(1, "不感兴趣");
+                DialogUitl.showStringArrayDialog(mContext, array, new DialogUitl.StringArrayDialogCallback() {
+                    @Override
+                    public void onItemClick(String text, int tag) {
+                        if (tag == 0) {
+                            RouteUtil.forwardCommentReportActivity(mVideoBean.getId(), "0");
+                        } else {
+                            CommonHttpUtil.noInterest(mVideoBean.getUser_id(), new HttpCallback() {
+                                @Override
+                                public void onSuccess(int code, String msg, String[] info) {
+                                    ToastUtil.show(msg);
+                                }
+                            });
+                        }
+                    }
+                });
+            }
+        });
     }
 
     /**
@@ -392,7 +417,7 @@ public class VideoPlayWrapViewHolder extends AbsViewHolder implements View.OnCli
         } else if (i == R.id.avatar2) {
             clickAvatar();
         } else if (i == R.id.avatar) {
-
+            RouteUtil.forwardUserHome(mVideoBean.getUser_id());
         }
         /*else if (i == R.id.tv_video_report) {
             if (mVideoBean == null) {
@@ -503,8 +528,8 @@ public class VideoPlayWrapViewHolder extends AbsViewHolder implements View.OnCli
             if (!jsonArray.isEmpty()) {
                 image = jsonArray.getString(0);
             }
-        }else{
+        } else {
-            image=mVideoBean.getVideo() + "?vframe/jpg/offset/0";
+            image = mVideoBean.getVideo() + "?vframe/jpg/offset/0";
         }
         new SharePopDialog(mContext)
                 .setShareType(SharePopDialog.TYPE_VIDEO)

video/src/main/res/layout/view_video_play_wrap.xml

@@ -114,6 +114,17 @@
             android:textSize="10sp"
             android:visibility="visible" />
 
+        <ImageView
+            android:id="@+id/btn_more"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_below="@id/share_num"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="15dp"
+            android:padding="4dp"
+            android:src="@mipmap/icon_video_more"
+            android:visibility="visible" />
+
     </RelativeLayout>
 
     <LinearLayout