From 7240ab283595f8b12ee646f316ecf4629a11e468 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 2 Apr 2021 15:03:45 +0800
Subject: [PATCH] =?UTF-8?q?UI=E4=BF=AE=E6=94=B9=EF=BC=9APK=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../avroom/activity/CreatePKActivity.java     | 82 +++++++++-------
 .../avroom/activity/RecordForPKActivity.java  | 13 ++-
 .../erban/avroom/dialog/MicQueueDialog.java   |  3 +-
 .../avroom/dialog/NewUserTaskDialog.java      | 96 -------------------
 .../erban/avroom/dialog/PKMicQueueDialog.java | 30 +++---
 .../erban/avroom/dialog/RoomOperationVm.java  | 60 ------------
 .../bg_recommend_topic_bottom_transparent.xml |  4 +-
 .../res/drawable/shape_518eff_20dp_round.xml  |  2 +-
 .../res/drawable/shape_ff6b77_20dp_round.xml  |  2 +-
 .../main/res/layout/activity_create_pk.xml    | 37 +++----
 .../res/layout/activity_record_for_pk.xml     |  4 +-
 app/src/main/res/layout/dialog_mic_queue.xml  | 19 ++--
 .../main/res/layout/dialog_pk_mic_queue.xml   | 23 ++---
 .../res/layout/dialog_pk_select_people.xml    |  4 +-
 .../main/res/layout/item_record_for_pk.xml    | 30 +++---
 15 files changed, 139 insertions(+), 270 deletions(-)
 delete mode 100644 app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java
 delete mode 100644 app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java
index d68ba748d..372856945 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java
@@ -3,7 +3,9 @@ package com.yizhuan.erban.avroom.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.gridlayout.widget.GridLayout;
+
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
@@ -11,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.dialog.PKSelectPeopleDialog;
@@ -71,11 +74,11 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
     private TextView tvRecreateBtn;
     private TextView tvClosePkMode;
 
-    private List<ImageView> redTeamAvatar = new ArrayList<>();
-    private List<TextView> redTeamName = new ArrayList<>();
+    private final List<ImageView> redTeamAvatar = new ArrayList<>();
+    private final List<TextView> redTeamName = new ArrayList<>();
 
-    private List<ImageView> blueTeamAvatar = new ArrayList<>();
-    private List<TextView> blueTeamName = new ArrayList<>();
+    private final List<ImageView> blueTeamAvatar = new ArrayList<>();
+    private final List<TextView> blueTeamName = new ArrayList<>();
 
     private List<UserInfo> redTeamMember = new ArrayList<>();
     private List<UserInfo> blueTeamMember = new ArrayList<>();
