moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]降回trtc和私聊功能

Browse Source
This commit is contained in:
wushaocheng
2023-02-24 11:09:00 +08:00
parent 5a5a8f0031
commit 49092dcaae
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java
View File

@@ -15,7 +15,7 @@ import com.yizhuan.erban.decoration.helper.DecorationHelper;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.module_hall.hall.activity.HallSearchActivity;
import com.yizhuan.erban.module_hall.team.activity.HallTeamMessageActivity;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.im.friend.FriendFragmentCpDelegate;
import com.yizhuan.erban.ui.search.presenter.SearchPresenter;
import com.yizhuan.erban.ui.search.view.ISearchView;
@@ -124,7 +124,7 @@ public class SearchDetailFragment extends BaseMvpFragment<ISearchView, SearchPre
if (item.getHallBtnStatus() == 5) {
toast(getString(R.string.invite_has_been_send));
} else if (item.getHallBtnStatus() == 6) {
HallTeamMessageActivity.start(mContext, String.valueOf(item.getHallRecordId()));
NimP2PMessageActivity.start(mContext, String.valueOf(item.getHallMessageUid()));
} else if (item.getHallBtnStatus() == 4) {
showSureDialog(item.getUid() + "", item.getAvatar(), item.getNick());
}

3
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt
View File

@@ -28,7 +28,6 @@ import com.yizhuan.xchat_android_core.utils.net.BeanObserver
import com.yizhuan.xchat_android_core.utils.net.RxHelper
import com.yizhuan.xchat_android_library.utils.ResUtil
class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomBinding>() {
companion object {
@@ -114,7 +113,7 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
return@let
}
if (it.hallBtnStatus == 3){
HallTeamMessageActivity.start(mContext, bean.hallRecordId.toString())
HallTeamMessageActivity.start(mContext, bean.hallMessageUid.toString())
return@let
}
dialogManager.showProgressDialog(context)

9
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java
View File

@@ -4,16 +4,17 @@ import lombok.Data;
@Data
public class HallListInfo {
private Long hallId;
private long hallId;
private String hallName;
private Long clanId;
private long clanId;
private int roleType;
private Long ownerUid;
private long ownerUid;
private String ownerNick;
private String ownerAvatar;
private Integer memberCount;
private Long ownerErbanNo;
private long ownerErbanNo;
private Double roomIncome;
private int hallBtnStatus;//0=不显示 1=可申请 2=待审核 3通过邀请
private int hallRecordId;//通过邀请时的邀请记录id
private long hallMessageUid;//联系人id
}

5
core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java
View File

@@ -61,6 +61,7 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
private int hallBtnStatus;//0不显示，4可邀请，5待通过，6通过申请
private int hallRecordId;//当hallBtnStatus=6时返回申请记录Id
private long hallMessageUid;//联系人id
public SearchRoomInfo() {
}
@@ -80,7 +81,7 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
hallBtnStatus = in.readInt();
hallRecordId = in.readInt();
hallMessageUid = in.readLong();
}
@@ -99,7 +100,7 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt
dest.writeInt(hallBtnStatus);
dest.writeInt(hallRecordId);
dest.writeLong(hallMessageUid);
}
public String getNick() {

BIN
trtc_release/LiteAVSDK_TRTC_10.3.0.11248.aar
View File

Binary file not shown.

2
trtc_release/build.gradle
View File

@@ -1,2 +1,2 @@
configurations.maybeCreate("default")
artifacts.add("default", file('LiteAVSDK_TRTC_10.3.0.11248.aar'))
artifacts.add("default", file('LiteAVSDK_TRTC_9.9.0.26402.aar'))