app_logo替换,UI整体调整

2023-03-14 17:41:25 +08:00
parent ac2f16f308
commit abbe516b3a
45 changed files with 114 additions and 130 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -404,7 +404,7 @@
                <data
                    android:host="com.huawei.codelabpush"
                    android:path="/deeplink"
-                    android:scheme="yinyoupushscheme" />
+                    android:scheme="yinmengpushscheme" />
            </intent-filter>
        </activity>

@@ -461,7 +461,7 @@
                <!-- 此处scheme值需要替换为后台设置中的scheme值 -->
                <data
                    android:host="linkedme"
-                    android:scheme="yinmengapp" />
+                    android:scheme="yinmengnnbc" />

                <action android:name="android.intent.action.VIEW" />

--- a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java
@@ -140,10 +140,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.drawable.about_logo);
+                    receiverAvatar.setImageResource(R.mipmap.app_logo);
                    receiverNick.setText("全麦");
                } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_MULTI) {
-                    receiverAvatar.setImageResource(R.drawable.about_logo);
+                    receiverAvatar.setImageResource(R.mipmap.app_logo);
                    StringBuilder sb = new StringBuilder();
                    for (GiftReceiver targetUser : giftEffectInfo.getTargetUsers()) {
                        RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByAccount(targetUser.getUid() + "");
--- a/app/src/main/java/com/nnbc123/app/base/BaseActivity.java
+++ b/app/src/main/java/com/nnbc123/app/base/BaseActivity.java
@@ -214,7 +214,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
        if (mTitleBar != null) {
            mTitleBar.setTitle(title);
            mTitleBar.setImmersive(false);
-            mTitleBar.setTitleColor(getResources().getColor(R.color.back_font));
+            mTitleBar.setTitleColor(getResources().getColor(R.color.text_normal_282828));
            mTitleBar.setLeftImageResource(R.drawable.arrow_left);
            mTitleBar.setCommonBackgroundColor(getResources().getColor(R.color.transparent));
            mTitleBar.setLeftClickListener(v -> onLeftClickListener());
@@ -238,7 +238,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
        if (mTitleBar != null) {
            mTitleBar.setTitle(title);
            mTitleBar.setImmersive(false);
-            mTitleBar.setTitleColor(getResources().getColor(R.color.back_font));
+            mTitleBar.setTitleColor(getResources().getColor(R.color.text_normal_282828));
            mTitleBar.setLeftImageResource(R.drawable.arrow_left);
            mTitleBar.setLeftClickListener(v -> onLeftClickListener());
            // action
@@ -260,17 +260,9 @@ public abstract class BaseActivity extends RxAppCompatActivity
     * 设置沉浸式状态栏
     */
    protected void setStatusBar() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            //透明状态栏
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            //透明导航栏
-//            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        }
-        // create our manager instance after the content view is set
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
        SystemBarTintManager tintManager = new SystemBarTintManager(this);
-        // enable status bar tint
        tintManager.setStatusBarTintEnabled(true);
-        // enable navigation bar tint
        tintManager.setNavigationBarTintEnabled(true);
        tintManager.setTintColor(Color.parseColor("#00000000"));
    }
@@ -281,17 +273,12 @@ public abstract class BaseActivity extends RxAppCompatActivity
     * @param isDark true:黑色
     */
    public void StatusBarLightModes(boolean isDark) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            getWindow().setStatusBarColor(getResources().getColor(R.color.white));
-        }
-
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (isDark) {
-                    getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-                } else {
-                    getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-                }
+        getWindow().setStatusBarColor(getResources().getColor(R.color.white));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (isDark) {
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            } else {
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
            }
        }
    }
--- a/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt
+++ b/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt
@@ -1,7 +1,6 @@
 package com.nnbc123.app.home.fragment

 import android.os.Bundle
-import android.view.Gravity
 import android.widget.TextView
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -13,14 +12,14 @@ import com.nnbc123.app.avroom.adapter.RoomVPAdapter
 import com.nnbc123.app.base.BaseFragment
 import com.nnbc123.app.databinding.FragmentPartyBinding
 import com.nnbc123.app.home.HomeViewModel