@@ -89,35 +92,32 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_create_pk);
-
-
-        glRedTeam = (GridLayout) findViewById(R.id.gl_red_team);
-        glBlueTeam = (GridLayout) findViewById(R.id.gl_blue_team);
-
-        ivRedAvatar1 = (ImageView) findViewById(R.id.iv_red_avatar_1);
-        tvRedName1 = (TextView) findViewById(R.id.tv_red_name_1);
-        ivRedAvatar2 = (ImageView) findViewById(R.id.iv_red_avatar_2);
-        tvRedName2 = (TextView) findViewById(R.id.tv_red_name_2);
-        ivRedAvatar3 = (ImageView) findViewById(R.id.iv_red_avatar_3);
-        tvRedName3 = (TextView) findViewById(R.id.tv_red_name_3);
-        ivRedAvatar4 = (ImageView) findViewById(R.id.iv_red_avatar_4);
-        tvRedName4 = (TextView) findViewById(R.id.tv_red_name_4);
-        ivBlueAvatar1 = (ImageView) findViewById(R.id.iv_blue_avatar_1);
-        tvBlueName1 = (TextView) findViewById(R.id.tv_blue_name_1);
-        ivBlueAvatar2 = (ImageView) findViewById(R.id.iv_blue_avatar_2);
-        tvBlueName2 = (TextView) findViewById(R.id.tv_blue_name_2);
-        ivBlueAvatar3 = (ImageView) findViewById(R.id.iv_blue_avatar_3);
-        tvBlueName3 = (TextView) findViewById(R.id.tv_blue_name_3);
-        ivBlueAvatar4 = (ImageView) findViewById(R.id.iv_blue_avatar_4);
-        tvBlueName4 = (TextView) findViewById(R.id.tv_blue_name_4);
-        rbVoteTypeGiftValue = (RadioButton) findViewById(R.id.rb_vote_type_gift_value);
-        rbVoteTypeGiftMember = (RadioButton) findViewById(R.id.rb_vote_type_gift_member);
-        llSelectTime = (LinearLayout) findViewById(R.id.ll_select_time);
-        tvPkTime = (TextView) findViewById(R.id.tv_pk_time);
-        okBtn = (TextView) findViewById(R.id.ok_btn);
-        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);
+        glRedTeam = findViewById(R.id.gl_red_team);
+        glBlueTeam = findViewById(R.id.gl_blue_team);
+        ivRedAvatar1 = findViewById(R.id.iv_red_avatar_1);
+        tvRedName1 = findViewById(R.id.tv_red_name_1);
+        ivRedAvatar2 = findViewById(R.id.iv_red_avatar_2);
+        tvRedName2 = findViewById(R.id.tv_red_name_2);
+        ivRedAvatar3 = findViewById(R.id.iv_red_avatar_3);
+        tvRedName3 = findViewById(R.id.tv_red_name_3);
+        ivRedAvatar4 = findViewById(R.id.iv_red_avatar_4);
+        tvRedName4 = findViewById(R.id.tv_red_name_4);
+        ivBlueAvatar1 = findViewById(R.id.iv_blue_avatar_1);
+        tvBlueName1 = findViewById(R.id.tv_blue_name_1);
+        ivBlueAvatar2 = findViewById(R.id.iv_blue_avatar_2);
+        tvBlueName2 = findViewById(R.id.tv_blue_name_2);
+        ivBlueAvatar3 = findViewById(R.id.iv_blue_avatar_3);
+        tvBlueName3 = findViewById(R.id.tv_blue_name_3);
+        ivBlueAvatar4 = findViewById(R.id.iv_blue_avatar_4);
+        tvBlueName4 = findViewById(R.id.tv_blue_name_4);
+        rbVoteTypeGiftValue = findViewById(R.id.rb_vote_type_gift_value);
+        rbVoteTypeGiftMember = findViewById(R.id.rb_vote_type_gift_member);
+        llSelectTime = findViewById(R.id.ll_select_time);
+        tvPkTime = findViewById(R.id.tv_pk_time);
+        okBtn = findViewById(R.id.ok_btn);
+        llInPk = findViewById(R.id.ll_in_pk);
+        tvRecreateBtn = findViewById(R.id.tv_recreate_btn);
+        tvClosePkMode = findViewById(R.id.tv_close_pk_mode);
 
         redTeamAvatar.add(ivRedAvatar1);
         redTeamAvatar.add(ivRedAvatar2);
@@ -434,9 +434,9 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
 
     @Override
     public void initTitleBar() {
-        super.initTitleBar(getString(R.string.create_PK));
-        mTitleBar.setActionTextColor(getResources().getColor(R.color.color_999999));
-        mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.PK_record)) {
+        initWhiteTitleBar(getString(R.string.create_PK));
+        mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.PK_record),
+                getResources().getColor(R.color.text_normal_c6c6e9)) {
             @Override
             public void performAction(View view) {
                 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);
+    }
+
 }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java
index ededc4a8d..21062ad2c 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java
@@ -8,6 +8,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.netease.nim.uikit.StatusBarUtil;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.adapter.RecordForPKAdapter;
@@ -73,7 +74,7 @@ public class RecordForPKActivity extends BaseMvpActivity<IRecordForPKView, Recor
 
     @Override
     public void initTitleBar() {
-        super.initTitleBar(getString(R.string.PK_record));
+        super.initWhiteTitleBar(getString(R.string.PK_record));
     }
 
     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);
+    }
+
 
 }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
index ed84be6e4..6d251661d 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
@@ -18,6 +18,7 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -78,7 +79,7 @@ public class MicQueueDialog extends BaseDialog implements
     @BindView(R.id.tv_no_data_tip)
     TextView tvNoDataTip;
     @BindView(R.id.ll_no_data_container)
-    FrameLayout llNoDataContainer;
+    LinearLayout llNoDataContainer;
     @BindView(R.id.tv_apply_mic_queue)
     TextView tvApplyMicQueue;
     @BindView(R.id.ll_container)
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java
deleted file mode 100644
index 35667c10d..000000000
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java
+++ /dev/null
@@ -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;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java
index 67539f3c3..9d8a1f2d4 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java
@@ -62,10 +62,9 @@ public class PKMicQueueDialog extends BaseDialog implements
 
     private FrameLayout flQueueCount;
     private TextView tvMicQueueTip;
