yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI修改：PK模式相关界面

Browse Source
This commit is contained in:
huangjian
2021-04-02 15:03:45 +08:00
parent 46edffb4f0
commit 7240ab2835
15 changed files with 139 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java
View File

@@ -3,7 +3,9 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import androidx.gridlayout.widget.GridLayout; import androidx.gridlayout.widget.GridLayout;
import android.view.View; import android.view.View;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageView; import android.widget.ImageView;
@@ -11,6 +13,7 @@ import android.widget.LinearLayout;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.TextView; import android.widget.TextView;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.support.glide.GlideApp; import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R; import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.dialog.PKSelectPeopleDialog; import com.yizhuan.erban.avroom.dialog.PKSelectPeopleDialog;
@@ -71,11 +74,11 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
private TextView tvRecreateBtn; private TextView tvRecreateBtn;
private TextView tvClosePkMode; private TextView tvClosePkMode;
private List<ImageView> redTeamAvatar = new ArrayList<>(); private final List<ImageView> redTeamAvatar = new ArrayList<>();
private List<TextView> redTeamName = new ArrayList<>(); private final List<TextView> redTeamName = new ArrayList<>();
private List<ImageView> blueTeamAvatar = new ArrayList<>(); private final List<ImageView> blueTeamAvatar = new ArrayList<>();
private List<TextView> blueTeamName = new ArrayList<>(); private final List<TextView> blueTeamName = new ArrayList<>();
private List<UserInfo> redTeamMember = new ArrayList<>(); private List<UserInfo> redTeamMember = new ArrayList<>();
private List<UserInfo> blueTeamMember = new ArrayList<>(); private List<UserInfo> blueTeamMember = new ArrayList<>();
@@ -89,35 +92,32 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_create_pk); setContentView(R.layout.activity_create_pk);
glRedTeam = findViewById(R.id.gl_red_team);
glBlueTeam = findViewById(R.id.gl_blue_team);
glRedTeam = (GridLayout) findViewById(R.id.gl_red_team); ivRedAvatar1 = findViewById(R.id.iv_red_avatar_1);
glBlueTeam = (GridLayout) findViewById(R.id.gl_blue_team); tvRedName1 = findViewById(R.id.tv_red_name_1);
ivRedAvatar2 = findViewById(R.id.iv_red_avatar_2);
ivRedAvatar1 = (ImageView) findViewById(R.id.iv_red_avatar_1); tvRedName2 = findViewById(R.id.tv_red_name_2);
tvRedName1 = (TextView) findViewById(R.id.tv_red_name_1); ivRedAvatar3 = findViewById(R.id.iv_red_avatar_3);
ivRedAvatar2 = (ImageView) findViewById(R.id.iv_red_avatar_2); tvRedName3 = findViewById(R.id.tv_red_name_3);
tvRedName2 = (TextView) findViewById(R.id.tv_red_name_2); ivRedAvatar4 = findViewById(R.id.iv_red_avatar_4);
ivRedAvatar3 = (ImageView) findViewById(R.id.iv_red_avatar_3); tvRedName4 = findViewById(R.id.tv_red_name_4);
tvRedName3 = (TextView) findViewById(R.id.tv_red_name_3); ivBlueAvatar1 = findViewById(R.id.iv_blue_avatar_1);
ivRedAvatar4 = (ImageView) findViewById(R.id.iv_red_avatar_4); tvBlueName1 = findViewById(R.id.tv_blue_name_1);
tvRedName4 = (TextView) findViewById(R.id.tv_red_name_4); ivBlueAvatar2 = findViewById(R.id.iv_blue_avatar_2);
ivBlueAvatar1 = (ImageView) findViewById(R.id.iv_blue_avatar_1); tvBlueName2 = findViewById(R.id.tv_blue_name_2);
tvBlueName1 = (TextView) findViewById(R.id.tv_blue_name_1); ivBlueAvatar3 = findViewById(R.id.iv_blue_avatar_3);
ivBlueAvatar2 = (ImageView) findViewById(R.id.iv_blue_avatar_2); tvBlueName3 = findViewById(R.id.tv_blue_name_3);
tvBlueName2 = (TextView) findViewById(R.id.tv_blue_name_2); ivBlueAvatar4 = findViewById(R.id.iv_blue_avatar_4);
ivBlueAvatar3 = (ImageView) findViewById(R.id.iv_blue_avatar_3); tvBlueName4 = findViewById(R.id.tv_blue_name_4);
tvBlueName3 = (TextView) findViewById(R.id.tv_blue_name_3); rbVoteTypeGiftValue = findViewById(R.id.rb_vote_type_gift_value);
ivBlueAvatar4 = (ImageView) findViewById(R.id.iv_blue_avatar_4); rbVoteTypeGiftMember = findViewById(R.id.rb_vote_type_gift_member);
tvBlueName4 = (TextView) findViewById(R.id.tv_blue_name_4); llSelectTime = findViewById(R.id.ll_select_time);
rbVoteTypeGiftValue = (RadioButton) findViewById(R.id.rb_vote_type_gift_value); tvPkTime = findViewById(R.id.tv_pk_time);
rbVoteTypeGiftMember = (RadioButton) findViewById(R.id.rb_vote_type_gift_member); okBtn = findViewById(R.id.ok_btn);
llSelectTime = (LinearLayout) findViewById(R.id.ll_select_time); llInPk = findViewById(R.id.ll_in_pk);
tvPkTime = (TextView) findViewById(R.id.tv_pk_time); tvRecreateBtn = findViewById(R.id.tv_recreate_btn);
okBtn = (TextView) findViewById(R.id.ok_btn); tvClosePkMode = findViewById(R.id.tv_close_pk_mode);
llInPk = (LinearLayout) findViewById(R.id.ll_in_pk);
tvRecreateBtn = (TextView) findViewById(R.id.tv_recreate_btn);
tvClosePkMode = (TextView) findViewById(R.id.tv_close_pk_mode);
redTeamAvatar.add(ivRedAvatar1); redTeamAvatar.add(ivRedAvatar1);
redTeamAvatar.add(ivRedAvatar2); redTeamAvatar.add(ivRedAvatar2);
@@ -434,9 +434,9 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
@Override @Override
public void initTitleBar() { public void initTitleBar() {
super.initTitleBar(getString(R.string.create_PK)); initWhiteTitleBar(getString(R.string.create_PK));
mTitleBar.setActionTextColor(getResources().getColor(R.color.color_999999)); mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.PK_record),
mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.PK_record)) { getResources().getColor(R.color.text_normal_c6c6e9)) {
@Override @Override
public void performAction(View view) { public void performAction(View view) {
RecordForPKActivity.start(CreatePKActivity.this); RecordForPKActivity.start(CreatePKActivity.this);
@@ -444,4 +444,14 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
}); });
} }
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
} }

