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

Merge branch 'dev_6.6.4_战令'

Browse Source 
# Conflicts:
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	config.gradle
This commit is contained in:
zlzw
2024-01-05 14:00:39 +08:00
parent f697e650a8 4a5e581978
commit 43d1abbae0
185 changed files with 5907 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/res/drawable/bg_battlepass_mission_btn_buy.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="65dp" android:height="30dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#EF8311" android:endColor="#FFCE47" android:angle="90" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape>
</item>
</selector>

9
main/src/main/res/drawable/bg_battlepass_mission_btn_finished.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="65dp" android:height="30dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#B94FFF" android:endColor="#ffeba7ff" android:angle="90" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape>
</item>
</selector>

9
main/src/main/res/drawable/bg_battlepass_mission_btn_over.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="65dp" android:height="30dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#D7D2FC" android:endColor="#C9D7FE" android:angle="90" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape>
</item>
</selector>

9
main/src/main/res/drawable/bg_battlepass_mission_btn_unfinished.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="65dp" android:height="30dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#9935FF" android:endColor="#ffeba7ff" android:angle="90" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape>
</item>
</selector>

9
main/src/main/res/drawable/bg_battlepass_mission_item.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="315dp" android:height="71dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ff6378ff" android:endColor="#ff6e53ff" android:angle="180" />
<corners android:topLeftRadius="6dp" android:topRightRadius="6dp" android:bottomLeftRadius="6dp" android:bottomRightRadius="6dp" />
</shape>
</item>
</selector>

9
main/src/main/res/drawable/bg_text_battlepass_mission_icon.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item >
<shape android:shape="rectangle">
<solid android:color="#FFF" />
<corners android:radius="270dp" />
</shape>
</item>
</layer-list>

15
main/src/main/res/drawable/bg_text_battlepass_reward_lv.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="27dp" android:height="16dp">
<shape android:shape="rectangle">
<solid android:color="#FFECA9" />
<corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" />
</shape>
</item>
<item android:top="0.3dp" android:bottom="0.3dp" android:left="0.3dp" android:right="0.3dp">
<shape android:shape="rectangle">
<solid android:color="#ff342524" />
<corners android:topLeftRadius="10dp" android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" />
</shape>
</item>
</layer-list>

18
main/src/main/res/drawable/bg_text_battlepass_reward_point.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item >
<shape android:shape="rectangle">
<solid android:color="#FFFCEA" />
<corners android:radius="270dp" />
</shape>
</item>
<item android:left="1.9dp"
android:right="1.9dp"
android:top="1.9dp"
android:bottom="1.9dp">
<shape android:shape="rectangle">
<solid android:color="#FFD89F" />
<corners android:radius="270dp" />
</shape>
</item>
</layer-list>

23
main/src/main/res/drawable/bg_zl_user_level_progres.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--设置ProgressBar背景色-->
<item android:id="@android:id/background">
<shape>
<!--设置ProgressBar进度条圆角半径-->
<corners android:radius="3dp" />
<solid android:color="#DFD5FC" />
</shape>
</item>
<!--设置ProgressBar进度条颜色-->
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
<shape>
<corners android:radius="3dp" />
<gradient
android:endColor="#fff"
android:startColor="#fff" />
</shape>
</scale>
</item>
</layer-list>

21
main/src/main/res/drawable/bg_zl_vp.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/background_order_dialog_out_layout">
<shape android:shape="oval" >
<corners android:radius="20dp" />
<solid android:color="#CCBEF3" />
</shape>
</item>
<item android:bottom="8dp" android:top="8dp" android:left="8dp" android:right="8dp">
<shape android:shape="rectangle">
<corners android:radius="25dp" />
<solid android:color="#6781E6" />
</shape>
</item>
<item android:bottom="15dp" android:top="15dp" android:left="15dp" android:right="15dp">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="#fff" />
</shape>
</item>
</layer-list>

97
main/src/main/res/layout/activity_battlepass.xml Normal file
View File

