From 7b2780f071409a81a88bd7e575de9c7afe77aaae Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 17 Dec 2021 18:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=A1=B5UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/widget/GiftEffectView.java   |  4 +--
 .../yizhuan/erban/ui/pay/ChargeActivity.java  | 33 ++++++++++++-------
 .../color_selector_app_color_false_white.xml  |  2 +-
 app/src/main/res/layout/activity_charge.xml   |  6 ++--
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
index 9e419982f..34cb01054 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
@@ -132,10 +132,10 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
                     ImageLoadUtils.loadAvatar(receiverAvatar.getContext(), giftReceiver.getAvatar(), receiverAvatar);
                     receiverNick.setText(giftReceiver.getNick());
                 } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_ALL) {
-                    receiverAvatar.setImageResource(R.mipmap.app_logo);
+                    receiverAvatar.setImageResource(R.drawable.about_logo);
                     receiverNick.setText("全麦");
                 } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_MULTI) {
-                    receiverAvatar.setImageResource(R.mipmap.app_logo);
+                    receiverAvatar.setImageResource(R.drawable.about_logo);
                     StringBuilder sb = new StringBuilder();
                     for (GiftReceiver targetUser : giftEffectInfo.getTargetUsers()) {
                         RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByAccount(targetUser.getUid() + "");
diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
index 7b26307d0..af5801e60 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
@@ -67,7 +67,14 @@ import io.reactivex.schedulers.Schedulers;
  */
 public class ChargeActivity extends BaseActivity {
 
+    public static final int ALI_PAY_CLOSE = 1;
+    public static final int WX_PAY_CLOSE = 2;
+    public static final int ALI_PAY_OPEN = 3;
+    public static final int WX_PAY_OPEN = 4;
     private static final String TAG = "ChargeActivity";
+    private final int BINDCODE_GOLD = 200;
+    List<ChargeBean> mBigList;
+    List<ChargeBean> mList;
     private TextView mTv_gold;
     private LinearLayout ll_type_first;
     private ImageView iv_sel_first;
@@ -82,22 +89,10 @@ public class ChargeActivity extends BaseActivity {
     private ChargeAdapter mChargeAdapter;
     private TextView tvAgreement;
     private LinearLayout ll_more;
-
     private ChargeBean mSelectChargeBean;
-    List<ChargeBean> mBigList;
-    List<ChargeBean> mList;
     private int mListSize;
-
     private volatile String payChannel = Constants.CHARGE_WX;
-
-  public static final int ALI_PAY_CLOSE = 1;
-  public static final int WX_PAY_CLOSE = 2;
-  public static final int ALI_PAY_OPEN = 3;
-  public static final int WX_PAY_OPEN = 4;
-
     private boolean mIsFromH5;
-
-    private final int BINDCODE_GOLD = 200;
     private CompositeDisposable compositeDisposable = new CompositeDisposable();
 
     public static void start(Context context) {
@@ -133,6 +128,20 @@ public class ChargeActivity extends BaseActivity {
         initiate();
     }
 
+    @Override
+    public void initWhiteTitleBar(String title) {
+        mTitleBar = findViewById(R.id.title_bar);
+        if (mTitleBar != null) {
+            mTitleBar.setTitle(title);
+            mTitleBar.setImmersive(false);
+            mTitleBar.setTitleColor(getResources().getColor(R.color.white));
+            mTitleBar.setLeftImageResource(R.drawable.arrow_left_white);
+            mTitleBar.setCommonBackgroundColor(getResources().getColor(R.color.transparent));
+            mTitleBar.setLeftClickListener(v -> onLeftClickListener());
+        }
+    }
+
+
     private void setListener() {
         ll_more.setOnClickListener(v -> hideMoreButton());
         tvCharge.setOnClickListener(v -> {
diff --git a/app/src/main/res/color/color_selector_app_color_false_white.xml b/app/src/main/res/color/color_selector_app_color_false_white.xml
index c9cf5c0bc..5e17a2351 100644
--- a/app/src/main/res/color/color_selector_app_color_false_white.xml
+++ b/app/src/main/res/color/color_selector_app_color_false_white.xml
@@ -3,6 +3,6 @@
 
     <item android:color="@color/app_248cfe" android:state_selected="true" />
 
-    <item android:color="@color/white" />
+    <item android:color="@color/color_333333" />
 
 </selector>
diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml
index 341e92702..7a3f29e8a 100644
--- a/app/src/main/res/layout/activity_charge.xml
+++ b/app/src/main/res/layout/activity_charge.xml
@@ -19,9 +19,9 @@
     <com.yizhuan.erban.base.TitleBar
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
-        android:layout_marginTop="@dimen/dp_25"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"/>
+        android:layout_marginTop="@dimen/dp_25"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
     <TextView
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:text="我的钻石"
         android:textSize="@dimen/dp_13"
-        android:textColor="@color/text_title_white"
+        android:textColor="@color/white"
         android:drawableStart="@mipmap/ic_charge_diamond"
         android:drawablePadding="@dimen/dp_4"
         android:layout_below="@id/title_bar"