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

Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

Browse Source
This commit is contained in:
zlzw
2024-04-01 10:47:27 +08:00
parent 51ab918327 10ea7d9735
commit 962a07d6d1
7 changed files with 221 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@@ -57,6 +57,15 @@ public class RouteUtil {
public static final String PATH_USER_HOME = "/main/UserHomeActivity";
public static final String PATH_VIDEO_PLAY = "/video/VideoPlayActivity";
public static final String PATH_VIDEO_NEW_PLAY = "/video/VideoPlayNewActivity";
/* public static void forwardVideoPlayActivity(ActiveBean bean) {
ARouter.getInstance().build(PATH_VIDEO_PLAY)
.withParcelable("ActiveBean", bean)
.withString(Constants.VIDEO_KEY, Constants.VIDEO_SINGLE)
.navigation();
}*/
public static void forwardUserHome(String uid) {
ARouter.getInstance().build(PATH_USER_HOME)
.withString(Constants.TO_UID, uid)
@@ -408,4 +417,5 @@ public class RouteUtil {
.withString(Constants.VIDEO_KEY, Constants.VIDEO_SINGLE)
.navigation();
}
}

14
common/src/main/res/layout/item_comment_video_view.xml
View File

@@ -4,9 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/bg_item_comment"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
tools:ignore="MissingDefaultResource">
@@ -14,12 +17,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@mipmap/icon_data_empty"
app:riv_oval="true" />
@@ -73,7 +77,6 @@
android:id="@+id/del"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
android:text="@string/delete"
android:textColor="#777777"
@@ -84,7 +87,6 @@
android:id="@+id/replyTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
android:text="@string/reply"
android:textColor="#777777"
@@ -94,7 +96,6 @@
android:id="@+id/report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:padding="10dp"
android:text="@string/report"
@@ -109,7 +110,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="50dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/bg_item_comment"
android:orientation="vertical"