Commit 626078d0 by 霍志良

feat:修复当对方发消息时,键盘收起情况

parent 815485a1
...@@ -20,9 +20,9 @@ import java.util.List; ...@@ -20,9 +20,9 @@ import java.util.List;
public final class DemoGlobalConfig implements IConfigModule { public final class DemoGlobalConfig implements IConfigModule {
String APP_DOMAIN = "https://api.github.com/"; String APP_DOMAIN = "https://api.github.com/";
// public static String appEnv = YDLConstants.ENV_AUTO_TEST; // public static String appEnv = YDLConstants.ENV_AUTO_TEST;
public static String appEnv = YDLConstants.ENV_TEST; // public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库 // public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
// public static String appEnv = YDLConstants.ENV_PROD; public static String appEnv = YDLConstants.ENV_PROD;
@Override @Override
public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) { public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
......
...@@ -10,7 +10,7 @@ ext { ...@@ -10,7 +10,7 @@ ext {
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.61.42", "m-user" : "0.0.61.42",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.19.76", "m-im" : "0.0.19.77",
"m-dynamic" : "0.0.7.29", "m-dynamic" : "0.0.7.29",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
...@@ -93,7 +93,7 @@ ext { ...@@ -93,7 +93,7 @@ ext {
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.61.42", "m-user" : "0.0.61.42",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.19.76", "m-im" : "0.0.19.77",
"m-dynamic" : "0.0.7.29", "m-dynamic" : "0.0.7.29",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
......
...@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; ...@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
import com.netease.nimlib.sdk.msg.attachment.MsgAttachmentParser; import com.netease.nimlib.sdk.msg.attachment.MsgAttachmentParser;
import com.ydl.ydlcommon.utils.LogUtil;
/** /**
* Created by zhoujianghua on 2015/4/9. * Created by zhoujianghua on 2015/4/9.
...@@ -21,7 +20,6 @@ public class CustomAttachParser implements MsgAttachmentParser { ...@@ -21,7 +20,6 @@ public class CustomAttachParser implements MsgAttachmentParser {
JSONObject object = JSON.parseObject(json); JSONObject object = JSON.parseObject(json);
int type = object.getInteger(KEY_TYPE); int type = object.getInteger(KEY_TYPE);
JSONObject data = object.getJSONObject(KEY_DATA); JSONObject data = object.getJSONObject(KEY_DATA);
LogUtil.e("aaaaaaa"+type);
switch (type) { switch (type) {
case CustomAttachmentType.Guess: case CustomAttachmentType.Guess:
// attachment = new GuessAttachment(); // attachment = new GuessAttachment();
......
...@@ -42,9 +42,7 @@ import com.tbruyelle.rxpermissions2.Permission; ...@@ -42,9 +42,7 @@ import com.tbruyelle.rxpermissions2.Permission;
import com.tbruyelle.rxpermissions2.RxPermissions; import com.tbruyelle.rxpermissions2.RxPermissions;
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.event.MultipleAnswerBean;
import com.yidianling.im.event.MultipleSelectedEvent; import com.yidianling.im.event.MultipleSelectedEvent;
import com.yidianling.im.router.ImIn;
import com.yidianling.nimbase.api.UIKitOptions; import com.yidianling.nimbase.api.UIKitOptions;
import com.yidianling.nimbase.api.model.session.SessionCustomization; import com.yidianling.nimbase.api.model.session.SessionCustomization;
import com.yidianling.nimbase.business.session.actions.BaseAction; import com.yidianling.nimbase.business.session.actions.BaseAction;
......
...@@ -299,12 +299,7 @@ public class MessageListPanelEx { ...@@ -299,12 +299,7 @@ public class MessageListPanelEx {
IMMessage lastMsg = messages.get(messages.size() - 1); IMMessage lastMsg = messages.get(messages.size() - 1);
if (isMyMessage(lastMsg)) { if (isMyMessage(lastMsg)) {
if (needScrollToBottom) { if (needScrollToBottom) {
messageListView.postDelayed(new Runnable() { doScrollToBottom();
@Override
public void run() {
messageListView.smoothScrollToPosition(adapter.getBottomDataPosition());
}
},300);
} else if (incomingMsgPrompt != null && lastMsg.getSessionType() != SessionTypeEnum.ChatRoom) { } else if (incomingMsgPrompt != null && lastMsg.getSessionType() != SessionTypeEnum.ChatRoom) {
if (lastMsg.getAttachment() instanceof CustomAttachLingxiWhichQuestion){ if (lastMsg.getAttachment() instanceof CustomAttachLingxiWhichQuestion){
messageListView.postDelayed(new Runnable() { messageListView.postDelayed(new Runnable() {
......
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