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)
-                .withString(Constants.VIDEO_KEY,Constants.VIDEO_SINGLE)
+                .withParcelable("ActiveBean", bean)
+                .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