moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]更新版本号和寻爱逻辑修改

Browse Source
This commit is contained in:
wushaocheng
2023-09-20 17:17:50 +08:00
committed by wzq
parent 009518f019
commit 4c3b9fdcaf
6 changed files with 115 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/src/main/res/layout/item_room_recommend.xml
View File

@@ -43,6 +43,60 @@
app:layout_constraintTop_toTopOf="@+id/iv_room_image"
tools:src="@drawable/tag_101" />
<FrameLayout
android:id="@+id/fl_avatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
app:layout_constraintBottom_toTopOf="@+id/tv_room_title"
app:layout_constraintStart_toStartOf="@+id/iv_room_image">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar_0"
android:layout_width="22dp"
android:layout_height="22dp"
android:src="@drawable/default_avatar"
app:cborder_color="@color/white"
app:cborder_width="1px" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar_1"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="18dp"
android:src="@drawable/default_avatar"
app:cborder_color="@color/white"
app:cborder_width="1px" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar_2"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="36dp"
android:src="@drawable/default_avatar"
app:cborder_color="@color/white"
app:cborder_width="1px" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar_3"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="54dp"
android:src="@drawable/default_avatar"
app:cborder_color="@color/white"
app:cborder_width="1px" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar_4"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="72dp"
android:src="@drawable/default_avatar"
app:cborder_color="@color/white"
app:cborder_width="1px" />
</FrameLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_room_title"
android:layout_width="0dp"
@@ -53,25 +107,33 @@
android:textSize="@dimen/sp_14"
android:textStyle="bold"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
app:layout_constraintStart_toStartOf="@id/iv_room_image"
app:layout_constraintEnd_toStartOf="@+id/tv_online_number"
app:layout_constraintBottom_toBottomOf="@+id/tv_online_number"
app:layout_constraintEnd_toStartOf="@+id/svga_living"
app:layout_constraintBottom_toBottomOf="@+id/iv_room_image"
tools:text="@string/layout_item_room_common_02" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/svga_living"
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_2"
app:layout_constraintTop_toTopOf="@+id/tv_online_number"
app:layout_constraintBottom_toBottomOf="@+id/tv_online_number"
app:layout_constraintEnd_toStartOf="@+id/tv_online_number"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_online_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"
android:drawablePadding="2dp"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/color_white"
android:textSize="10sp"
app:drawableStartCompat="@drawable/ic_home_hot_hot"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="@+id/iv_room_image"
app:layout_constraintBottom_toBottomOf="@+id/iv_room_image"
app:layout_constraintTop_toTopOf="@+id/tv_room_title"
app:layout_constraintBottom_toBottomOf="@+id/tv_room_title"
tools:text="266" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
View File

@@ -26,6 +26,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -380,7 +381,9 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
.start();
}
ImageLoadUtils.loadAvatar(prizeInfo.getPicUrl(), ((ImageView) linearLayout.findViewById(R.id.iv_icon)));
((TextView) linearLayout.findViewById(R.id.tv_prize_name)).setText(prizeInfo.getRewardName());
((TextView) linearLayout.findViewById(R.id.tv_diamond)).setText(String.valueOf(prizeInfo.getDiamonds()));
((TextView) linearLayout.findViewById(R.id.tv_prize_num)).setText("x" + prizeInfo.getNum());
}

14
app/src/module_treasure_box/res/drawable/bg_934aee_2e2b99_r10.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="0.5dp"
android:color="#99ffcdfc" />
<gradient
android:angle="90"
android:startColor="#ff934aee"
android:endColor="#ff2e2b99"
android:type="linear"
android:useLevel="true" />
<corners android:radius="10dp" />
</shape>

8
app/src/module_treasure_box/res/drawable/bg_ee8833_f7d377_r9.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ffee8833" android:endColor="#fff7d377" android:angle="90" />
<stroke android:width="1dp" android:color="#fff0ce" />
<corners
android:radius="@dimen/dp_9" />
</shape>

32
app/src/module_treasure_box/res/layout/item_box_prize_hint.xml
View File

@@ -2,13 +2,18 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:layout_height="@dimen/dp_18"
android:layout_marginBottom="5dp"
android:gravity="center"
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingStart="6dp"
android:paddingEnd="10dp"
android:background="@drawable/bg_ee8833_f7d377_r9">
android:background="@drawable/bg_934aee_2e2b99_r10">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_icon"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"/>
<TextView
android:id="@+id/tv_prize_name"
@@ -20,15 +25,30 @@
android:textSize="@dimen/sp_10"
tools:text="@string/layout_item_box_prize_hint_01" />
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_diamond"
android:layout_marginStart="@dimen/dp_2"
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_diamond"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_FFFFFF"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="2000"/>
<TextView
android:id="@+id/tv_prize_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:lines="1"
android:layout_marginStart="5dp"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
android:layout_marginStart="4dp"
android:textColor="@color/color_FFD98C"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="x12" />
</LinearLayout>

6
gradle.properties
View File

@@ -30,8 +30,8 @@ COMPILE_SDK_VERSION=33
MIN_SDK_VERSION=21
TARGET_SDK_VERSION=33
version_name=1.10.5
version_code=1005
version_name=2.0.0
version_code=2000
#systemProp.https.proxyHost=127.0.0.1
#systemProp.https.proxyPort=7890
#systemProp.https.proxyPort=4780