From ecf3a94b644244bece33b08e46ecbebdd53e8bdc Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Thu, 17 Nov 2022 13:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E5=8A=A0=E8=BD=BD=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=BD=91=E5=9D=80?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                                 | 4 ++--
 .../main/java/com/yunbao/live/activity/ZhuangBanActivity.java | 2 +-
 .../main/java/com/yunbao/live/views/LiveRoomViewHolder.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.gradle b/config.gradle
index 8affa5db3..74c89ff01 100644
--- a/config.gradle
+++ b/config.gradle
@@ -10,9 +10,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/java/com/yunbao/live/activity/ZhuangBanActivity.java b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
index aeeb384a9..c71978e9d 100644
--- a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
@@ -152,7 +152,7 @@ public class ZhuangBanActivity extends AbsActivity {
                 // 这个方法在6.0才出现
                 int statusCode = errorResponse.getStatusCode();
                 if (404 == statusCode || 500 == statusCode) {
-                    if ( !request.getUrl().toString().contains("favicon.png")){
+                    if ( !request.getUrl().toString().contains("favicon")){
                         htmlError.setVisibility(View.VISIBLE);
                         htmlError.setText("errorCode:" + statusCode +"\n failingUrl:" + request.getUrl());
                     }
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 377963eee..0e560dd2f 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1243,7 +1243,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                             htmlUrl.append(CommonAppConfig.HOST)
                                                     .append("/")
                                                     .append(bean.getModel().getActivityUrl())
-                                                    .append("&nickname=")
+                                                    .append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=")
                                                     .append(userInfo.getUserNicename())
                                                     .append("&token=")
                                                     .append(userInfo.getToken())