From 2234726c19c6d4a88845a73c79c33aac3843b272 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Mon, 21 Dec 2020 18:01:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95AppSecret?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=202.PK=E6=A8=A1=E5=BC=8F=E5=A4=84=E7=90=86Ro?=
 =?UTF-8?q?omPkData=20=3D=203=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/ShareSDK.xml                            | 6 +++---
 .../yizhuan/xchat_android_core/room/pk/model/PkModel.java   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/assets/ShareSDK.xml b/app/src/main/assets/ShareSDK.xml
index e41755fba..4fcef5eae 100644
--- a/app/src/main/assets/ShareSDK.xml
+++ b/app/src/main/assets/ShareSDK.xml
@@ -67,7 +67,7 @@
         Id="4"
         SortId="4"
 		AppId="wx0592154beefb4358"
-		AppSecret="75fb2703151a37d154e3be361f36dc7c"
+		AppSecret="2cfc032dc2e77eb635e1ae7e733bf84f"
 		UserName="gh_afb25ac019c9"
 		Path="pages/index/index.html?id=1"
         BypassApproval="false"
@@ -77,7 +77,7 @@
         Id="5"
         SortId="5"
         AppId="wx0592154beefb4358"
-        AppSecret="75fb2703151a37d154e3be361f36dc7c"
+        AppSecret="2cfc032dc2e77eb635e1ae7e733bf84f"
         BypassApproval="false"
         Enable="true" />
         
@@ -85,7 +85,7 @@
         Id="6"
         SortId="6"
         AppId="wx0592154beefb4358"
-        AppSecret="75fb2703151a37d154e3be361f36dc7c"
+        AppSecret="2cfc032dc2e77eb635e1ae7e733bf84f"
 		BypassApproval="false"
         Enable="true" />
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
index f95998ed3..21af3414e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
@@ -319,7 +319,8 @@ public class PkModel extends BaseModel implements IPkModel {
 
     private void setCurPkInfo(RoomPkData curPkInfo) {
         this.curPkInfo = curPkInfo;
-        if (curPkInfo.getPkStatus() == RoomPkData.PK_STATUS_BEFORE_PK) {
+        if (curPkInfo.getPkStatus() == RoomPkData.PK_STATUS_BEFORE_PK ||
+                curPkInfo.getPkStatus() == RoomPkData.PK_STATUS_AFTER_PK) {
             pkMemberInfoList.clear();
             //从麦序上获取同步队伍信息
             SparseArray<RoomQueueInfo> micQueue = AvRoomDataManager.get().mMicQueueMemberMap;