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

1.相亲模式UI调整

Browse Source 
2.公屏UI调整
This commit is contained in:
huangjian
2021-01-28 15:59:48 +08:00
parent 28d2072ba3
commit e721b7d180
15 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -1311,15 +1311,15 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
if (!TextUtils.isEmpty(currentRoomInfo.getBlindDateState())) {
switch (currentRoomInfo.getBlindDateState()) {
case RoomInfo.DATING_STATE_FLOW:
gameBinding.tvDatingNext.setText("心动选人");
gameBinding.tvDatingNext.setText("开始选择>");
hintText = "进入心动选人环节?";
break;
case RoomInfo.DATING_STATE_SELECT:
gameBinding.tvDatingNext.setText("公布心动");
gameBinding.tvDatingNext.setText("公布心动>");
hintText = "进入公布心动环节?";
break;
case RoomInfo.DATING_STATE_PUBLISH:
gameBinding.tvDatingNext.setText("结束本轮");
gameBinding.tvDatingNext.setText("结束本轮>");
hintText = "结束本轮,同时清空魅力值?";
break;
}

29
app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
View File

@@ -270,18 +270,11 @@ public class MessageView extends FrameLayout {
super.onDetachedFromWindow();
}
private int imageHeight;
private int imageWidth;
private void init(Context context) {
imageHeight = Utils.dip2px(context, 15);
imageWidth = Utils.dip2px(context, 59);
whiteColor = ContextCompat.getColor(context, R.color.white);
greyColor = ContextCompat.getColor(context, R.color.white_transparent_50);
roomTipNickColor = ContextCompat.getColor(context, R.color.color_FFEA7F);
roomTipColor = ContextCompat.getColor(context, R.color.color_FFEA7F);
roomTipNickColor = ContextCompat.getColor(context, R.color.color_FEE057);
roomTipColor = ContextCompat.getColor(context, R.color.color_FEE057);
paddingWidth = Utils.dip2px(context, 11);
paddingHeight = Utils.dip2px(context, 6);
badgeWidth = Utils.dip2px(context, 15);
@@ -514,7 +507,7 @@ public class MessageView extends FrameLayout {
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.white));
tvContent.setText(chatRoomMessage.getContent());
} else {
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.appColor));
tvContent.setTextColor(roomTipColor);
tvContent.setText(chatRoomMessage.getContent());
}
} else if (chatRoomMessage.getMsgType() == MsgTypeEnum.text) {
@@ -813,8 +806,8 @@ public class MessageView extends FrameLayout {
SpannableBuilder text = new SpannableBuilder(tvContent);
switch (second) {
case CustomAttachment.CUSTOM_MSG_SUB_DATING_SELECT:
text.append("本轮您选择了 ", new ForegroundColorSpan(roomTipColor))
.append((notifyInfo.getTargetPosition() + 1) + "号" + (notifyInfo.getTargetGender() == 1 ? "男" : "女") + "嘉宾 ", new ForegroundColorSpan(textColor))
text.append("本轮您选择了 ", new ForegroundColorSpan(whiteColor))
.append((notifyInfo.getTargetPosition() + 1) + "号" + (notifyInfo.getTargetGender() == 1 ? "男" : "女") + "嘉宾:", new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getTargetNickname(),new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -825,7 +818,7 @@ public class MessageView extends FrameLayout {
}
}
} )
.append(" 作为你的心动对象", new ForegroundColorSpan(textColor));
.append("作为你的心动对象", new ForegroundColorSpan(whiteColor));
break;
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_LIKE:
if (notifyInfo.getHasSelectUser()) {
@@ -839,7 +832,7 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 的心动对象是 ", new ForegroundColorSpan(textColor))
.append(" 的心动对象是 ", new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getTargetNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -861,11 +854,11 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 未选择心动对象", new ForegroundColorSpan(roomTipColor));
.append(" 未选择心动对象", new ForegroundColorSpan(whiteColor));
}
break;
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_HEART:
text.append("恭喜 ", new ForegroundColorSpan(textColor))
text.append("恭喜 ", new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -876,7 +869,7 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 和 ", new ForegroundColorSpan(textColor))
.append(" 和 ", new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getTargetNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -887,7 +880,7 @@ public class MessageView extends FrameLayout {
}
}
})
.append(" 牵手成功，让我们见证他们幸福的开端", new ForegroundColorSpan(0xFFF84C95));
.append(" 牵手成功，让我们见证他们幸福的开端", new ForegroundColorSpan(whiteColor));
break;
}
tvContent.setText(text.build());

BIN
app/src/main/res/drawable-xhdpi/bg_dating_man_selected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_dating_step.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_dating_unselected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_dating_woman_selected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_mute_micro.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_mute_micro.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 640 B

2
app/src/main/res/drawable/selector_dating_step.xml
View File

@@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_4d000000" />
<solid android:color="@color/color_412d78" />
<corners android:radius="100dp" />
</shape>
</item>

2
app/src/main/res/drawable/shape_circle_micro_man_bg.xml
View File

@@ -5,7 +5,7 @@
<solid android:color="@color/transparent" />
<stroke
android:width="1dp"
android:color="#48A1FC" />
android:color="#A6D2FF" />
</shape>

2
app/src/main/res/drawable/shape_circle_micro_woman_bg.xml
View File

@@ -5,7 +5,7 @@
<solid android:color="@color/transparent" />
<stroke
android:width="1dp"
android:color="#FA6380" />
android:color="#FFB1D0" />
</shape>

2
app/src/main/res/drawable/shape_room_message_bg.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"><!-- android:shape="" 表示是圆角矩形还是椭圆等等 -->
<solid android:color="@color/black_transparent_20" /> <!-- 背景颜色 -->
<solid android:color="@color/white_transparent_15" /> <!-- 背景颜色 -->
<!-- padding 表示内部空间距离背景图片内部边距 的距离 -->
<!--<padding

24
app/src/main/res/layout/item_micro_dating_boss.xml
View File

@@ -80,9 +80,9 @@
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_gravity="bottom|end"
android:scaleType="fitCenter"
android:layout_marginBottom="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_room_mute_micro"
android:visibility="invisible"
tools:visibility="visible" />
@@ -233,7 +233,7 @@
<View
android:layout_width="37dp"
android:layout_height="3dp"
android:background="@color/color_4d000000" />
android:background="@color/color_412d78" />
<RadioButton
android:id="@+id/rb_step_select"
@@ -251,7 +251,7 @@
<View
android:layout_width="37dp"
android:layout_height="3dp"
android:background="@color/color_4d000000" />
android:background="@color/color_412d78" />
<RadioButton
android:id="@+id/rb_step_public"
@@ -271,8 +271,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_parent_gift_value"
android:layout_width="match_parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_height="@dimen/dp_50">
android:layout_height="@dimen/dp_50"
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/view_center"
@@ -294,15 +294,15 @@
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/view_center_of_charm"
app:layout_constraintEnd_toEndOf="@id/view_center_of_charm"
app:layout_constraintStart_toStartOf="@id/view_center_of_charm"
app:layout_constraintTop_toTopOf="@id/view_center_of_charm"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
app:layout_constraintTop_toTopOf="@id/view_center_of_charm">
<LinearLayout
android:layout_width="wrap_content"
@@ -327,9 +327,9 @@
android:layout_marginStart="3dp"
android:layout_marginEnd="5dp"
android:gravity="center"
android:text="9999万+"
android:textColor="@color/white"
android:textSize="9dp" />
android:textSize="9dp"
tools:text="9999万+" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/values/colors.xml
View File

@@ -545,5 +545,7 @@
<color name="color_602A06">#602A06</color>
<color name="color_79674E">#79674E</color>
<color name="color_518EFF">#518EFF</color>
<color name="color_412d78">#412D78</color>
<color name="color_FEE057">#FEE057</color>
</resources>

6
app/src/module_mini_world/res/layout/fragment_av_room_game.xml
View File

@@ -153,14 +153,18 @@
<com.coorchice.library.SuperTextView
android:id="@+id/tv_dating_next"
android:layout_width="65dp"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_below="@id/micro_view"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:gravity="center"
android:includeFontPadding="false"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:text="心动选人"
android:textColor="@color/white"
android:textSize="@dimen/sp_13"
android:visibility="gone"
app:corner="15dp"
app:shaderEnable="true"