-    private FrameLayout flMainContent;
     private SwipeRefreshLayout srlRefreshContainer;
     private RecyclerView rvMicQueue;
-    private FrameLayout llNoDataContainer;
+    private LinearLayout llNoDataContainer;
     private TextView tvNoDataTip;
     private FrameLayout flBottomButton;
     private LinearLayout llJoinQueue;
@@ -75,7 +74,7 @@ public class PKMicQueueDialog extends BaseDialog implements
     private TextView tvShareRoom;
 
     private PKMicQueueAdapter adapter;
-    private LoadPageDataHelper<List<PKQueuingMicMemberInfo>> loadPageDataHelper;
+    private final LoadPageDataHelper<List<PKQueuingMicMemberInfo>> loadPageDataHelper;
     private PKRespQueuingMicListInfo queueMicListInfo;
 
     private CompositeDisposable compositeDisposable = new CompositeDisposable();
@@ -102,19 +101,18 @@ public class PKMicQueueDialog extends BaseDialog implements
         setCanceledOnTouchOutside(true);
         setContentView(R.layout.dialog_pk_mic_queue);
 
-        flQueueCount = (FrameLayout) findViewById(R.id.fl_queue_count);
-        tvMicQueueTip = (TextView) findViewById(R.id.tv_mic_queue_tip);
-        flMainContent = (FrameLayout) findViewById(R.id.fl_main_content);
-        srlRefreshContainer = (SwipeRefreshLayout) findViewById(R.id.srl_refresh_container);
-        rvMicQueue = (RecyclerView) findViewById(R.id.rv_mic_queue);
-        llNoDataContainer = (FrameLayout) findViewById(R.id.ll_no_data_container);
-        tvNoDataTip = (TextView) findViewById(R.id.tv_no_data_tip);
-        flBottomButton = (FrameLayout) findViewById(R.id.fl_bottom_button);
-        llJoinQueue = (LinearLayout) findViewById(R.id.ll_join_queue);
-        tvJoinRed = (TextView) findViewById(R.id.tv_join_red);
-        tvJoinBlue = (TextView) findViewById(R.id.tv_join_blue);
-        tvExitQueue = (TextView) findViewById(R.id.tv_exit_queue);
-        tvShareRoom = (TextView) findViewById(R.id.tv_share_room);
+        flQueueCount = findViewById(R.id.fl_queue_count);
+        tvMicQueueTip = findViewById(R.id.tv_mic_queue_tip);
+        srlRefreshContainer = findViewById(R.id.srl_refresh_container);
+        rvMicQueue = findViewById(R.id.rv_mic_queue);
+        llNoDataContainer = findViewById(R.id.ll_no_data_container);
+        tvNoDataTip = findViewById(R.id.tv_no_data_tip);
+        flBottomButton = findViewById(R.id.fl_bottom_button);
+        llJoinQueue = findViewById(R.id.ll_join_queue);
+        tvJoinRed = findViewById(R.id.tv_join_red);
+        tvJoinBlue = findViewById(R.id.tv_join_blue);
+        tvExitQueue = findViewById(R.id.tv_exit_queue);
+        tvShareRoom = findViewById(R.id.tv_share_room);
 
 
         srlRefreshContainer.setOnRefreshListener(this::refreshData);
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java
deleted file mode 100644
index 706545a84..000000000
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java
+++ /dev/null
@@ -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);
-    }
-
-}
diff --git a/app/src/main/res/drawable/bg_recommend_topic_bottom_transparent.xml b/app/src/main/res/drawable/bg_recommend_topic_bottom_transparent.xml
index fd610116a..85b2c473c 100644
--- a/app/src/main/res/drawable/bg_recommend_topic_bottom_transparent.xml
+++ b/app/src/main/res/drawable/bg_recommend_topic_bottom_transparent.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#40000000" />
-    <corners android:bottomRightRadius="12dp"
-        android:bottomLeftRadius="@dimen/dp_12"
+    <corners android:bottomRightRadius="8dp"
+        android:bottomLeftRadius="@dimen/dp_8"
         android:topRightRadius="0dp"
         android:topLeftRadius="0dp"/>
 