@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:background="#140F1F"
android:layout_height="match_parent">
<ImageView
android:id="@+id/imageView9"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@mipmap/bg_zl"
android:scaleType="fitStart"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:orientation="vertical"
android:layout_marginTop="30dp"
android:layout_marginEnd="15dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.56">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/btn_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_back"
android:onClick="backClick"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/rule"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_rule"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_marginTop="8dp"
android:orientation="horizontal"
android:layout_width="match_parent"
android:gravity="center"
android:layout_height="35dp">
<ImageView
android:id="@+id/tab_1"
android:layout_width="100dp"
android:layout_marginEnd="9.5dp"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_tab1" />
<ImageView
android:id="@+id/tab_2"
android:layout_marginEnd="9.5dp"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_tab2_unselect" />
<ImageView
android:id="@+id/tab_3"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_tab3_unselect" />
</LinearLayout>
<include
layout="@layout/view_battlepass_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp" />
<androidx.viewpager2.widget.ViewPager2
android:layout_marginTop="26dp"
android:id="@+id/context_layout"
android:layout_width="match_parent"
android:background="@drawable/background_order_dialog"
android:layout_height="match_parent" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

3
main/src/main/res/layout/activity_zhuang_ban.xml
View File

@@ -21,7 +21,6 @@
<RelativeLayout
android:layout_width="match_parent"
android:background="@color/color_b14066"
android:layout_height="match_parent">
<ProgressBar
@@ -33,7 +32,7 @@
<LinearLayout
android:id="@+id/rootView"
android:background="@drawable/backgroud_custom_drawer_popup"
android:background="#FFF"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />

2
main/src/main/res/layout/dialog_encourage.xml
View File

@@ -406,7 +406,7 @@
android:orientation="vertical"
android:visibility="visible">
<androidx.recyclerview.widget.RecyclerView
<com.yunbao.common.custom.CommonRefreshView
android:id="@+id/rc_encourage"
android:layout_width="match_parent"
android:layout_height="match_parent"

25
main/src/main/res/layout/fragment_battlepass_exchange.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="22dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:spanCount="3"
tools:listitem="@layout/item_battlepass_exchange" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:layout_marginTop="18dp"
android:layout_marginBottom="22dp"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_battlepass_mission_type_mission"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

46
main/src/main/res/layout/fragment_battlepass_reward.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginStart="45dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/tab_1"
android:layout_width="90dp"
android:layout_height="40dp"
android:src="@mipmap/ic_reward_tab_normal" />
<ImageView
android:id="@+id/tab_2"
android:layout_width="90dp"
android:layout_height="40dp"
android:src="@mipmap/ic_reward_tab_upgrade_unselect" />
<ImageView
android:id="@+id/tab_3"
android:layout_width="90dp"
android:layout_height="40dp"
android:src="@mipmap/ic_reward_tab_ultimate_unselect" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="5dp"
android:layout_marginBottom="20dp"
android:layout_weight="1"
tools:listitem="@layout/item_battlepass_reward_type_top" />
</LinearLayout>

112
main/src/main/res/layout/item_battlepass_exchange.xml Normal file
View File

@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="100dp"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tab_1_layout"
android:layout_width="73dp"
android:layout_height="75dp"
android:layout_marginTop="5dp"
android:background="@mipmap/bg_zl_battlepass_reward_item"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/tab_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_integral"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/mark_layout"
android:layout_width="66dp"
android:layout_height="23.5dp"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="@+id/tab_1"
android:background="@mipmap/bg_battlepass_reward_item_mark"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/mark_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="#FFF"
android:textSize="9sp"
android:gravity="center"
tools:text="戰令5級解鎖\n123" />
</LinearLayout>
<ImageView
android:id="@+id/indicator"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlpas_exchange_subscript"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="彩鑽之翼(92天)"
android:gravity="center"
android:layout_gravity="center"
android:textColor="#0D21B2"
android:textSize="14sp"
android:textStyle="bold"
android:maxLines="1"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tab_1_layout" />
<TextView
android:id="@+id/content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/battlepass_integral"
android:textColor="#CE2BFF"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
<Button
android:id="@+id/submit"
android:layout_width="65dp"
android:layout_height="31dp"
android:layout_marginTop="10dp"
android:autoSizeTextType="uniform"
android:textAllCaps="false"
android:background="@mipmap/bg_zl_battlepass_exchange_btn_exchange"
android:text="兌換\n(0/10)"
android:textColor="#FFF"
app:autoSizeMaxTextSize="13sp"
app:autoSizeMinTextSize="5sp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/content" />
</LinearLayout>

