yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.微信登录AppSecret修改

Browse Source 
2.PK模式处理RoomPkData = 3的情况
This commit is contained in:
huangjian
2020-12-21 18:01:03 +08:00
parent 6b06b9162c
commit 2234726c19
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/assets/ShareSDK.xml
View File

@@ -67,7 +67,7 @@
Id="4" Id="4"
SortId="4" SortId="4"
AppId="wx0592154beefb4358" AppId="wx0592154beefb4358"
AppSecret="75fb2703151a37d154e3be361f36dc7c" AppSecret="2cfc032dc2e77eb635e1ae7e733bf84f"
UserName="gh_afb25ac019c9" UserName="gh_afb25ac019c9"
Path="pages/index/index.html?id=1" Path="pages/index/index.html?id=1"
BypassApproval="false" BypassApproval="false"
@@ -77,7 +77,7 @@
Id="5" Id="5"
SortId="5" SortId="5"
AppId="wx0592154beefb4358" AppId="wx0592154beefb4358"
AppSecret="75fb2703151a37d154e3be361f36dc7c" AppSecret="2cfc032dc2e77eb635e1ae7e733bf84f"
BypassApproval="false" BypassApproval="false"
Enable="true" /> Enable="true" />
@@ -85,7 +85,7 @@
Id="6" Id="6"
SortId="6" SortId="6"
AppId="wx0592154beefb4358" AppId="wx0592154beefb4358"
AppSecret="75fb2703151a37d154e3be361f36dc7c" AppSecret="2cfc032dc2e77eb635e1ae7e733bf84f"
BypassApproval="false" BypassApproval="false"
Enable="true" /> Enable="true" />

3
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
View File

@@ -319,7 +319,8 @@ public class PkModel extends BaseModel implements IPkModel {
private void setCurPkInfo(RoomPkData curPkInfo) { private void setCurPkInfo(RoomPkData curPkInfo) {
this.curPkInfo = 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(); pkMemberInfoList.clear();
//从麦序上获取同步队伍信息 //从麦序上获取同步队伍信息
SparseArray<RoomQueueInfo> micQueue = AvRoomDataManager.get().mMicQueueMemberMap; SparseArray<RoomQueueInfo> micQueue = AvRoomDataManager.get().mMicQueueMemberMap;