13
app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java
View File

@@ -8,6 +8,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.uikit.StatusBarUtil;
import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R; import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.RecordForPKAdapter; import com.yizhuan.erban.avroom.adapter.RecordForPKAdapter;
@@ -73,7 +74,7 @@ public class RecordForPKActivity extends BaseMvpActivity<IRecordForPKView, Recor
@Override @Override
public void initTitleBar() { public void initTitleBar() {
super.initTitleBar(getString(R.string.PK_record)); super.initWhiteTitleBar(getString(R.string.PK_record));
} }
public void refreshData() { public void refreshData() {
@@ -133,5 +134,15 @@ public class RecordForPKActivity extends BaseMvpActivity<IRecordForPKView, Recor
}); });
} }
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
} }

3
app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
View File

@@ -18,6 +18,7 @@ import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
@@ -78,7 +79,7 @@ public class MicQueueDialog extends BaseDialog implements
@BindView(R.id.tv_no_data_tip) @BindView(R.id.tv_no_data_tip)
TextView tvNoDataTip; TextView tvNoDataTip;
@BindView(R.id.ll_no_data_container) @BindView(R.id.ll_no_data_container)
FrameLayout llNoDataContainer; LinearLayout llNoDataContainer;
@BindView(R.id.tv_apply_mic_queue) @BindView(R.id.tv_apply_mic_queue)
TextView tvApplyMicQueue; TextView tvApplyMicQueue;
@BindView(R.id.ll_container) @BindView(R.id.ll_container)