71
main/src/main/res/layout/item_battlepass_mission_type_mission.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/bg_battlepass_mission_item"
android:layout_width="match_parent"
android:layout_marginTop="10dp"
android:layout_height="80dp">
<ImageView
android:id="@+id/icon"
android:layout_width="49dp"
android:layout_height="49dp"
android:layout_marginStart="13dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/icon_live_record_play" />
<TextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="10dp"
android:text="每日簽到（0/1）\nnn123"
android:textColor="#F2F9FF"
android:textStyle="bold"
app:autoSizeMaxTextSize="14sp"
app:autoSizeMinTextSize="5sp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform"
android:maxLines="2"
app:layout_constraintEnd_toStartOf="@+id/submit"
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/content"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:text="獎勵100經驗值/次\n123"
android:textColor="#F2F9FF"
android:textSize="12sp"
app:autoSizeMaxTextSize="14sp"
app:autoSizeMinTextSize="5sp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform"
android:maxLines="2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/submit"
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toBottomOf="@+id/title" />
<Button
android:id="@+id/submit"
android:layout_width="65dp"
android:layout_height="30dp"
android:layout_marginEnd="12dp"
android:text="@string/battlepass_mission_submit_btn_unfinished"
android:textAllCaps="false"
android:textColor="#FFFFFF"
android:background="@drawable/bg_battlepass_mission_btn_unfinished"
android:textSize="14sp"
android:stateListAnimator="@null"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

20
main/src/main/res/layout/item_battlepass_mission_type_title.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/battlepass_mission_line_title_daily"
android:textColor="#0D21B2"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

274
main/src/main/res/layout/item_battlepass_reward_type_top.xml Normal file
View File

