From 18cf3c9ba38fa959bf9f11c07f091351bcf7d32f Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 26 Jul 2022 18:52:42 +0800
Subject: [PATCH] 11111

---
 config.gradle                                      |  4 ++--
 .../main/res/layout/rc_conversationlist_item.xml   |  8 ++++----
 .../com/yunbao/main/dialog/OneLoginDialog.java     | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config.gradle b/config.gradle
index 53e2161f5..eddca7244 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml
index 0ace63645..139eacb2f 100644
--- a/live/src/main/res/layout/rc_conversationlist_item.xml
+++ b/live/src/main/res/layout/rc_conversationlist_item.xml
@@ -33,21 +33,21 @@
             style="@style/TextStyle.Alignment"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/rc_margin_size_12"
+            android:layout_marginStart="15dp"
             android:layout_marginTop="@dimen/rc_margin_size_16"
             android:layout_marginEnd="@dimen/rc_margin_size_12"
             android:ellipsize="end"
             android:singleLine="true"
             android:text="张三"
             android:textColor="@color/rc_text_main_color"
-            android:textSize="@dimen/rc_font_secondary_size"
+            android:textSize="16sp"
             app:layout_constraintEnd_toStartOf="@+id/rc_conversation_date"
             app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
             app:layout_constraintTop_toTopOf="parent" />
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_marginStart="@dimen/rc_margin_size_12"
+            android:layout_marginStart="15dp"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             app:layout_constraintEnd_toEndOf="parent"
@@ -77,7 +77,7 @@
                 android:singleLine="true"
                 android:text="你好，朋友！"
                 android:textColor="@color/rc_secondary_color"
-                android:textSize="15dp" />
+                android:textSize="14sp" />
 
             <RelativeLayout
                 android:id="@+id/rc_conversation_unread"
diff --git a/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java b/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
index 397772b72..0dc794029 100644
--- a/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
+++ b/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
@@ -1,9 +1,6 @@
 package com.yunbao.main.dialog;
 
 import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -11,6 +8,8 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import com.adjust.sdk.Adjust;
 import com.adjust.sdk.AdjustEvent;
 import com.alibaba.fastjson.JSON;
@@ -30,9 +29,7 @@ import com.yunbao.live.bean.LiveBean;
 import com.yunbao.live.http.LiveHttpUtil;
 import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
-import com.yunbao.main.activity.EntryActivity;
 import com.yunbao.main.activity.MainActivity;
-import com.yunbao.main.activity.OneLoginActivity;
 
 import static com.yunbao.common.CommonAppContext.logger;
 import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
@@ -121,13 +118,16 @@ public class OneLoginDialog extends AbsDialogFragment {
                                                 @Override
                                                 public void onSuccess(int code, String msg, String[] info) {
                                                     dismiss();
-                                                    if (info[0]!=null) {
+                                                    if (info[0] != null) {
                                                         JSONObject obj = JSON.parseObject(info[0]);
                                                         MainActivity.forward(getContext(), false);
                                                         gotoLive(obj.getString("anchor_id"));
                                                         IMLoginManager.get(mContext).setisNewUserOne(true);
+                                                        if (obj.containsKey("home_zdy_pop")) {
+
+                                                        }
 //                                                        OneLoginActivity.act.finish();
-                                                    }else{
+                                                    } else {
                                                         MainActivity.forward(getContext(), false);
 //                                                        OneLoginActivity.act.finish();
                                                     }