diff --git a/app/src/main/res/drawable/shape_518eff_20dp_round.xml b/app/src/main/res/drawable/shape_518eff_20dp_round.xml
index 6fc9a0da5..fa8e78dc6 100644
--- a/app/src/main/res/drawable/shape_518eff_20dp_round.xml
+++ b/app/src/main/res/drawable/shape_518eff_20dp_round.xml
@@ -10,7 +10,7 @@
 
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="@color/color_DBDBDB" />
+            <solid android:color="@color/bg_disable_303043" />
             <corners android:radius="20dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/shape_ff6b77_20dp_round.xml b/app/src/main/res/drawable/shape_ff6b77_20dp_round.xml
index 7c272e62c..67ad9cb5c 100644
--- a/app/src/main/res/drawable/shape_ff6b77_20dp_round.xml
+++ b/app/src/main/res/drawable/shape_ff6b77_20dp_round.xml
@@ -11,7 +11,7 @@
 
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="@color/color_DBDBDB" />
+            <solid android:color="@color/bg_disable_303043" />
             <corners android:radius="20dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/layout/activity_create_pk.xml b/app/src/main/res/layout/activity_create_pk.xml
index bdb7a5814..ff27f9a40 100644
--- a/app/src/main/res/layout/activity_create_pk.xml
+++ b/app/src/main/res/layout/activity_create_pk.xml
@@ -4,19 +4,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_normal_1c1b22"
     android:orientation="vertical">
 
     <com.yizhuan.erban.base.TitleBar
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_25" />
 
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-       android:layout_marginTop="@dimen/dp_25"
-        android:background="@color/color_FFFFFF"
+        android:layout_marginTop="@dimen/dp_25"
         android:orientation="horizontal">
 
         <androidx.gridlayout.widget.GridLayout
@@ -304,7 +305,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="2.5"
             android:text="@string/room_PK_mode"
-            android:textColor="@color/color_333333"
+            android:textColor="@color/text_title_white"
             android:textSize="15sp" />
 
         <TextView
@@ -312,7 +313,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="7.5"
             android:text="@string/team_PK"
-            android:textColor="@color/color_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -322,7 +323,7 @@
         android:layout_height="1dp"
         android:layout_marginLeft="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
-        android:background="@color/color_f0f0f0" />
+        android:background="@color/line_353548" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -338,7 +339,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="2.5"
             android:text="@string/vote_type"
-            android:textColor="@color/color_333333"
+            android:textColor="@color/text_title_white"
             android:textSize="15sp" />
 
         <RadioGroup
@@ -354,7 +355,7 @@
                 android:button="@drawable/selector_radio_btn"
                 android:paddingLeft="5dp"
                 android:text="@string/vote_type_gift_value"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="14sp" />
 
             <RadioButton
@@ -365,7 +366,7 @@
                 android:button="@drawable/selector_radio_btn"
                 android:paddingLeft="5dp"
                 android:text="@string/vote_type_gift_member"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="14sp" />
 
         </RadioGroup>
@@ -377,7 +378,7 @@
         android:layout_height="1dp"
         android:layout_marginLeft="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
-        android:background="@color/color_f0f0f0" />
+        android:background="@color/line_353548" />
 
 
     <LinearLayout
@@ -395,7 +396,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="2.5"
             android:text="@string/room_PK_time"
-            android:textColor="@color/color_333333"
+            android:textColor="@color/text_title_white"
             android:textSize="15sp" />
 
         <TextView
@@ -404,7 +405,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="7.5"
             android:gravity="right"
-            android:textColor="@color/color_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="14sp"
             tools:text="30秒" />
 
@@ -412,7 +413,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:src="@drawable/arrow_right" />
+            android:src="@drawable/arrow_right_white" />
 
     </LinearLayout>
 
@@ -421,7 +422,7 @@
         android:layout_height="1dp"
         android:layout_marginLeft="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
-        android:background="@color/color_f0f0f0" />
+        android:background="@color/line_353548" />
 
 
     <RelativeLayout
@@ -436,7 +437,7 @@
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginRight="@dimen/dp_15"
             android:layout_marginBottom="20dp"
-            android:background="@drawable/bg_binding_button"
+            android:background="@drawable/bg_common_confirm"
             android:gravity="center"
             android:text="@string/ok"
             android:textColor="@color/color_FFFFFF" />
@@ -456,7 +457,7 @@
                 android:layout_height="40dp"
                 android:layout_marginLeft="@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:text="@string/recreate_pk"
                 android:textColor="@color/color_FFFFFF" />