@@ -0,0 +1,274 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="130dp">
<View
android:id="@+id/line_bg"
android:layout_width="6dp"
android:layout_height="match_parent"
android:background="#8D8E9C"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/reward_lv"
app:layout_constraintStart_toStartOf="@+id/reward_lv"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/line"
android:layout_width="2dp"
android:layout_height="match_parent"
android:background="#FFAC5D"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/line_bg"
app:layout_constraintStart_toStartOf="@+id/line_bg"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/reward_lv"
android:layout_width="27dp"
android:layout_height="16dp"
android:layout_marginStart="8dp"
android:layout_marginTop="3dp"
android:background="@drawable/bg_text_battlepass_reward_lv"
android:text="v1"
android:textColor="#FFECA9"
android:textSize="11sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/point"
android:layout_width="7dp"
android:layout_height="7dp"
android:layout_marginBottom="70dp"
android:background="@drawable/bg_text_battlepass_reward_point"
app:layout_constraintEnd_toEndOf="@+id/reward_lv"
app:layout_constraintStart_toStartOf="@+id/reward_lv"
app:layout_constraintBottom_toBottomOf="parent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="horizontal"
app:layout_constraintStart_toEndOf="@+id/reward_lv"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tab_1_layout"
android:layout_width="73dp"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp">
<ImageView
android:id="@+id/tab_1_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@mipmap/bg_zl_battlepass_reward_item"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tab_1"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/ic_integral"
app:layout_constraintBottom_toBottomOf="@id/tab_1_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_1_bg" />
<ImageView
android:id="@+id/tab_1_unlock"
android:layout_width="match_parent"
android:layout_height="0dp"
android:src="@mipmap/bg_zl_battlepass_reward_item_unlock"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_1_bg" />
<ImageView
android:id="@+id/tab_1_item_unlock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlepass_reward_item_unlock"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tab_1_bg"
app:layout_constraintEnd_toEndOf="@id/tab_1_bg" />
<ImageView
android:id="@+id/tab_1_item_received"
android:layout_width="49.5dp"
android:layout_height="17dp"
android:src="@mipmap/ic_zl_battlepass_reward_item_received"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/tab_1_bg"
app:layout_constraintEnd_toEndOf="@id/tab_1_bg" />
<ImageView
android:id="@+id/tab_1_subscript"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlpas_exchange_subscript"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tab_1_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="甜蜜氣球\n&amp;積分30"
android:textColor="#0D21B2"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tab_1_bg" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tab_2_layout"
android:layout_width="73dp"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp">
<ImageView
android:id="@+id/tab_2_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@mipmap/bg_zl_battlepass_reward_item"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tab_2"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/ic_integral"
app:layout_constraintBottom_toBottomOf="@id/tab_2_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_2_bg" />
<ImageView
android:id="@+id/tab_2_unlock"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@mipmap/bg_zl_battlepass_reward_item_unlock"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_2_bg" />
<ImageView
android:id="@+id/tab_2_item_unlock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlepass_reward_item_unlock"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/tab_2_bg"
app:layout_constraintEnd_toEndOf="@id/tab_2_bg" />
<ImageView
android:id="@+id/tab_2_item_received"
android:layout_width="49.5dp"
android:layout_height="17dp"
android:src="@mipmap/ic_zl_battlepass_reward_item_received"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/tab_2_bg"
app:layout_constraintEnd_toEndOf="@id/tab_2_bg" />
<ImageView
android:id="@+id/tab_2_subscript"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlpas_exchange_subscript2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tab_2_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="甜蜜氣球\n&amp;積分30"
android:textColor="#0D21B2"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tab_2_bg" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tab_3_layout"
android:layout_width="73dp"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/tab_3_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@mipmap/bg_zl_battlepass_reward_item"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tab_3"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/ic_integral"
app:layout_constraintBottom_toBottomOf="@id/tab_3_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_3_bg" />
<ImageView
android:id="@+id/tab_3_unlock"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@mipmap/bg_zl_battlepass_reward_item_unlock"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tab_3_item_unlock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlepass_reward_item_unlock"
app:layout_constraintBottom_toBottomOf="@id/tab_3_bg"
app:layout_constraintEnd_toEndOf="@id/tab_3_bg" />
<ImageView
android:id="@+id/tab_3_item_received"
android:layout_width="49.5dp"
android:layout_height="17dp"
android:layout_marginBottom="5dp"
android:src="@mipmap/ic_zl_battlepass_reward_item_received"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/tab_3_bg"
app:layout_constraintEnd_toEndOf="@id/tab_3_bg" />
<ImageView
android:id="@+id/tab_3_subscript"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlpas_exchange_subscript"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tab_3_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="甜蜜氣球\n&amp;積分30"
android:textColor="#0D21B2"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tab_3_bg" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

57
main/src/main/res/layout/item_search.xml
View File

@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<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="60dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
>
android:paddingRight="15dp">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
@@ -15,8 +13,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:scaleType="centerCrop"
app:riv_oval="true"
/>
app:riv_oval="true" />
<TextView
android:id="@+id/name"
@@ -28,8 +25,7 @@
android:maxWidth="130dp"
android:singleLine="true"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
android:textSize="16sp" />
<TextView
android:id="@+id/sign"
@@ -41,17 +37,16 @@
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/gray3"
android:textSize="14sp"
/>
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/name"
android:layout_alignTop="@id/name"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_toRightOf="@id/name"
android:orientation="horizontal">
<ImageView
@@ -59,18 +54,34 @@
android:layout_width="18dp"
android:layout_height="15dp" />
<ImageView
android:id="@+id/level_anchor"
<FrameLayout
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_marginLeft="5dp"/>
android:layout_marginStart="5dp"
android:layout_height="15dp">
<ImageView
android:id="@+id/level_anchor"
android:layout_width="30dp"
android:layout_height="15dp" />
<TextView
android:id="@+id/leave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="13dp"
android:textColor="@color/white"
android:textSize="8sp"
android:textStyle="bold" />
</FrameLayout>
<ImageView
android:id="@+id/level"
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_marginLeft="5dp"
/>
android:layout_marginLeft="5dp" />
</LinearLayout>
@@ -86,23 +97,21 @@
android:gravity="center"
android:textColor="@color/fg_btn_follow"
android:textSize="11sp"
android:visibility="gone"
/>
android:visibility="gone" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_live"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:visibility="gone"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@mipmap/icon_user_home_living"/>
android:adjustViewBounds="true"
android:src="@mipmap/icon_user_home_living"
android:visibility="gone" />
<View
style="@style/line2"
android:layout_alignParentBottom="true"
/>
android:layout_alignParentBottom="true" />
</RelativeLayout>

