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

Merge branch 'dev_6.6.6_开通守护'

Browse Source
This commit is contained in:
18401019693
2024-03-27 09:44:56 +08:00
parent 9db23a32d1 5f1eadc47b
commit a61bc8fbb8
177 changed files with 7771 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,6 +286,18 @@
</com.xj.marqueeview.MarqueeView>
<ImageView
android:id="@+id/dragon_money"
android:layout_width="25dp"
android:layout_height="30dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="25dp"
android:layout_marginTop="55dp"
android:visibility="gone"
app:srcCompat="@mipmap/icon_live_dragon_money"
tools:visibility="visible" />
<ImageView
android:id="@+id/red_packet"
android:layout_width="30dp"

194
main/src/main/res/layout/view_main_me.xml
View File

@@ -495,77 +495,151 @@
</LinearLayout>
<LinearLayout
android:id="@+id/lt_noble"
android:layout_width="match_parent"
android:layout_height="81dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="12dp"
android:layout_marginRight="15dp"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center">
<ImageView
android:id="@+id/user_noble_ico"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginLeft="21dp"
android:src="@mipmap/icon_vip_gold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
<FrameLayout
android:id="@+id/lt_noble"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="12dp"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center|left"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/user_noble_text"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/textColor"
android:textSize="16sp"
android:textStyle="bold" />
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<TextView
android:id="@+id/user_noble_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="@string/open_noble_text"
android:textColor="@color/gray1"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:id="@+id/user_noble_ico"
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_vip_gold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:id="@+id/user_noble_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text=""
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/user_noble_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/open_noble_text"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
<View
android:id="@+id/v_noble"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="30dp"
android:background="@mipmap/icon_more_gray"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:visibility="gone" />
</FrameLayout>
<View
android:id="@+id/v_noble"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="30dp"
android:background="@mipmap/icon_more_gray"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false" />
android:layout_height="1dp" />
<FrameLayout
android:id="@+id/lt_guard"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginTop="12dp"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<ImageView
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_guard_me" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/live_guard"
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/guard_for_your_beloved_one"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

BIN
main/src/main/res/mipmap-mdpi/icon_vip_gold.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 23 KiB