xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MM 礼品积分红包修改

Browse Source
This commit is contained in:
guozhen
2024-12-25 11:11:50 +08:00
committed by xuhuixiang
parent 16e4cc297e
commit f896b16ffd
23 changed files with 391 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_receive_red_packet.xml
View File

@@ -53,6 +53,8 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_marginTop="40dp"
android:gravity="center_vertical"
android:orientation="horizontal">

14
app/src/main/res/layout/activity_send_red_packet.xml
View File

@@ -29,7 +29,7 @@
android:layout_marginLeft="@dimen/dp_30"
android:text="@string/psjhb_txt"
android:drawablePadding="@dimen/dp_5"
android:textColor="@color/color_6b3689"
android:textColor="#6D94FF"
android:textSize="@dimen/sp_14" />
@@ -216,7 +216,7 @@
android:layout_marginRight="10dp"
android:drawablePadding="@dimen/dp_5"
android:layout_weight="1"
android:drawableRight="@mipmap/wallet_jinbi_img"
android:drawableRight="@mipmap/wallet_yinbi_img"
android:background="@color/transparent"
android:gravity="right|center_vertical"
android:hint="0.00"
@@ -243,7 +243,7 @@
android:gravity="right"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:text="@string/species_txt"
android:text="@string/silver_coins_txt"
android:layout_marginTop="@dimen/dp_4"
android:textColor="@color/color_999999"
android:textSize="14sp" />
@@ -316,14 +316,16 @@
<TextView
android:id="@+id/tv_login"
android:layout_width="180dp"
android:layout_width="match_parent"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:layout_height="48dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:layout_marginTop="20dp"
android:background="@drawable/logout_btn_z_88"
android:clickable="true"
android:gravity="center"
android:text="@string/send_in_redenvelope_txt1"
android:text="@string/send_in_lipinjifen_txt1"
android:textColor="@color/white"
android:textSize="18sp" />

185
app/src/main/res/layout/fragment_chatconversation.xml
View File

@@ -18,6 +18,191 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- 世界聊天窗口-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_chatall"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/avatarView"
android:layout_width="@dimen/dimen_45_dp"
android:layout_height="@dimen/dimen_45_dp"
android:layout_marginStart="@dimen/fun_conversation_margin_15dp"
android:layout_marginTop="15dp"
app:avatarCorner="@dimen/dimen_45_dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/contentLayout"
android:layout_width="0dp"
android:layout_height="@dimen/dimen_45_dp"
android:layout_marginVertical="15dp"
android:layout_marginStart="@dimen/fun_conversation_margin_15dp"
android:layout_marginEnd="@dimen/fun_conversation_margin_15dp"
app:layout_constraintLeft_toRightOf="@+id/avatarView"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/ll_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/nameTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:maxWidth="@dimen/dimen_120_dp"
android:singleLine="true"
android:text="@string/str_chat_all"
android:textColor="@color/fun_conversation_item_title_text_color"
android:textSize="@dimen/text_size_16" />
</LinearLayout>
<!-- <TextView-->
<!-- android:id="@+id/groupNumber"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dimen_5_dp"-->
<!-- android:layout_marginEnd="@dimen/dimen_16_dp"-->
<!-- android:textColor="@color/fun_conversation_item_title_text_color"-->
<!-- android:textSize="@dimen/text_size_16"-->
<!-- android:textStyle="bold"-->
<!-- android:visibility="visible"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/muteIv"-->
<!-- app:layout_constraintRight_toLeftOf="@+id/timeTv"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<LinearLayout
android:id="@+id/messageLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dimen_7_dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/unreadTv">
<TextView
android:id="@+id/aitTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dimen_4_dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/conversation_ait_tip"
android:textColor="@color/color_ff4e54"
android:textSize="@dimen/text_size_14"
android:visibility="gone" />
<TextView
android:id="@+id/draftTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/dimen_4_dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/conversation_draft_tip"
android:textColor="@color/color_ff4e54"
android:textSize="@dimen/text_size_14"
android:visibility="gone" />
<TextView
android:id="@+id/draftTvContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/text_size_14"
android:visibility="gone" />
<TextView
android:id="@+id/messageTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/text_size_14" />
</LinearLayout>
<TextView
android:id="@+id/timeTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:ellipsize="end"
android:maxWidth="@dimen/dimen_100_dp"
android:maxLines="1"
android:textColor="@color/fun_conversation_item_time_text_color"
android:textSize="@dimen/text_size_12"
app:layout_constraintBottom_toBottomOf="@+id/ll_name"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/ll_name" />
<ImageView
android:id="@+id/muteIv"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dimen_5_dp"
android:src="@drawable/fun_ic_conversation_mute"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ll_name"
app:layout_constraintLeft_toRightOf="@+id/ll_name"
app:layout_constraintTop_toTopOf="@+id/ll_name" />
<TextView
android:id="@+id/tv_myteamtype"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_5_dp"
android:layout_marginEnd="@dimen/dimen_10_dp"
android:ellipsize="middle"
android:maxWidth="@dimen/dimen_60_dp"
android:paddingStart="@dimen/dimen_5_dp"
android:paddingEnd="@dimen/dimen_5_dp"
android:singleLine="true"
android:textSize="@dimen/text_size_12"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/ll_name"
app:layout_constraintLeft_toRightOf="@+id/muteIv"
app:layout_constraintTop_toTopOf="@+id/ll_name" />
<TextView
android:id="@+id/unreadTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dimen_2_dp"
android:background="@drawable/bg_conversation_red_dot"
android:gravity="center"
android:paddingStart="@dimen/dimen_5_dp"
android:paddingEnd="@dimen/dimen_5_dp"
android:textColor="@color/color_white"
android:textSize="@dimen/text_size_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/messageLayout"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="#EDE3E3"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_mycreate"

7
app/src/main/res/layout/fragment_mine_new.xml
View File

@@ -28,7 +28,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@mipmap/user_info_bg1"
app:layout_constraintDimensionRatio="375:146"
app:layout_constraintDimensionRatio="375:175"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -179,7 +179,7 @@
app:layout_constraintDimensionRatio="375:210"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"
android:visibility="visible"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
@@ -208,6 +208,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:visibility="gone"
android:orientation="horizontal">
<TextView
@@ -233,7 +234,6 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<TextView
@@ -291,6 +291,7 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:visibility="gone"
android:textColor="#FA6947"
android:textStyle="bold"
tools:text="8888" />