143
main/src/main/res/layout/view_battlepass_user.xml Normal file
View File

@@ -0,0 +1,143 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="210dp">
<LinearLayout
android:orientation="vertical"
android:background="@mipmap/bg_zl_user_top"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/session"
android:text="@string/battlepass_user_session"
android:textColor="#40227D"
android:textSize="20sp"
android:layout_marginTop="8dp"
android:layout_marginEnd="17dp"
android:layout_gravity="end"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/imageView10"
android:layout_width="110dp"
android:layout_height="28dp"
android:layout_marginStart="15.5dp"
android:src="@mipmap/zl_user_pass" />
<TextView
android:id="@+id/time"
android:layout_marginTop="11.5dp"
android:layout_marginStart="15dp"
android:text="@string/battlepass_user_time"
android:textColor="#442787"
android:textSize="14sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/userLevel"
android:layout_marginTop="11.5dp"
android:textStyle="bold"
android:layout_marginStart="15dp"
android:text="@string/battlepass_user_level"
android:textColor="#442787"
android:textSize="14sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout
android:orientation="horizontal"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/level"
android:textStyle="bold"
android:text="Lv.1"
android:textColor="#442787"
android:textSize="14sp"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_marginEnd="6dp"
android:layout_height="wrap_content"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="14dp"
android:layout_weight="1"
android:layout_gravity="center"
>
<ProgressBar
android:id="@+id/level_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="7dp"
android:layout_gravity="center"
android:layout_marginStart="1dp"
android:layout_weight="1"
android:progressDrawable="@drawable/bg_zl_user_level_progres"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/exp_text"
tools:text="100/2500"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:textColor="#41048F"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_marginTop="-60dp"
android:orientation="horizontal"
android:background="@mipmap/bg_zl_user_bottom"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
android:gravity="center_vertical"
android:layout_weight="1"
android:layout_height="wrap_content">
<TextView
android:id="@+id/integral"
android:textStyle="bold"
android:text="@string/battlepass_user_my_integral"
android:textColor="#442787"
android:textSize="14sp"
android:layout_marginEnd="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:src="@mipmap/ic_integral"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<Button
android:id="@+id/more_integral"
android:layout_width="94dp"
android:layout_height="31dp"
android:layout_marginEnd="15dp"
android:textAllCaps="false"
android:background="@mipmap/bg_zl_user_button"
android:text="@string/battlepass_user_more_integral"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>

199
main/src/main/res/layout/view_live_user_home.xml
View File

@@ -1,28 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/white"
>
android:background="@color/white">
<FrameLayout
android:id="@+id/bottom"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_alignParentBottom="true"
>
android:layout_alignParentBottom="true">
<View
style="@style/line2"
/>
<View style="@style/line2" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:id="@+id/btn_follow_2"
@@ -33,16 +27,14 @@
android:text="@string/follow"
android:textColor="@color/textColor2"
android:textSize="15sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@color/gray2"
/>
android:layout_marginBottom="10dp"
android:background="@color/gray2" />
<TextView
android:id="@+id/btn_pri_msg"
@@ -53,16 +45,14 @@
android:text="@string/pri_msg"
android:textColor="@color/textColor2"
android:textSize="15sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@color/gray2"
/>
android:layout_marginBottom="10dp"
android:background="@color/gray2" />
<TextView
android:id="@+id/btn_black"
@@ -73,8 +63,7 @@
android:text="@string/black"
android:textColor="@color/textColor2"
android:textSize="15sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
</LinearLayout>
</FrameLayout>
@@ -82,8 +71,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/bottom"
>
android:layout_above="@id/bottom">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
@@ -92,45 +80,39 @@
android:background="@color/transparent"
android:fadingEdge="none"
app:elevation="0dp"
app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior"
>
app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="65dp"
android:orientation="vertical"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
>
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="220dp"
>
android:layout_height="220dp">
<ImageView
android:id="@+id/bg_avatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
/>
android:scaleType="centerCrop" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#b3000000"
/>
android:background="#b3000000" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="20dp"
android:layout_marginTop="70dp"
android:layout_marginRight="20dp"
android:scaleType="centerCrop"
app:riv_oval="true"
/>
app:riv_oval="true" />
<TextView
android:id="@+id/name"
@@ -140,35 +122,48 @@
android:layout_toRightOf="@id/avatar"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<ImageView
android:id="@+id/sex"
android:layout_width="18dp"
android:layout_height="15dp"
android:layout_below="@id/name"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:layout_toRightOf="@id/avatar"
/>
android:layout_marginRight="5dp"
android:layout_toRightOf="@id/avatar" />
<ImageView
android:id="@+id/level_anchor"
android:layout_width="30dp"
android:layout_height="15dp"
<FrameLayout
android:layout_width="55dp"
android:layout_height="19dp"
android:layout_alignTop="@id/sex"
android:layout_marginRight="5dp"
android:layout_toRightOf="@id/sex"
/>
android:layout_toRightOf="@id/sex">
<ImageView
android:id="@+id/level_anchor"
android:layout_width="55dp"
android:layout_height="19dp" />
<TextView
android:id="@+id/leave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="28dp"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold" />
</FrameLayout>
<ImageView
android:id="@+id/level"
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_alignTop="@id/sex"
android:layout_toRightOf="@id/level_anchor"
/>
android:layout_toRightOf="@id/level_anchor" />
<TextView
android:id="@+id/id_val"
@@ -178,8 +173,7 @@
android:layout_marginTop="5dp"
android:layout_toRightOf="@id/avatar"
android:textColor="@color/white"
android:textSize="14sp"
/>
android:textSize="14sp" />
<TextView
android:id="@+id/btn_fans"
@@ -189,21 +183,19 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="15dp"
android:textColor="@color/white"
android:textSize="14sp"
/>
android:textSize="14sp" />
<View
android:id="@+id/line"
android:layout_width="1dp"
android:layout_height="12dp"
android:layout_alignTop="@id/btn_fans"
android:layout_below="@id/avatar"
android:layout_alignTop="@id/btn_fans"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="3dp"
android:layout_marginRight="15dp"
android:layout_toRightOf="@id/btn_fans"
android:background="@color/white"
/>
android:background="@color/white" />
<TextView
android:id="@+id/btn_follow"
@@ -212,8 +204,7 @@
android:layout_alignTop="@id/btn_fans"
android:layout_toRightOf="@id/line"
android:textColor="@color/white"
android:textSize="14sp"
/>
android:textSize="14sp" />
<TextView
android:id="@+id/sign"
@@ -221,38 +212,34 @@
android:layout_height="wrap_content"
android:layout_below="@id/btn_fans"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="12dp"
android:layout_marginRight="15dp"
android:singleLine="true"
android:textColor="#fff"
android:textSize="14sp"
/>
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:text="@string/impress"
android:textColor="@color/textColor2"
android:textSize="15dp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="34dp"
android:layout_marginLeft="15dp"
>
android:layout_marginLeft="15dp">
<LinearLayout
android:id="@+id/impress_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
/>
android:orientation="horizontal" />
<TextView
android:id="@+id/no_impress_tip"
@@ -262,16 +249,14 @@
android:text="@string/impress_tip_3"
android:textColor="@color/gray3"
android:textSize="14sp"
android:visibility="invisible"
/>
android:visibility="invisible" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginTop="5dp"
android:background="@color/gray2"
/>
android:background="@color/gray2" />
<LinearLayout
android:id="@+id/con_group_wrap"
@@ -280,14 +265,12 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp"
>
android:paddingRight="15dp">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@mipmap/icon_live_user_home_1"
/>
android:src="@mipmap/icon_live_user_home_1" />
<TextView
android:id="@+id/votes_name"
@@ -295,8 +278,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:textSize="15sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<LinearLayout
@@ -307,21 +289,17 @@
android:layout_marginRight="10dp"
android:layout_weight="1"
android:gravity="right"
android:orientation="horizontal"
/>
android:orientation="horizontal" />
<ImageView
android:layout_width="16dp"
android:layout_height="18dp"
android:src="@mipmap/icon_arrow_right"
/>
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<View
style="@style/line2"
/>
<View style="@style/line2" />
<LinearLayout
android:id="@+id/guard_group_wrap"
@@ -330,14 +308,12 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp"
>
android:paddingRight="15dp">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@mipmap/icon_live_user_home_2"
/>
android:src="@mipmap/icon_live_user_home_2" />
<TextView
android:layout_width="wrap_content"
@@ -345,8 +321,7 @@
android:layout_marginLeft="8dp"
android:text="@string/guard_list"
android:textSize="15sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<LinearLayout
android:id="@+id/guard_group"
@@ -356,14 +331,12 @@
android:layout_marginRight="10dp"
android:layout_weight="1"
android:gravity="right"
android:orientation="horizontal"
/>
android:orientation="horizontal" />
<ImageView
android:layout_width="16dp"
android:layout_height="18dp"
android:src="@mipmap/icon_arrow_right"
/>
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
@@ -372,14 +345,12 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@color/gray2"
/>
android:background="@color/gray2" />
<net.lucode.hackware.magicindicator.MagicIndicator
@@ -387,13 +358,10 @@
android:layout_width="wrap_content"
android:layout_height="33dp"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
/>
android:layout_marginBottom="5dp" />
<View
style="@style/line2"
/>
<View style="@style/line2" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
@@ -403,8 +371,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
/>
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -412,8 +379,7 @@
android:id="@+id/top"
android:layout_width="match_parent"
android:layout_height="65dp"
android:clickable="true"
>
android:clickable="true">
<TextView
android:id="@+id/titleView"
@@ -425,8 +391,7 @@
android:paddingTop="30dp"
android:textColor="@color/textColor"
android:textSize="18sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<ImageView
android:id="@+id/btn_back"
@@ -436,20 +401,18 @@
android:layout_marginBottom="3dp"
android:padding="9dp"
android:src="@mipmap/icon_back"
android:tint="@color/white"
/>
android:tint="@color/white" />
<ImageView
android:id="@+id/btn_share"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="3dp"
android:padding="8dp"
android:src="@mipmap/icon_user_home_share"
android:tint="@color/white"
/>
android:tint="@color/white" />
</RelativeLayout>
</RelativeLayout>

