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 micQueue = AvRoomDataManager.get().mMicQueueMemberMap;