diff --git a/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java b/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java index d334ab44e..7948f13ad 100644 --- a/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java +++ b/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java @@ -3,11 +3,8 @@ package com.yizhuan.erban.application; import android.app.Activity; import android.app.Application; import android.os.Bundle; -import android.util.Log; import com.yizhuan.erban.location.LocationManager; -import com.yizhuan.erban.module_hall.secretcode.PwdCodeMgr; -import com.yizhuan.erban.radish.signin.SignDialogTimeManager; import com.yizhuan.xchat_android_core.auth.AuthModel; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java index 9bedecc48..786b46fa6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java @@ -26,14 +26,14 @@ import com.yizhuan.xchat_android_core.user.UserModel; * @author chenran * @date 2017/10/3 */ -public class SearchAdapter extends BaseQuickAdapter { +public class SearchAdapter extends BaseQuickAdapter { private Context context; private int searchType; private int fromType; - public SearchAdapter(Context context, int searchType,int fromType) { + public SearchAdapter(Context context, int searchType, int fromType) { super(R.layout.list_item_search); this.context = context; this.searchType = searchType; @@ -48,16 +48,16 @@ public class SearchAdapter extends BaseQuickAdapter { UserInfoActivity.Companion.start(context, item.getUid()); }); - }else { - holder.userName.setText(item.getTitle() != null ? item.getTitle().replaceAll(RegexUtil.getNotPrintableStringReg(), "?"):""); + } else { + holder.userName.setText(item.getTitle() != null ? item.getTitle().replaceAll(RegexUtil.getNotPrintableStringReg(), "?") : ""); holder.tvOnlineNum.setVisibility(View.VISIBLE); - holder.tvOnlineNum.setText(item.getOnlineNum()+""); + holder.tvOnlineNum.setText(item.getOnlineNum() + ""); holder.container.setOnClickListener(v -> { StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SEARCH_INTO_RESULT_ROOM_CLICK, "搜索_进入结果房间"); AVRoomActivity.start(mContext, item.getUid()); diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java index bc62bd8dc..c5174bfa3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java @@ -48,6 +48,7 @@ public class SearchDetailFragment extends BaseMvpFragment() { @Override @@ -152,12 +155,12 @@ public class SearchDetailFragment extends BaseMvpFragment mTabs = new ArrayList<>(); - userFrg = SearchDetailFragment.newInstance(SearchDetailFragment.TYPE_SEARCH_USER,AbstractSelectFriendAction.TYPE_MODULE_HALL); + userFrg = SearchDetailFragment.newInstance(hallId,SearchDetailFragment.TYPE_SEARCH_USER,AbstractSelectFriendAction.TYPE_MODULE_HALL); mTabs.add(userFrg); ContactsIndicatorAdapter topMagicIndicatorAdapter = new ContactsIndicatorAdapter(this, mTabInfoList,0); topMagicIndicatorAdapter.setOnItemSelectListener(this); diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallSearchActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallSearchActivity.java index 7cf0c1068..deee58015 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallSearchActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallSearchActivity.java @@ -14,9 +14,10 @@ import com.yizhuan.erban.ui.search.SearchHallActivity; public class HallSearchActivity extends SearchHallActivity { - public static void start(Context context, int type) { + public static void start(Context context,long hallId, int type) { Intent intent = new Intent(context, HallSearchActivity.class); intent.putExtra(AbstractSelectFriendAction.KEY_TYPE, type); + intent.putExtra("hallId", hallId); context.startActivity(intent); } diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java index bbc5f365d..856b6654f 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java @@ -407,7 +407,7 @@ public class ModuleHallActivity extends BaseMvpActivity inviteMember(long targetUid) { - return api.invite(AuthModel.get().getCurrentUid(), targetUid) + public Single inviteMember(long hallId, long targetUid) { + return api.invite(hallId, AuthModel.get().getCurrentUid(), targetUid) .compose(RxHelper.handleSchAndExce()) .flatMap(result -> { if (result.isSuccess()) { @@ -449,7 +449,8 @@ public class HallModel extends BaseModel implements IHallModel { */ @FormUrlEncoded @POST("/hall/invite") - Single> invite(@Field("uid") long uid, + Single> invite(@Field("hallId") long hallId, + @Field("uid") long uid, @Field("targetUid") long targetUid); /** diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java index d4186f1ce..1b073a8f6 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java @@ -66,7 +66,7 @@ public interface IHallModel { /** * 高管邀请成员加入 */ - Single inviteMember(long targetUid); + Single inviteMember(long hallId,long targetUid); Single getOwnerHallInfo(long targetUid);