96
app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java
View File

@@ -1,96 +0,0 @@
package com.yizhuan.erban.avroom.dialog;
import android.app.Dialog;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
import com.yizhuan.erban.R;
import java.util.Timer;
import java.util.TimerTask;
public class NewUserTaskDialog extends DialogFragment {
private OnReceiveNewUserAwardListener onReceiveNewUserAwardListener;
private TextView button;
public static NewUserTaskDialog newInstance(OnReceiveNewUserAwardListener onReceiveNewUserAwardListener) {
Bundle args = new Bundle();
NewUserTaskDialog fragment = new NewUserTaskDialog();
fragment.setArguments(args);
if (onReceiveNewUserAwardListener != null) {
fragment.setOnReceiveNewUserAwardListener(onReceiveNewUserAwardListener);
}
return fragment;
}
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
Dialog dialog = super.onCreateDialog(savedInstanceState);
Window window = dialog.getWindow();
if (window != null) {
WindowManager.LayoutParams wlp = window.getAttributes();
wlp.gravity = Gravity.CENTER;
wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
wlp.height = WindowManager.LayoutParams.WRAP_CONTENT;
window.setAttributes(wlp);
}
return dialog;
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.dialog_new_user_task, container, false);
getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
if (getDialog().getWindow() != null) {
getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
}
return view;
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
button = view.findViewById(R.id.tv_button);
button.setOnClickListener(v -> {
if (onReceiveNewUserAwardListener != null) {
onReceiveNewUserAwardListener.onReceiveAward();
}
});
}
public void refreshDialogWithReceiveAwardFinish() {
button.setText("已经领取");
button.setEnabled(false);
Timer t = new Timer();
t.schedule(new TimerTask() {
public void run() {
if (isVisible()) {
dismiss();
}
t.cancel();
}
}, 3000);
}
public interface OnReceiveNewUserAwardListener {
void onReceiveAward();
}
public void setOnReceiveNewUserAwardListener(OnReceiveNewUserAwardListener onReceiveNewUserAwardListener) {
this.onReceiveNewUserAwardListener = onReceiveNewUserAwardListener;
}
}

30
app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java
View File

