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-03 13:45:28 +08:00
parent 260a6b91f3 04bc9af501
commit 47a3ba6b78
28 changed files with 469 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/res/layout/activity_community_send.xml
View File

@@ -72,10 +72,11 @@
android:layout_marginBottom="20dp"
android:visibility="gone">
<VideoView
<ImageView
android:id="@+id/videoView"
android:layout_width="200dp"
android:layout_height="200dp" />
android:layout_height="200dp"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/delVideo"

22
common/src/main/res/layout/activity_google_play.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<VideoView
android:id="@+id/videoPlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<ImageView
android:id="@+id/back"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="30dp"
android:padding="10dp"
android:src="@mipmap/icon_left" />
</RelativeLayout>

47
common/src/main/res/layout/activity_user_home.xml
View File

@@ -282,15 +282,50 @@
android:layout_height="20dp"
android:src="@mipmap/icon_wumen" />
<ImageView
android:id="@+id/authorlIcon"
<RelativeLayout
android:id="@+id/authorIconLayout"
android:layout_width="50dp"
android:layout_height="20dp" />
android:layout_height="20dp"
android:layout_marginLeft="10dp">
<ImageView
android:id="@+id/levelIcon"
<ImageView
android:id="@+id/authorlIcon"
android:layout_width="50dp"
android:layout_height="20dp" />
<TextView
android:id="@+id/authorlNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="25dp"
android:text="1"
android:textColor="@color/white"
android:textSize="11dp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/levelIconLayout"
android:layout_width="50dp"
android:layout_height="20dp" />
android:layout_height="20dp"
android:layout_marginLeft="10dp">
<ImageView
android:id="@+id/levelIcon"
android:layout_width="50dp"
android:layout_height="20dp" />
<TextView
android:id="@+id/levelNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="25dp"
android:text="1"
android:textColor="@color/white"
android:textSize="11dp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/userPresidentLayout"