@@ -469,10 +470,10 @@
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="@dimen/dp_15"
-                android:background="@drawable/bg_close_pk_mode"
+                android:background="@drawable/bg_common_disable"
                 android:gravity="center"
                 android:text="@string/close_pk_mode"
-                android:textColor="@color/color_333333" />
+                android:textColor="@color/text_secondary_4f516a" />
         </LinearLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_record_for_pk.xml b/app/src/main/res/layout/activity_record_for_pk.xml
index 8819ea6aa..cda88455f 100644
--- a/app/src/main/res/layout/activity_record_for_pk.xml
+++ b/app/src/main/res/layout/activity_record_for_pk.xml
@@ -2,10 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_normal_1c1b22"
     android:orientation="vertical">
 
     <com.yizhuan.erban.base.TitleBar
         android:id="@+id/title_bar"
+        android:layout_marginTop="@dimen/dp_25"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
@@ -17,7 +19,7 @@
             android:id="@+id/srl_refresh_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/color_f0f0f0">
+           >
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_list"
diff --git a/app/src/main/res/layout/dialog_mic_queue.xml b/app/src/main/res/layout/dialog_mic_queue.xml
index 72422a1bd..35c4121e6 100644
--- a/app/src/main/res/layout/dialog_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_mic_queue.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="450dp"
     android:layout_gravity="bottom"
-    android:background="@drawable/shape_white_top_14dp"
+    android:background="@drawable/bg_secondary_radius_15"
     android:clipToPadding="true"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
@@ -23,7 +23,7 @@
             android:ellipsize="marquee"
             android:gravity="center"
             android:singleLine="true"
-            android:textColor="@color/color_999999"
+            android:textColor="@color/text_title_white"
             android:textSize="14sp" />
 
         <View
@@ -32,7 +32,7 @@
             android:layout_gravity="bottom"
             android:layout_marginStart="@dimen/dp_15"
             android:layout_marginEnd="@dimen/dp_15"
-            android:background="@color/color_F4F4F4" />
+            android:background="@color/line_353548" />
 
     </FrameLayout>
 
@@ -56,10 +56,12 @@
                 android:layout_height="match_parent" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        <FrameLayout
+        <LinearLayout
             android:id="@+id/ll_no_data_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
             tools:visibility="visible">
 
             <ImageView
@@ -72,15 +74,14 @@
                 android:id="@+id/tv_no_data_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_20"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="220dp"
                 android:gravity="center"
-                android:lineSpacingMultiplier="1.5"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="12dp"
                 tools:text="@string/manager_no_mic_queue_tip" />
 
-        </FrameLayout>
+        </LinearLayout>
     </FrameLayout>
 
     <LinearLayout
@@ -99,7 +100,7 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="center"
-            android:background="@drawable/shape_app_color_20dp_round"
+            android:background="@drawable/bg_common_confirm"
             android:gravity="center"
             android:singleLine="true"
             android:textColor="@color/color_white"
diff --git a/app/src/main/res/layout/dialog_pk_mic_queue.xml b/app/src/main/res/layout/dialog_pk_mic_queue.xml
index 573356c00..e3527a92b 100644
--- a/app/src/main/res/layout/dialog_pk_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_pk_mic_queue.xml
@@ -9,7 +9,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="457dp"
-        android:background="@drawable/shape_pk_mic_queue_dialog_bg"
+        android:background="@drawable/bg_secondary_radius_15"
         android:orientation="vertical">
 
         <FrameLayout
@@ -26,7 +26,7 @@
                 android:ellipsize="marquee"
                 android:gravity="center"
                 android:singleLine="true"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_title_white"
                 android:textSize="14sp" />
 
 
@@ -34,7 +34,7 @@
                 android:layout_gravity="bottom"
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:background="@color/color_ebebeb" />
+                android:background="@color/line_353548" />
         </FrameLayout>
 
 
@@ -56,11 +56,13 @@
                     android:layout_height="match_parent" />
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-            <FrameLayout
+            <LinearLayout
                 android:id="@+id/ll_no_data_container"
                 android:layout_width="match_parent"
                 android:layout_height="340dp"
                 android:layout_gravity="center"
+                android:orientation="vertical"
+                android:gravity="center"
                 tools:visibility="visible">
 
                 <ImageView
@@ -71,17 +73,16 @@
 
                 <TextView
                     android:id="@+id/tv_no_data_tip"