@@ -62,10 +62,9 @@ public class PKMicQueueDialog extends BaseDialog implements
private FrameLayout flQueueCount; private FrameLayout flQueueCount;
private TextView tvMicQueueTip; private TextView tvMicQueueTip;
private FrameLayout flMainContent;
private SwipeRefreshLayout srlRefreshContainer; private SwipeRefreshLayout srlRefreshContainer;
private RecyclerView rvMicQueue; private RecyclerView rvMicQueue;
private FrameLayout llNoDataContainer; private LinearLayout llNoDataContainer;
private TextView tvNoDataTip; private TextView tvNoDataTip;
private FrameLayout flBottomButton; private FrameLayout flBottomButton;
private LinearLayout llJoinQueue; private LinearLayout llJoinQueue;
@@ -75,7 +74,7 @@ public class PKMicQueueDialog extends BaseDialog implements
private TextView tvShareRoom; private TextView tvShareRoom;
private PKMicQueueAdapter adapter; private PKMicQueueAdapter adapter;
private LoadPageDataHelper<List<PKQueuingMicMemberInfo>> loadPageDataHelper; private final LoadPageDataHelper<List<PKQueuingMicMemberInfo>> loadPageDataHelper;
private PKRespQueuingMicListInfo queueMicListInfo; private PKRespQueuingMicListInfo queueMicListInfo;
private CompositeDisposable compositeDisposable = new CompositeDisposable(); private CompositeDisposable compositeDisposable = new CompositeDisposable();
@@ -102,19 +101,18 @@ public class PKMicQueueDialog extends BaseDialog implements
setCanceledOnTouchOutside(true); setCanceledOnTouchOutside(true);
setContentView(R.layout.dialog_pk_mic_queue); setContentView(R.layout.dialog_pk_mic_queue);
flQueueCount = (FrameLayout) findViewById(R.id.fl_queue_count); flQueueCount = findViewById(R.id.fl_queue_count);
tvMicQueueTip = (TextView) findViewById(R.id.tv_mic_queue_tip); tvMicQueueTip = findViewById(R.id.tv_mic_queue_tip);
flMainContent = (FrameLayout) findViewById(R.id.fl_main_content); srlRefreshContainer = findViewById(R.id.srl_refresh_container);
srlRefreshContainer = (SwipeRefreshLayout) findViewById(R.id.srl_refresh_container); rvMicQueue = findViewById(R.id.rv_mic_queue);
rvMicQueue = (RecyclerView) findViewById(R.id.rv_mic_queue); llNoDataContainer = findViewById(R.id.ll_no_data_container);
llNoDataContainer = (FrameLayout) findViewById(R.id.ll_no_data_container); tvNoDataTip = findViewById(R.id.tv_no_data_tip);
tvNoDataTip = (TextView) findViewById(R.id.tv_no_data_tip); flBottomButton = findViewById(R.id.fl_bottom_button);
flBottomButton = (FrameLayout) findViewById(R.id.fl_bottom_button); llJoinQueue = findViewById(R.id.ll_join_queue);
llJoinQueue = (LinearLayout) findViewById(R.id.ll_join_queue); tvJoinRed = findViewById(R.id.tv_join_red);
tvJoinRed = (TextView) findViewById(R.id.tv_join_red); tvJoinBlue = findViewById(R.id.tv_join_blue);
tvJoinBlue = (TextView) findViewById(R.id.tv_join_blue); tvExitQueue = findViewById(R.id.tv_exit_queue);
tvExitQueue = (TextView) findViewById(R.id.tv_exit_queue); tvShareRoom = findViewById(R.id.tv_share_room);
tvShareRoom = (TextView) findViewById(R.id.tv_share_room);
srlRefreshContainer.setOnRefreshListener(this::refreshData); srlRefreshContainer.setOnRefreshListener(this::refreshData);

60
app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java
View File

@@ -1,60 +0,0 @@
package com.yizhuan.erban.avroom.dialog;
import androidx.lifecycle.MutableLiveData;
import android.content.Context;
import androidx.databinding.ObservableBoolean;
import androidx.databinding.ObservableField;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
/**
* Created by lvzebiao on 2018/11/15.
*/
public class RoomOperationVm {
public final MutableLiveData<Boolean> isRoomOwnerOrAdmin = new MutableLiveData<>();
public final MutableLiveData<Boolean> isRoomOwner = new MutableLiveData<>();
/**
* 礼物特效
*/
public final MutableLiveData<String> openOrCloseEffect = new MutableLiveData<>();
/**
* 开关公屏
*/
public final MutableLiveData<String> openOrClosePublicScreen = new MutableLiveData<>();
public ObservableBoolean showLimitType = new ObservableBoolean(false);
public ObservableField<RoomInfo> roomInfo = new ObservableField<>();
private Context context;
public RoomOperationVm(Context context) {
this.context = context;
long currentUid = AuthModel.get().getCurrentUid();
boolean isRoomOwner = AvRoomDataManager.get().isRoomOwner(currentUid);
boolean isRoomAdmin = AvRoomDataManager.get().isRoomAdmin(currentUid);
this.isRoomOwner.setValue(isRoomOwner);
isRoomOwnerOrAdmin.setValue(isRoomOwner || isRoomAdmin);
boolean effect = AvRoomDataManager.get().mIsNeedGiftEffect;
String text = effect ?
context.getResources().getString(R.string.close_my_effect) :
context.getResources().getString(R.string.open_my_effect);
openOrCloseEffect.setValue(text);
RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (roomInfo == null) {
return;
}
this.roomInfo.set(roomInfo);
showLimitType.set(roomInfo.getType() == RoomInfo.ROOMTYPE_CP && isRoomOwner);
boolean isCloseScreen = roomInfo.isCloseScreen();
text = isCloseScreen ?
context.getResources().getString(R.string.open_public_screen) :
context.getResources().getString(R.string.close_public_screen);
openOrClosePublicScreen.setValue(text);
}
}