25
main/src/main/res/layout/view_live_user_home_2.xml
View File

@@ -219,10 +219,27 @@
android:gravity="bottom"
android:orientation="horizontal">
<ImageView
android:id="@+id/level_anchor"
android:layout_width="30dp"
android:layout_height="15dp" />
<FrameLayout
android:layout_width="55dp"
android:layout_height="19dp">
<ImageView
android:id="@+id/level_anchor"
android:layout_width="55dp"
android:layout_height="19dp" />
<TextView
android:id="@+id/leave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="28dp"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold" />
</FrameLayout>
<ImageView
android:id="@+id/level"

12
main/src/main/res/layout/view_main_encourage.xml
View File

@@ -18,11 +18,11 @@
android:layout_height="3dp"
android:progressDrawable="@drawable/bg_horizontal_progressbar" />
<!-- <Button-->
<!-- android:id="@+id/native_callback"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="nativeCallback" />-->
<Button
android:id="@+id/native_callback"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="nativeCallback" />
</RelativeLayout>

28
main/src/main/res/layout/view_main_me1.xml
View File

@@ -126,12 +126,30 @@
android:layout_height="15dp"
android:src="@mipmap/icon_userlv" />
<ImageView
android:id="@+id/level_anchor"
android:layout_width="30dp"
android:layout_height="15dp"
<FrameLayout
android:id="@+id/level_anchor_la"
android:layout_width="55dp"
android:layout_height="19dp"
android:layout_marginLeft="5dp"
android:visibility="gone" />
android:visibility="gone">
<ImageView
android:id="@+id/level_anchor"
android:layout_width="55dp"
android:layout_height="19dp" />
<TextView
android:id="@+id/leave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="28dp"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold" />
</FrameLayout>
<ImageView
android:id="@+id/level"