+import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter
+import com.nnbc123.app.home.helper.BannerHelper
 import com.nnbc123.app.ui.widget.magicindicator.ViewPagerHelper
 import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
 import com.nnbc123.core.home.bean.HomeTagInfo
 import com.nnbc123.core.home.event.RefreshHomeDataEvent
 import com.nnbc123.core.statistic.StatisticManager
 import com.nnbc123.core.statistic.protocol.StatisticsProtocol
-import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter
-import com.nnbc123.app.home.helper.BannerHelper
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -82,10 +81,7 @@ class PartyFragment : BaseFragment(), MainMagicIndicatorAdapter.OnItemSelectList
        homeViewModel.getTagInfo()
    }

-    private fun onGetHomeTagSuccess(info: List<HomeTagInfo>) {
-        val tagInfoList = mutableListOf<HomeTagInfo>()
-        tagInfoList.add(HomeTagInfo("推荐"))
-        tagInfoList.addAll(info)
+    private fun onGetHomeTagSuccess(tagInfoList: List<HomeTagInfo>) {
        var changed = false
        val oldTabInfoList: List<CharSequence> = ArrayList<CharSequence>(mTabInfoList)
        for (tagInfo in tagInfoList) {
--- a/app/src/main/java/com/nnbc123/app/ui/im/fragment/MessageFragment.java
+++ b/app/src/main/java/com/nnbc123/app/ui/im/fragment/MessageFragment.java
@@ -395,7 +395,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
    private JSONObject hwField(IMMessage message) {
        Intent hwIntent = new Intent(Intent.ACTION_VIEW);
        String intentStr = String.format(
-                "yinyoupushscheme://com.huawei.codelabpush/deeplink?sessionID=%s&sessionType=%s",
+                "yinmengpushscheme://com.huawei.codelabpush/deeplink?sessionID=%s&sessionType=%s",
                sessionId, sessionType
        );
        hwIntent.putExtra("skiptype", PushMessageHandler.PAYLOAD_SKIPTYPE_PRIVATE_MSG);
--- a/app/src/main/res/drawable-xhdpi/about_logo.png
+++ b/app/src/main/res/drawable-xhdpi/about_logo.png
--- a/app/src/main/res/drawable-xhdpi/ic_gender_female.png
+++ b/app/src/main/res/drawable-xhdpi/ic_gender_female.png
--- a/app/src/main/res/drawable-xhdpi/ic_gender_male.png
+++ b/app/src/main/res/drawable-xhdpi/ic_gender_male.png
--- a/app/src/main/res/drawable/bg_common_cancel.xml
+++ b/app/src/main/res/drawable/bg_common_cancel.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <corners android:radius="100dp" />
-    <gradient
-        android:angle="180"
-        android:endColor="#CEEFFD"
-        android:startColor="#D2F4F4"
-        android:type="linear"
-        android:useLevel="true" />
+
+    <stroke
+        android:width="1dp"
+        android:color="#ffffe710" />
+    <solid android:color="#fffffacf" />
+
+    <corners android:radius="@dimen/dp_100" />
+
 </shape>
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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="match_parent"
@@ -10,15 +11,16 @@
        android:id="@+id/title_bar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_30"/>
+        android:layout_marginTop="@dimen/dp_30" />

-    <ImageView
+    <com.makeramen.roundedimageview.RoundedImageView
        android:id="@+id/img_about_logo"
        android:layout_width="77dp"
        android:layout_height="77dp"
        android:layout_centerHorizontal="true"
        android:layout_marginTop="89dp"
-        android:src="@drawable/about_logo"
+        android:src="@mipmap/app_logo"
+        app:riv_corner_radius="12dp"
        tools:ignore="ContentDescription" />


--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -75,7 +75,7 @@
        android:enabled="false"
        android:gravity="center"
        android:text="获取验证码"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/ll_account" />
--- a/app/src/main/res/layout/activity_binder_alipay.xml
+++ b/app/src/main/res/layout/activity_binder_alipay.xml
@@ -170,7 +170,7 @@
        android:background="@drawable/bg_common_confirm"
        android:clickable="true"
        android:text="确认绑定"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="@dimen/font_huge" />

    <Button
@@ -183,7 +183,7 @@
        android:background="@drawable/bg_common_confirm"
        android:clickable="true"
        android:text="确认绑定"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="@dimen/font_huge"
        android:visibility="gone" />

--- a/app/src/main/res/layout/activity_create_pk.xml
+++ b/app/src/main/res/layout/activity_create_pk.xml
@@ -440,7 +440,7 @@
            android:background="@drawable/bg_common_confirm"
            android:gravity="center"
            android:text="@string/ok"
-            android:textColor="@color/color_FFFFFF" />
+            android:textColor="@color/text_normal_282828" />


        <LinearLayout
@@ -460,7 +460,7 @@
                android:background="@drawable/bg_common_confirm"
                android:gravity="center"
                android:text="@string/recreate_pk"
-                android:textColor="@color/color_FFFFFF" />
+                android:textColor="@color/text_normal_282828" />


            <TextView
--- a/app/src/main/res/layout/activity_decoration_store.xml
+++ b/app/src/main/res/layout/activity_decoration_store.xml
@@ -86,7 +86,7 @@
            android:background="@drawable/bg_common_confirm"
            android:gravity="center"
            android:layout_marginEnd="15dp"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="12sp" />

    </LinearLayout>
--- a/app/src/main/res/layout/activity_modify_pwd.xml
+++ b/app/src/main/res/layout/activity_modify_pwd.xml
@@ -164,7 +164,7 @@
            android:clickable="true"
            android:onClick="@{click}"
            android:text="提交"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="@dimen/font_huge" />

        <TextView
--- a/app/src/main/res/layout/activity_reset_login_pwd.xml
+++ b/app/src/main/res/layout/activity_reset_login_pwd.xml
@@ -129,7 +129,7 @@
            android:gravity="center"
            android:onClick="@{click}"
            android:text="提交"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="15sp" />
    </LinearLayout>
 </layout>
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -49,7 +49,7 @@
            android:gravity="center"
            android:onClick="@{click}"
            android:text="点击进入更多精彩"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="18dp"
            android:visibility="gone" />
    </FrameLayout>
--- a/app/src/main/res/layout/activity_wish_list_create.xml
+++ b/app/src/main/res/layout/activity_wish_list_create.xml
@@ -66,7 +66,7 @@
        android:background="@drawable/bg_common_confirm"
        android:gravity="center"
        android:text="确认创建"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="14sp" />


--- a/app/src/main/res/layout/dialog_attention_hint.xml
+++ b/app/src/main/res/layout/dialog_attention_hint.xml
@@ -54,7 +54,7 @@
        android:layout_marginBottom="22dp"
        android:gravity="center"
        android:text="＋ 关注"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="15sp"
        android:textStyle="bold" />

--- a/app/src/main/res/layout/dialog_bind_success.xml
+++ b/app/src/main/res/layout/dialog_bind_success.xml
@@ -28,7 +28,7 @@
        android:layout_height="38dp"
        android:gravity="center"
        android:textSize="15sp"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:layout_marginTop="22dp"
        android:layout_marginBottom="22dp"
        android:background="@drawable/bg_common_confirm_normal"
--- a/app/src/main/res/layout/dialog_exit_room.xml
+++ b/app/src/main/res/layout/dialog_exit_room.xml
@@ -126,7 +126,7 @@
            android:background="@drawable/bg_common_confirm"
            android:gravity="center"
            android:text="查看更多"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="15sp"
            android:visibility="gone" />

--- a/app/src/main/res/layout/dialog_family_join.xml
+++ b/app/src/main/res/layout/dialog_family_join.xml
@@ -72,7 +72,7 @@
            android:layout_weight="1"
            android:gravity="center"
            android:text="@string/text_ok"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:background="@drawable/bg_common_confirm"
            android:textSize="15sp"
            android:layout_marginEnd="5dp"
--- a/app/src/main/res/layout/dialog_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_mic_queue.xml
@@ -103,7 +103,7 @@
            android:background="@drawable/bg_common_confirm"
            android:gravity="center"
            android:singleLine="true"
-            android:textColor="@color/color_white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="16sp"
            android:visibility="gone"
            tools:text="@string/apply_mic_queue" />
--- a/app/src/main/res/layout/dialog_patriarch_mode.xml
+++ b/app/src/main/res/layout/dialog_patriarch_mode.xml
@@ -55,7 +55,7 @@
            android:paddingEnd="@dimen/dp_31"
            android:paddingBottom="@dimen/dp_12"
            android:text="@string/to_set_pm"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="@dimen/sp_14" />
    </LinearLayout>

@@ -70,4 +70,5 @@
        android:src="@drawable/icon_pm_close"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/dialog_pk_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_pk_mic_queue.xml
@@ -153,7 +153,7 @@
                android:layout_gravity="center"
                android:gravity="center"
                android:singleLine="true"
-                android:textColor="@color/color_FFFFFF"
+                android:textColor="@color/text_normal_282828"
                android:textSize="16sp"
                android:background="@drawable/bg_common_confirm"
                android:text="@string/invite_to_mic_queue"
--- a/app/src/main/res/layout/dialog_protocol_update.xml
+++ b/app/src/main/res/layout/dialog_protocol_update.xml
@@ -70,7 +70,7 @@
                android:background="@drawable/bg_common_confirm_normal"
                android:gravity="center"
                android:text="同意"
-                android:textColor="@color/white"
+                android:textColor="@color/text_normal_282828"
                android:textSize="@dimen/sp_14" />
        </LinearLayout>

--- a/app/src/main/res/layout/dialog_pub_room_shutup.xml
+++ b/app/src/main/res/layout/dialog_pub_room_shutup.xml
@@ -126,7 +126,7 @@
                    android:background="@drawable/bg_common_confirm"
                    android:gravity="center"
                    android:text="@string/text_ok"
-                    android:textColor="@color/white"
+                    android:textColor="@color/text_normal_282828"
                    android:textSize="15sp" />
            </LinearLayout>
        </RelativeLayout>
--- a/app/src/main/res/layout/dialog_recommend_room.xml
+++ b/app/src/main/res/layout/dialog_recommend_room.xml
@@ -58,7 +58,7 @@
            android:background="@drawable/bg_common_confirm"
            android:gravity="center"
            android:text="去看看"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:textSize="15sp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/dialog_room_pk_received.xml
+++ b/app/src/main/res/layout/dialog_room_pk_received.xml
@@ -125,7 +125,7 @@
            android:gravity="center"
            android:includeFontPadding="false"
            android:text="拒绝"
-            android:textColor="@color/white"
+            android:textColor="@color/text_secondary_878b9c"
            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -140,10 +140,11 @@
            android:gravity="center"
            android:includeFontPadding="false"
            android:text="接受"
-            android:textColor="#ffffffff"
+            android:textColor="@color/text_normal_282828"
            android:textSize="12sp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="@id/tv_refuse" />

    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </FrameLayout>
--- a/app/src/main/res/layout/dialog_select_pay_type.xml
+++ b/app/src/main/res/layout/dialog_select_pay_type.xml
@@ -119,7 +119,7 @@
        android:background="@drawable/bg_common_confirm"
        android:gravity="center"
        android:text="确认支付"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="15sp" />

 </LinearLayout>
--- a/app/src/main/res/layout/fragment_add_user_info.xml
+++ b/app/src/main/res/layout/fragment_add_user_info.xml
@@ -185,7 +185,7 @@
        android:layout_marginBottom="@dimen/dp_16"
        android:background="@drawable/bg_common_confirm"
        android:text="下一步"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="@dimen/sp_15"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/include_dialog_common_ok_cancel_btn.xml
+++ b/app/src/main/res/layout/include_dialog_common_ok_cancel_btn.xml
@@ -11,7 +11,7 @@
        android:layout_height="35dp"
        android:gravity="center"
        android:text="@string/cancel"
-        android:textColor="@color/color_4C5AF1"
+        android:textColor="@color/text_normal_282828"
        android:layout_marginEnd="@dimen/dp_18"
        android:background="@drawable/bg_common_cancel"
        android:textSize="15sp" />
@@ -22,7 +22,7 @@
        android:layout_height="35dp"
        android:gravity="center"
        android:text="@string/text_ok"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:background="@drawable/bg_common_confirm"
        android:textSize="15sp" />
 </LinearLayout>
--- a/app/src/main/res/layout/item_decoration_common.xml
+++ b/app/src/main/res/layout/item_decoration_common.xml
@@ -96,7 +96,7 @@
        android:gravity="center"
        android:includeFontPadding="false"
        android:text="购买"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="12sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@id/tv_send"
--- a/app/src/main/res/layout/item_decoration_user_card.xml
+++ b/app/src/main/res/layout/item_decoration_user_card.xml
@@ -115,7 +115,7 @@
        android:gravity="center"
        android:includeFontPadding="false"
        android:text="购买"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="12sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@id/tv_send"
--- a/app/src/main/res/mipmap-hdpi/app_logo.png
+++ b/app/src/main/res/mipmap-hdpi/app_logo.png
--- a/app/src/main/res/mipmap-xhdpi/app_logo.png
+++ b/app/src/main/res/mipmap-xhdpi/app_logo.png
--- a/app/src/main/res/mipmap-xxhdpi/app_logo.png
+++ b/app/src/main/res/mipmap-xxhdpi/app_logo.png
--- a/app/src/main/res/mipmap-xxxhdpi/app_logo.png
+++ b/app/src/main/res/mipmap-xxxhdpi/app_logo.png
--- a/app/src/module_community/res/layout/dialog_dating_select.xml
+++ b/app/src/module_community/res/layout/dialog_dating_select.xml
@@ -54,7 +54,7 @@
                android:background="@drawable/bg_common_cancel"
                android:gravity="center"
                android:text="@string/cancel"
-                android:textColor="@color/color_7154EE"
+                android:textColor="@color/text_normal_282828"
                android:textSize="15sp" />

            <TextView
@@ -64,7 +64,7 @@
                android:background="@drawable/bg_common_confirm"
                android:gravity="center"
                android:text="@string/text_ok"
-                android:textColor="@color/white"
+                android:textColor="@color/text_normal_282828"
                android:textSize="15sp" />
        </LinearLayout>

--- a/app/src/module_quick_pass/res/drawable/quick_pass_logo.png
+++ b/app/src/module_quick_pass/res/drawable/quick_pass_logo.png
--- a/app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
+++ b/app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
@@ -18,76 +18,72 @@
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:textSize="@dimen/dp_16"
-            android:text="邀请房间粉丝"
-            android:textColor="@color/text_title_282828"
-            android:textStyle="bold"
            android:layout_gravity="center_horizontal"
            android:layout_marginTop="@dimen/dp_20"
-            />
+            android:text="邀请房间粉丝"
+            android:textColor="@color/text_title_282828"
+            android:textSize="@dimen/dp_16"
+            android:textStyle="bold" />


-            <TextView
-                android:id="@+id/tv_invite_fans_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="确认邀请后会给收藏该房间的位用户发送提醒"
-                android:drawableStart="@drawable/shap_round_room_invite_des"
-                android:drawablePadding="8dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
-                android:textColor="@color/text_normal_282828"
-                android:textSize="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_25"
-                />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="每日发送次数不可超过5次"
-                android:drawableStart="@drawable/shap_round_room_invite_des"
-                android:drawablePadding="8dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
-                android:textColor="@color/text_normal_282828"
-                android:textSize="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_14"
-                />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="1小时内限发送一次邀请"
-                android:drawableStart="@drawable/shap_round_room_invite_des"
-                android:drawablePadding="8dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
-                android:textColor="@color/text_normal_282828"
-                android:layout_marginTop="@dimen/dp_14"
-                android:textSize="@dimen/dp_12"
-                />
+        <TextView
+            android:id="@+id/tv_invite_fans_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginEnd="30dp"
+            android:drawableStart="@drawable/shap_round_room_invite_des"
+            android:drawablePadding="8dp"
+            android:text="确认邀请后会给收藏该房间的位用户发送提醒"
+            android:textColor="@color/text_normal_282828"
+            android:textSize="@dimen/dp_12" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="@dimen/dp_14"
+            android:layout_marginEnd="30dp"
+            android:drawableStart="@drawable/shap_round_room_invite_des"
+            android:drawablePadding="8dp"
+            android:text="每日发送次数不可超过5次"
+            android:textColor="@color/text_normal_282828"
+            android:textSize="@dimen/dp_12" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="@dimen/dp_14"
+            android:layout_marginEnd="30dp"
+            android:drawableStart="@drawable/shap_round_room_invite_des"
+            android:drawablePadding="8dp"
+            android:text="1小时内限发送一次邀请"
+            android:textColor="@color/text_normal_282828"
+            android:textSize="@dimen/dp_12" />


        <TextView
            android:id="@+id/tv_invite_fans_confirm"
            android:layout_width="160dp"
            android:layout_height="38dp"
-            android:background="@drawable/bg_common_confirm"
-            android:textColor="@color/text_title_282828"
-            android:gravity="center"
-            android:layout_marginTop="@dimen/dp_35"
            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/dp_35"
+            android:background="@drawable/bg_common_confirm"
+            android:gravity="center"
            android:text="确认邀请"
-            />
+            android:textColor="@color/text_title_282828" />

        <TextView
            android:id="@+id/tv_invite_fans_times"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text=""
-            android:textSize="13dp"
-            android:textColor="@color/text_normal_282828"
            android:layout_gravity="center_horizontal"
            android:layout_marginTop="@dimen/dp_16"
-            />
+            android:text=""
+            android:textColor="@color/text_normal_282828"
+            android:textSize="13dp" />

    </LinearLayout>

--- a/app/src/module_room_chat/res/layout/activity_room_newbie_message.xml
+++ b/app/src/module_room_chat/res/layout/activity_room_newbie_message.xml
@@ -59,7 +59,7 @@
            android:text="发送"
            android:gravity="center"
            android:textSize="14sp"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
            android:background="@drawable/bg_common_confirm"
            android:layout_gravity="center_horizontal"
            android:layout_marginBottom="@dimen/dp_20"
--- a/app/src/module_room_chat/res/layout/dialog_newbie_filter.xml
+++ b/app/src/module_room_chat/res/layout/dialog_newbie_filter.xml
@@ -153,7 +153,7 @@
            android:background="@drawable/bg_common_confirm"
            android:gravity="center"
            android:text="确认修改"
-            android:textColor="#ffffffff"
+            android:textColor="@color/text_normal_282828"
            android:textSize="14sp" />

    </LinearLayout>
--- a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
+++ b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
@@ -92,7 +92,7 @@
        android:scaleType="center"
        android:background="@drawable/bg_common_confirm_normal"
        android:text="立即更新"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
        android:textSize="@dimen/dp_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="@+id/view_background"
--- a/app/src/module_upgrade_app/res/layout/dialog_update.xml
+++ b/app/src/module_upgrade_app/res/layout/dialog_update.xml
@@ -83,7 +83,7 @@
                android:background="@drawable/bg_common_confirm"
                android:text="立即更新"
                android:textAllCaps="false"
-                android:textColor="@android:color/white"
+                android:textColor="@color/text_normal_282828"
                android:textSize="14sp" />

        </LinearLayout>