4
app/src/main/res/drawable/bg_recommend_topic_bottom_transparent.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#40000000" /> <solid android:color="#40000000" />
<corners android:bottomRightRadius="12dp" <corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="@dimen/dp_12" android:bottomLeftRadius="@dimen/dp_8"
android:topRightRadius="0dp" android:topRightRadius="0dp"
android:topLeftRadius="0dp"/> android:topLeftRadius="0dp"/>

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

@@ -10,7 +10,7 @@
<item > <item >
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_DBDBDB" /> <solid android:color="@color/bg_disable_303043" />
<corners android:radius="20dp" /> <corners android:radius="20dp" />
</shape> </shape>
</item> </item>

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

@@ -11,7 +11,7 @@
<item > <item >
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_DBDBDB" /> <solid android:color="@color/bg_disable_303043" />
<corners android:radius="20dp" /> <corners android:radius="20dp" />
</shape> </shape>
</item> </item>

37
app/src/main/res/layout/activity_create_pk.xml
View File

@@ -4,19 +4,20 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical"> android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar <com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar" android:id="@+id/title_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25" android:layout_marginTop="@dimen/dp_25"
android:background="@color/color_FFFFFF"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.gridlayout.widget.GridLayout <androidx.gridlayout.widget.GridLayout
@@ -304,7 +305,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2.5" android:layout_weight="2.5"
android:text="@string/room_PK_mode" android:text="@string/room_PK_mode"
android:textColor="@color/color_333333" android:textColor="@color/text_title_white"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
@@ -312,7 +313,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="7.5" android:layout_weight="7.5"
android:text="@string/team_PK" android:text="@string/team_PK"
android:textColor="@color/color_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@@ -322,7 +323,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:background="@color/color_f0f0f0" /> android:background="@color/line_353548" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -338,7 +339,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2.5" android:layout_weight="2.5"
android:text="@string/vote_type" android:text="@string/vote_type"
android:textColor="@color/color_333333" android:textColor="@color/text_title_white"
android:textSize="15sp" /> android:textSize="15sp" />
<RadioGroup <RadioGroup
@@ -354,7 +355,7 @@
android:button="@drawable/selector_radio_btn" android:button="@drawable/selector_radio_btn"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:text="@string/vote_type_gift_value" android:text="@string/vote_type_gift_value"
android:textColor="@color/color_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" /> android:textSize="14sp" />
<RadioButton <RadioButton
@@ -365,7 +366,7 @@
android:button="@drawable/selector_radio_btn" android:button="@drawable/selector_radio_btn"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:text="@string/vote_type_gift_member" android:text="@string/vote_type_gift_member"
android:textColor="@color/color_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" /> android:textSize="14sp" />
</RadioGroup> </RadioGroup>
@@ -377,7 +378,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:background="@color/color_f0f0f0" /> android:background="@color/line_353548" />
<LinearLayout <LinearLayout
@@ -395,7 +396,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2.5" android:layout_weight="2.5"
android:text="@string/room_PK_time" android:text="@string/room_PK_time"
android:textColor="@color/color_333333" android:textColor="@color/text_title_white"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
@@ -404,7 +405,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="7.5" android:layout_weight="7.5"
android:gravity="right" android:gravity="right"
android:textColor="@color/color_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" android:textSize="14sp"
tools:text="30秒" /> tools:text="30秒" />
@@ -412,7 +413,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:src="@drawable/arrow_right" /> android:src="@drawable/arrow_right_white" />
</LinearLayout> </LinearLayout>
@@ -421,7 +422,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:background="@color/color_f0f0f0" /> android:background="@color/line_353548" />
<RelativeLayout <RelativeLayout
@@ -436,7 +437,7 @@
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:background="@drawable/bg_binding_button" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:text="@string/ok" android:text="@string/ok"
android:textColor="@color/color_FFFFFF" /> android:textColor="@color/color_FFFFFF" />
@@ -456,7 +457,7 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/bg_binding_button" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:text="@string/recreate_pk" android:text="@string/recreate_pk"
android:textColor="@color/color_FFFFFF" /> android:textColor="@color/color_FFFFFF" />
@@ -469,10 +470,10 @@
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/bg_close_pk_mode" android:background="@drawable/bg_common_disable"
android:gravity="center" android:gravity="center"
android:text="@string/close_pk_mode" android:text="@string/close_pk_mode"
android:textColor="@color/color_333333" /> android:textColor="@color/text_secondary_4f516a" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

