Commit 9af4760a by 霍志良

feat:修复绑定QQ偶尔一直转圈的问题。群聊名字修改

parent 7f27cb30
...@@ -18,13 +18,10 @@ import com.ydl.ydlcommon.bean.StatusBarOptions ...@@ -18,13 +18,10 @@ import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.data.http.RxUtils import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil import com.yidianling.common.tools.ToastUtil
import com.yidianling.im.R import com.yidianling.im.R
import com.yidianling.im.api.event.ImLogoutEvent import com.yidianling.im.api.event.ImLogoutEvent
import com.yidianling.im.api.event.UpdateBottomBarUnreadNumEvent import com.yidianling.im.api.event.UpdateBottomBarUnreadNumEvent
import com.yidianling.im.bridge.P2PCustomActionHandlerImpl
import com.yidianling.im.config.constants.ImConstants
import com.yidianling.im.event.MessageListRefreshEvent import com.yidianling.im.event.MessageListRefreshEvent
import com.yidianling.im.event.ReQureyUnreadNum import com.yidianling.im.event.ReQureyUnreadNum
import com.yidianling.im.event.UpdateTabUnreadNumEvent import com.yidianling.im.event.UpdateTabUnreadNumEvent
...@@ -41,7 +38,7 @@ import com.yidianling.im.ui.page.fragment.bean.UnreadMessageBean ...@@ -41,7 +38,7 @@ import com.yidianling.im.ui.page.fragment.bean.UnreadMessageBean
import com.yidianling.im.ui.page.popupWindow.ChatSettingPopupWindow import com.yidianling.im.ui.page.popupWindow.ChatSettingPopupWindow
import com.yidianling.im.ui.param.ClearMessageParam import com.yidianling.im.ui.param.ClearMessageParam
import com.yidianling.im.ui.param.UnreadParam import com.yidianling.im.ui.param.UnreadParam
import com.yidianling.uikit.api.NimUIKit import com.yidianling.uikit.business.team.activity.AdvancedTeamInfoActivity
import de.greenrobot.event.EventBus import de.greenrobot.event.EventBus
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
...@@ -357,6 +354,7 @@ class NewMultiMessageFragment : BaseFragment() { ...@@ -357,6 +354,7 @@ class NewMultiMessageFragment : BaseFragment() {
// } // }
// NimUIKit.startYDLChatting(context,"4597318766",SessionTypeEnum.Team,null,null,null) // NimUIKit.startYDLChatting(context,"4597318766",SessionTypeEnum.Team,null,null,null)
SessionHelper.startTeamSession(context,"4621534238") SessionHelper.startTeamSession(context,"4621534238")
// AdvancedTeamInfoActivity.start(context, "4621534238")
} }
} }
/** /**
......
...@@ -216,7 +216,9 @@ public class YDLTeamMessageActivity extends YDLBaseMessageActivity { ...@@ -216,7 +216,9 @@ public class YDLTeamMessageActivity extends YDLBaseMessageActivity {
team = d; team = d;
fragment.setTeam(team); fragment.setTeam(team);
setTitle(team == null ? sessionId : team.getName() + "(" + team.getMemberCount() + "人)"); //暂时去掉群聊人数标题
// setTitle(team == null ? sessionId : team.getName() + "(" + team.getMemberCount() + "人)");
setTitle(team == null ? sessionId : team.getName() );
invalidTeamTipText.setText(team.getType() == TeamTypeEnum.Normal ? R.string.im_normal_team_invalid_tip : R.string.im_team_invalid_tip); invalidTeamTipText.setText(team.getType() == TeamTypeEnum.Normal ? R.string.im_normal_team_invalid_tip : R.string.im_team_invalid_tip);
invalidTeamTipView.setVisibility(team.isMyTeam() ? View.GONE : View.VISIBLE); invalidTeamTipView.setVisibility(team.isMyTeam() ? View.GONE : View.VISIBLE);
......
...@@ -320,6 +320,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick ...@@ -320,6 +320,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
return; return;
} }
userHttp.bindQQ(new BindQQ(map.get("openid"), map.get("unionid"))) userHttp.bindQQ(new BindQQ(map.get("openid"), map.get("unionid")))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(o -> { .subscribe(o -> {
dismissProgressDialog(); dismissProgressDialog();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment