动态相关页面UI对稿
@@ -4,6 +4,6 @@
|
||||
|
||||
<corners android:radius="10dp"/>
|
||||
|
||||
<solid android:color="@color/bg_edit_e8e8f6"/>
|
||||
<solid android:color="@color/bg_secondary_2a2a39"/>
|
||||
|
||||
</shape>
|
@@ -416,9 +416,12 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
|
||||
tvFollowRoom.setBackgroundResource(AvRoomDataManager.get().isRoomFans ? R.drawable.bg_room_follow_room_collected : R.drawable.bg_room_follow_room);
|
||||
|
||||
setIdOnlineData();
|
||||
//这里的2和4是服务端定义的错误状态 关闭排麦模式和关闭PK模式!
|
||||
if (AvRoomDataManager.get().isRoomOwner() &&
|
||||
currentRoomInfo.getIsPermitRoom() != 1
|
||||
&& currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE) {
|
||||
currentRoomInfo.getIsPermitRoom() != 1 &&
|
||||
(currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE ||
|
||||
currentRoomInfo.getRoomModeType() == 2 ||
|
||||
currentRoomInfo.getRoomModeType() == 4)) {
|
||||
initRvGame();
|
||||
gameMainBinding.llChangeGame.setVisibility(View.VISIBLE);
|
||||
if (AvRoomDataManager.get().isOpenGame()) {
|
||||
|
@@ -232,7 +232,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
}
|
||||
|
||||
private void setBackBottom(boolean isExpanded) {
|
||||
mBinding.ivUserBack.setImageResource(isExpanded ? R.drawable.icon_user_back : R.drawable.icon_user_back_black);
|
||||
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back_black);
|
||||
}
|
||||
|
||||
private void setTitleVisible(boolean visible) {
|
||||
@@ -527,7 +527,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
} else if (flag == 1 && oldScrollY <= 200) {
|
||||
//合起来
|
||||
flag = 0;
|
||||
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back);
|
||||
mBinding.ivUserBack.setImageResource(R.drawable.arrow_left);
|
||||
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.transparent));
|
||||
setTitleVisible(false);
|
||||
setEditButton(identityState, false);
|
||||
@@ -542,7 +542,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
} else if (identityState == IdentityState.OTHER) {
|
||||
mBinding.ivEdit.setVisibility(View.VISIBLE);
|
||||
mBinding.tvEdit.setVisibility(View.GONE);
|
||||
mBinding.ivEdit.setImageResource(isExpanded ? R.drawable.icon_home_page_more : R.drawable.icon_home_page_more_black);
|
||||
mBinding.ivEdit.setImageResource(R.drawable.icon_home_page_more_black);
|
||||
} else {
|
||||
mBinding.ivEdit.setVisibility(View.GONE);
|
||||
mBinding.tvEdit.setVisibility(View.GONE);
|
||||
@@ -686,6 +686,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
|
||||
private void setLikedText(boolean isliked) {
|
||||
mIslike = isliked;
|
||||
attentionLayout.setBackgroundResource(isliked?R.drawable.bg_common_cancel:R.drawable.bg_common_confirm);
|
||||
attentionLayout.setText(getString((isliked) ? R.string.already_attention : R.string.attention));
|
||||
}
|
||||
|
||||
|
BIN
app/src/main/res/drawable-xhdpi/arrow_left.png
Normal file
After Width: | Height: | Size: 532 B |
Before Width: | Height: | Size: 234 B |
Before Width: | Height: | Size: 748 B After Width: | Height: | Size: 822 B |
Before Width: | Height: | Size: 913 B After Width: | Height: | Size: 790 B |
@@ -32,7 +32,7 @@
|
||||
android:layout_height="45dp"
|
||||
android:scaleType="center"
|
||||
android:layout_gravity="center_vertical|start"
|
||||
android:src="@drawable/icon_close_labe" />
|
||||
android:src="@drawable/ic_close_black" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
@@ -21,7 +21,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginEnd="4.5dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
@@ -22,7 +22,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginEnd="4.5dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
@@ -12,7 +12,7 @@
|
||||
android:id="@+id/send_msg_layout"
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="36dp"
|
||||
android:background="@drawable/bg_shape_attention"
|
||||
android:background="@drawable/bg_common_confirm"
|
||||
android:drawableLeft="@mipmap/icon_chat"
|
||||
android:drawablePadding="5dp"
|
||||
android:gravity="center"
|
||||
@@ -25,12 +25,12 @@
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="36dp"
|
||||
android:layout_marginStart="25dp"
|
||||
android:background="@drawable/bg_shape_send_msg"
|
||||
android:background="@drawable/bg_common_confirm"
|
||||
android:drawableStart="@drawable/icon_new_attention"
|
||||
android:drawablePadding="5dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/attention"
|
||||
android:textColor="@color/appColor"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="15sp" />
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 925 B |
@@ -571,9 +571,9 @@
|
||||
<!-- 输入框提示文字颜色 -->
|
||||
<color name="text_hint_555574">#B3333333</color>
|
||||
<!-- 分隔线颜色 -->
|
||||
<color name="line_353548">#FFF4F4FA</color>
|
||||
<color name="line_353548">#FFE8E8E8</color>
|
||||
<!-- 一般用于10xp或20xp的分隔线颜色 -->
|
||||
<color name="line_height_201F27">#FFF4F4FA</color>
|
||||
<color name="line_height_201F27">#FFEFEFEF</color>
|
||||
<!-- 弹窗取消按钮文字颜色 -->
|
||||
<color name="color_4C5AF1">#FFFFA936</color>
|
||||
<!-- 常用渐变按钮开始颜色 -->
|
||||
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 9.2 KiB |
@@ -62,7 +62,7 @@
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/bg_message_input"
|
||||
android:background="@drawable/bg_common_edit"
|
||||
android:hint="@string/dy_pub_comment"
|
||||
android:maxLength="500"
|
||||
android:maxLines="3"
|
||||
@@ -87,7 +87,7 @@
|
||||
android:layout_width="@dimen/dp_60"
|
||||
android:layout_height="@dimen/dp_32"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:background="@drawable/selector_dy_send_btn"
|
||||
android:background="@drawable/common_btn_bg"
|
||||
android:enabled="false"
|
||||
android:gravity="center"
|
||||
android:text="@string/send"
|
||||
|
@@ -11,7 +11,7 @@
|
||||
android:id="@+id/view_top_line"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="5dp"
|
||||
android:background="@color/bg_secondary_2a2a39"
|
||||
android:background="@color/line_height_201F27"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
@@ -53,7 +53,7 @@
|
||||
<View
|
||||
android:layout_width="220dp"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/text_secondary_4f516a"
|
||||
android:background="@color/line_353548"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="@id/tv_world_desc"
|
||||
app:layout_constraintTop_toBottomOf="@id/rriv_world"
|
||||
|
@@ -38,8 +38,8 @@ public class MWMagicIndicator extends CommonNavigatorAdapter {
|
||||
@Override
|
||||
public IPagerTitleView getTitleView(Context context, final int i) {
|
||||
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context);
|
||||
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_4f516a));
|
||||
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_white));
|
||||
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_999999));
|
||||
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_333333));
|
||||
scaleTransitionPagerTitleView.setMinScale(0.85f);
|
||||
scaleTransitionPagerTitleView.setTextSize(18);
|
||||
scaleTransitionPagerTitleView.setText(mTitleList.get(i).getName());
|
||||
|
@@ -6,7 +6,6 @@ package com.yizhuan.xchat_android_core.room.bean;
|
||||
public interface RoomModeType {
|
||||
int NORMAL_MODE = 0; //普通模式
|
||||
int OPEN_MICRO_MODE = 1; //开启排麦模式
|
||||
int CLOSE_MICRO_MODE = 2; //关闭排麦模式
|
||||
int OPEN_PK_MODE = 3;//开启PK模式
|
||||
int OPEN_DATING_MODE = 5;//开启相亲模式
|
||||
int OPEN_ANOTHER_PK_MODE = 7;//开启跨房PK模式
|
||||
|