4
app/src/main/res/layout/activity_record_for_pk.xml
View File

@@ -2,10 +2,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical"> android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar <com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar" android:id="@+id/title_bar"
android:layout_marginTop="@dimen/dp_25"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
@@ -17,7 +19,7 @@
android:id="@+id/srl_refresh_container" android:id="@+id/srl_refresh_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/color_f0f0f0"> >
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_list" android:id="@+id/rv_list"

19
app/src/main/res/layout/dialog_mic_queue.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="450dp" android:layout_height="450dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/shape_white_top_14dp" android:background="@drawable/bg_secondary_radius_15"
android:clipToPadding="true" android:clipToPadding="true"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:orientation="vertical"> android:orientation="vertical">
@@ -23,7 +23,7 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_999999" android:textColor="@color/text_title_white"
android:textSize="14sp" /> android:textSize="14sp" />
<View <View
@@ -32,7 +32,7 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginStart="@dimen/dp_15" android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_15"
android:background="@color/color_F4F4F4" /> android:background="@color/line_353548" />
</FrameLayout> </FrameLayout>
@@ -56,10 +56,12 @@
android:layout_height="match_parent" /> android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<FrameLayout <LinearLayout
android:id="@+id/ll_no_data_container" android:id="@+id/ll_no_data_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
tools:visibility="visible"> tools:visibility="visible">
<ImageView <ImageView
@@ -72,15 +74,14 @@
android:id="@+id/tv_no_data_tip" android:id="@+id/tv_no_data_tip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="220dp"
android:gravity="center" android:gravity="center"
android:lineSpacingMultiplier="1.5" android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/color_999999"
android:textSize="12dp" android:textSize="12dp"
tools:text="@string/manager_no_mic_queue_tip" /> tools:text="@string/manager_no_mic_queue_tip" />
</FrameLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
@@ -99,7 +100,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/shape_app_color_20dp_round" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_white" android:textColor="@color/color_white"

23
app/src/main/res/layout/dialog_pk_mic_queue.xml
View File

@@ -9,7 +9,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="457dp" android:layout_height="457dp"
android:background="@drawable/shape_pk_mic_queue_dialog_bg" android:background="@drawable/bg_secondary_radius_15"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
@@ -26,7 +26,7 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_999999" android:textColor="@color/text_title_white"
android:textSize="14sp" /> android:textSize="14sp" />
@@ -34,7 +34,7 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/color_ebebeb" /> android:background="@color/line_353548" />
</FrameLayout> </FrameLayout>
@@ -56,11 +56,13 @@
android:layout_height="match_parent" /> android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<FrameLayout <LinearLayout
android:id="@+id/ll_no_data_container" android:id="@+id/ll_no_data_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="340dp" android:layout_height="340dp"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="vertical"
android:gravity="center"
tools:visibility="visible"> tools:visibility="visible">
<ImageView <ImageView
@@ -71,17 +73,16 @@
<TextView <TextView
android:id="@+id/tv_no_data_tip" android:id="@+id/tv_no_data_tip"
android:layout_marginTop="220dp" android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:lineSpacingMultiplier="1.5" android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/color_999999"
android:textSize="12dp" android:textSize="12dp"
tools:text="@string/no_mic_queue_tip" /> tools:text="@string/no_mic_queue_tip" />
</FrameLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
@@ -139,9 +140,9 @@
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_333333" android:textColor="@color/text_secondary_4f516a"
android:textSize="16sp" android:textSize="16sp"
android:background="@drawable/shape_dbdbdb_corner" android:background="@drawable/bg_common_disable"
android:text="@string/cancel_mic_queue" android:text="@string/cancel_mic_queue"
android:visibility="gone" /> android:visibility="gone" />
@@ -154,7 +155,7 @@
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_FFFFFF" android:textColor="@color/color_FFFFFF"
android:textSize="16sp" android:textSize="16sp"
android:background="@drawable/shape_appcolor_corner" android:background="@drawable/bg_common_confirm"
android:text="@string/invite_to_mic_queue" android:text="@string/invite_to_mic_queue"
android:visibility="gone" /> android:visibility="gone" />

4
app/src/main/res/layout/dialog_pk_select_people.xml
View File

@@ -18,9 +18,9 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_binding_button" android:background="@drawable/bg_common_confirm"
android:text="@string/ok" android:text="@string/ok"
android:textColor="@color/color_FFFFFF" android:textColor="@color/text_title_white"
android:textSize="15dp" /> android:textSize="15dp" />
</LinearLayout> </LinearLayout>

30
app/src/main/res/layout/item_record_for_pk.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical"
android:background="@color/color_FFFFFF" tools:background="@color/bg_normal_1c1b22">
android:orientation="vertical">
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -33,8 +33,8 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -59,16 +59,16 @@
</LinearLayout> </LinearLayout>
<View <View
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="@mipmap/div_pk_record" /> android:background="@mipmap/div_pk_record" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -122,8 +122,8 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -148,16 +148,16 @@
</LinearLayout> </LinearLayout>
<View <View
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="@mipmap/div_pk_record" /> android:background="@mipmap/div_pk_record" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -217,7 +217,7 @@
android:background="@drawable/bg_pk_record_loser" android:background="@drawable/bg_pk_record_loser"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:lines="1" android:lines="1"
android:textColor="@color/color_FFFFFF" android:textColor="@color/text_title_white"
android:textSize="13sp" android:textSize="13sp"
tools:text="胜利" /> tools:text="胜利" />
@@ -235,7 +235,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:textColor="@color/color_333333" android:textColor="@color/text_title_white"
android:textSize="13sp" android:textSize="13sp"
tools:text="@string/vote_type_gift_value" /> tools:text="@string/vote_type_gift_value" />
@@ -246,7 +246,7 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center" android:gravity="center"
android:lines="2" android:lines="2"
android:textColor="@color/color_999999" android:textColor="@color/text_secondary_4f516a"
android:textSize="12sp" android:textSize="12sp"
tools:text="2018-12-12\n21:28:32" /> tools:text="2018-12-12\n21:28:32" />
@@ -276,7 +276,7 @@
android:background="@drawable/bg_pk_record_loser" android:background="@drawable/bg_pk_record_loser"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:lines="1" android:lines="1"
android:textColor="@color/color_FFFFFF" android:textColor="@color/text_title_white"
android:textSize="13sp" android:textSize="13sp"
tools:text="胜利" /> tools:text="胜利" />