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

Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2024-07-13 09:29:11 +08:00
parent 845b217c4d 7edd75e223
commit 9292e6f5c5
51 changed files with 1048 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
common/src/main/res/layout/dialog_gift_wall_achieve.xml Normal file
View File

@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_root_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve" />
<ImageView
android:id="@+id/iv_back"
android:layout_width="50dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@mipmap/dialog_gift_wall_back" />
<TextView
android:text="@string/gift_wall_achieve_title"
android:layout_width="match_parent"
android:textSize="20sp"
android:textColor="@color/white"
android:gravity="center"
android:textStyle="bold"
android:layout_height="60dp" />
<LinearLayout
android:id="@+id/topLayout"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_below="@+id/iv_back"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:background="@mipmap/dialog_gift_wall_achieve_top_bg"
android:layout_height="48dp">
<ImageView
android:layout_marginLeft="10dp"
android:src="@mipmap/dialog_gift_wall_achieve_top_icon"
android:layout_width="wrap_content"
android:layout_height="16dp"/>
<TextView
android:id="@+id/numCount"
android:gravity="start|center_vertical"
android:text="0/1"
android:layout_marginLeft="5dp"
android:textColor="#FDE9D8"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"/>
<TextView
android:text="@string/wall_honor"
android:textColor="#E0E0E0"
android:textSize="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:src="@mipmap/dialog_gift_wall_more"
android:layout_marginRight="7dp"
android:layout_width="13dp"
android:layout_height="13dp"/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_marginTop="15dp"
android:layout_width="match_parent"
android:layout_below="@+id/topLayout"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_height="wrap_content"/>
</RelativeLayout>

99
common/src/main/res/layout/dialog_gift_wall_achieve_wear.xml Normal file
View File

@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="264dp"
android:layout_height="240dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:background="@mipmap/dialog_gift_wall_achieve_wear_bg">
<ImageView
android:id="@+id/btn_cancel"
android:layout_width="40dp"
android:padding="12dp"
android:layout_marginTop="5dp"
android:layout_height="40dp"
android:layout_marginEnd="5dp"
android:layout_alignParentEnd="true"
android:src="@mipmap/dialog_gift_wall_achieve_wear_cancel" />
<com.flyjingfish.gradienttextviewlib.GradientTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
android:letterSpacing="0.1"
android:text="@string/achievement_details"
android:textSize="16dp"
app:gradient_angle="45"
app:gradient_endColor="#FEE8C6"
app:gradient_startColor="#FFD5A3" />
<com.stx.xhb.androidx.XBanner
android:id="@+id/gift_wall_achieve_banner"
android:layout_width="264dp"
android:layout_height="80dp"
android:layout_marginTop="63dp"
app:clipChildrenLeftMargin="100dp"
app:clipChildrenRightMargin="100dp"
app:isAutoPlay="false"
app:isClipChildrenMode="true"
app:isClipChildrenModeLessThree="true"
app:isHandLoop="false"
app:isShowIndicatorOnlyOne="true"
app:isShowNumberIndicator="false"
app:pageChangeDuration="800"
app:pointsVisibility="false"
app:showIndicatorInCenter="false"
app:viewpagerMargin="20dp" />
<TextView
android:id="@+id/text_achieve_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/gift_wall_achieve_banner"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="成就名稱"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/text_achieve_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/text_achieve_name"
android:layout_centerHorizontal="true"
android:layout_marginLeft="30dp"
android:layout_marginTop="5dp"
android:layout_marginRight="30dp"
android:gravity="center"
android:text="達成要求達成要求達成要求達成要求達成要求達成要求"
android:textColor="#C7C7C7"
android:textSize="8sp" />
<TextView
android:id="@+id/btn_confirm"
android:layout_width="78dp"
android:layout_height="29dp"
android:layout_below="@+id/text_achieve_hint"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:layout_marginBottom="16dp"
android:background="@drawable/gift_wall_achieve_wear_disable"
android:gravity="center"
android:text="@string/gift_wall_achieve_put_on"
android:textColor="#2D1F46"
android:textSize="12sp" />
</RelativeLayout>
</RelativeLayout>

37
common/src/main/res/layout/dialog_gift_wall_achieve_wear_item.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="120dp"
android:layout_height="80dp"
android:orientation="vertical">
<ImageView
android:id="@+id/bg"
android:layout_width="57dp"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve_wear_item_bg" />
<ImageView
android:id="@+id/wearImg"
android:layout_width="57dp"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve_wear_item_bg" />
<ImageView
android:id="@+id/notUnlocked"
android:layout_width="57dp"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve_wear_item_unlock" />
</RelativeLayout>

45
common/src/main/res/layout/dialog_gift_wall_rule.xml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_root_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve" />
<ImageView
android:id="@+id/iv_back"
android:layout_width="50dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@mipmap/dialog_gift_wall_back" />
<TextView
android:text="@string/regular_bubble"
android:layout_width="match_parent"
android:textSize="20sp"
android:textColor="@color/white"
android:gravity="center"
android:textStyle="bold"
android:layout_height="60dp" />
<ScrollView
android:layout_below="@+id/iv_back"
android:layout_width="match_parent"
android:scrollbars="vertical"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_rule"
android:padding="10dp"
android:layout_width="match_parent"
android:scaleType="fitXY"
android:layout_height="match_parent"/>
</ScrollView>
</RelativeLayout>

23
common/src/main/res/layout/view_gift_wall_achieve_item.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:gravity="center"
android:orientation="vertical"
android:layout_height="110dp">
<ImageView
android:id="@+id/achieve_img"
android:layout_width="wrap_content"
android:layout_height="90dp"/>
<TextView
android:id="@+id/achieveName"
android:layout_width="wrap_content"
android:layout_height="26dp"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:textColor="#FFFFFF"
android:textSize="12sp" />
</LinearLayout>