-                    android:layout_marginTop="220dp"
+                    android:layout_marginTop="20dp"
                     android:layout_gravity="center_horizontal"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:lineSpacingMultiplier="1.5"
-                    android:textColor="@color/color_999999"
+                    android:textColor="@color/text_normal_c6c6e9"
                     android:textSize="12dp"
                     tools:text="@string/no_mic_queue_tip" />
 
-            </FrameLayout>
+            </LinearLayout>
         </FrameLayout>
 
         <FrameLayout
@@ -139,9 +140,9 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:singleLine="true"
-                android:textColor="@color/color_333333"
+                android:textColor="@color/text_secondary_4f516a"
                 android:textSize="16sp"
-                android:background="@drawable/shape_dbdbdb_corner"
+                android:background="@drawable/bg_common_disable"
                 android:text="@string/cancel_mic_queue"
                 android:visibility="gone" />
 
@@ -154,7 +155,7 @@
                 android:singleLine="true"
                 android:textColor="@color/color_FFFFFF"
                 android:textSize="16sp"
-                android:background="@drawable/shape_appcolor_corner"
+                android:background="@drawable/bg_common_confirm"
                 android:text="@string/invite_to_mic_queue"
                 android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/dialog_pk_select_people.xml b/app/src/main/res/layout/dialog_pk_select_people.xml
index 5aa7e2196..7cbe6a834 100644
--- a/app/src/main/res/layout/dialog_pk_select_people.xml
+++ b/app/src/main/res/layout/dialog_pk_select_people.xml
@@ -18,9 +18,9 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
         android:gravity="center"
-        android:background="@drawable/bg_binding_button"
+        android:background="@drawable/bg_common_confirm"
         android:text="@string/ok"
-        android:textColor="@color/color_FFFFFF"
+        android:textColor="@color/text_title_white"
         android:textSize="15dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_record_for_pk.xml b/app/src/main/res/layout/item_record_for_pk.xml
index 31d8251db..e8d1e7289 100644
--- a/app/src/main/res/layout/item_record_for_pk.xml
+++ b/app/src/main/res/layout/item_record_for_pk.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/color_FFFFFF"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:background="@color/bg_normal_1c1b22">
 
     <View
         android:layout_width="match_parent"
@@ -33,8 +33,8 @@
 
                 <LinearLayout
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:orientation="vertical">
 
                     <TextView
@@ -59,16 +59,16 @@
                 </LinearLayout>
 
                 <View
-                    android:layout_marginLeft="7dp"
-                    android:layout_marginRight="7dp"
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
+                    android:layout_marginLeft="7dp"
+                    android:layout_marginRight="7dp"
                     android:background="@mipmap/div_pk_record" />
 
                 <LinearLayout
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:orientation="vertical">
 
                     <TextView
@@ -122,8 +122,8 @@
 
                 <LinearLayout
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:orientation="vertical">
 
                     <TextView
@@ -148,16 +148,16 @@
                 </LinearLayout>
 
                 <View
-                    android:layout_marginLeft="7dp"
-                    android:layout_marginRight="7dp"
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
+                    android:layout_marginLeft="7dp"
+                    android:layout_marginRight="7dp"
                     android:background="@mipmap/div_pk_record" />
 
                 <LinearLayout
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:orientation="vertical">
 
                     <TextView
@@ -217,7 +217,7 @@
                 android:background="@drawable/bg_pk_record_loser"
                 android:gravity="center_horizontal"
                 android:lines="1"
-                android:textColor="@color/color_FFFFFF"
+                android:textColor="@color/text_title_white"
                 android:textSize="13sp"
                 tools:text="胜利" />
 
@@ -235,7 +235,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:lines="1"
-                android:textColor="@color/color_333333"
+                android:textColor="@color/text_title_white"
                 android:textSize="13sp"
                 tools:text="@string/vote_type_gift_value" />
 
@@ -246,7 +246,7 @@
                 android:layout_marginTop="5dp"
                 android:gravity="center"
                 android:lines="2"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_secondary_4f516a"
                 android:textSize="12sp"
                 tools:text="2018-12-12\n21:28:32" />
 
@@ -276,7 +276,7 @@
                 android:background="@drawable/bg_pk_record_loser"
                 android:gravity="center_horizontal"
                 android:lines="1"
-                android:textColor="@color/color_FFFFFF"
+                android:textColor="@color/text_title_white"
                 android:textSize="13sp"
                 tools:text="胜利" />