BIN
main/src/main/res/mipmap-b+en+us/ic_reward_tab_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_zl_battlepass_reward_item_received.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_zl_tab1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_zl_tab1_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_zl_tab2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_zl_tab2_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_zl_tab3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
main/src/main/res/mipmap-b+en+us/ic_zl_tab3_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
main/src/main/res/mipmap-b+en+us/zl_user_pass.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_battlepass_reward_item_mark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 719 B

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_battlepass_exchange_btn_exchange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_battlepass_exchange_btn_lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_battlepass_exchange_btn_over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_battlepass_exchange_item2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_battlepass_reward_item.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_battlepass_reward_item_unlock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_user_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_user_button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
main/src/main/res/mipmap-xxhdpi/bg_zl_user_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_reward_tab_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_battlepass_reward_item_received.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_battlepass_reward_item_unlock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_battlpas_exchange_subscript.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_battlpas_exchange_subscript2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_rule.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_tab1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_tab1_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_tab2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_tab2_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_tab3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_tab3_unselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
main/src/main/res/mipmap-xxhdpi/zl_user_pass.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
main/src/main/res/mipmap-xxxhdpi/bg_zl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 440 KiB

22
main/src/main/res/values-zh/strings.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="battlepass_user_session">Session 1</string>
<string name="battlepass_user_time">活動時間：</string>
<string name="battlepass_user_level">我的等級：</string>
<string name="battlepass_user_level_max">等級已滿</string>
<string name="battlepass_user_my_integral">我的積分：%s</string>
<string name="battlepass_user_more_integral">更多積分</string>
<string name="battlepass_integral">%s積分</string>
<string name="battlepass_mission_submit_btn_unfinished">未完成</string>
<string name="battlepass_mission_submit_btn_finished">領取</string>
<string name="battlepass_mission_submit_btn_over">已領取</string>
<string name="battlepass_mission_submit_btn_buy">購買</string>
<string name="battlepass_mission_line_title_daily">每日任務</string>
<string name="battlepass_mission_line_title_season">每期任務</string>
<string name="battlepass_exchange_submit_unexchange">兌換</string>
<string name="battlepass_exchange_submit_exchange">已兌換</string>
<string name="battlepass_exchange_submit_lock">未解鎖</string>
<string name="battlepass_reward_item_lock">暫未達到等級</string>
<string name="battlepass_reward_item_get">領取成功</string>
</resources>

23
main/src/main/res/values/strings.xml
View File

@@ -1 +1,22 @@
<resources></resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="battlepass_user_session">Session 1</string>
<string name="battlepass_user_time">Activity time:</string>
<string name="battlepass_user_level">My level:</string>
<string name="battlepass_user_level_max">Experience full</string>
<string name="battlepass_user_my_integral">My points：%s</string>
<string name="battlepass_user_more_integral">More points</string>
<string name="battlepass_integral">points</string>
<string name="battlepass_mission_submit_btn_unfinished">Undone</string>
<string name="battlepass_mission_submit_btn_finished">Receive</string>
<string name="battlepass_mission_submit_btn_over">Received</string>
<string name="battlepass_mission_submit_btn_buy">Buy</string>
<string name="battlepass_mission_line_title_daily">Daily tasks</string>
<string name="battlepass_mission_line_title_season">Season tasks</string>
<string name="battlepass_exchange_submit_unexchange">exchange</string>
<string name="battlepass_exchange_submit_exchange">Redeemed</string>
<string name="battlepass_exchange_submit_lock">Unlocked</string>
<string name="battlepass_reward_item_lock">Not yet reached level</string>
<string name="battlepass_reward_item_get">Successfully claimed</string>
</resources>