修复跳转

2024-03-21 16:02:31 +08:00 · 2024-03-21 16:02:31 +08:00 · 94d05a3929
commit 94d05a3929
parent 1c74689e90
6 changed files with 37 additions and 18 deletions
--- a/common/src/main/java/com/yunbao/common/adapter/CommentAdapter.java
+++ b/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) {
--- a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java
+++ b/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();
    }
 }
--- a/common/src/main/res/layout/activity_user_home.xml
+++ b/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
--- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
+++ b/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);
-                        itemLayout02.setVisibility(View.GONE);
+                        itemLayout03.setVisibility(View.VISIBLE);
+                        itemLayout04.setVisibility(View.VISIBLE);
                    }
                    moreText.setText("收起");
                    ImgLoader.display(mContext, R.mipmap.icon_up, moreIcon);
--- a/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
+++ b/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{
-                    permissions=new String[]{
+                } else {
+                    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{
-                    permissions=new String[]{
+                } else {
+                    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="需要下載開播插件，是否下載";
-                    if(!WordUtil.isNewZh()){
-                        tips="You need to download the plug-in, whether to download";
+                    String tips = "需要下載開播插件，是否下載";
+                    if (!WordUtil.isNewZh()) {
+                        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);
-            }
+            }*/
        }
    };

--- a/video/src/main/java/com/yunbao/video/activity/VideoPlayActivity.java
+++ b/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;