解决web段发送的消息转发异常
This commit is contained in:
@@ -47,8 +47,8 @@ android {
|
|||||||
applicationId = "com.dskj.rbchat"
|
applicationId = "com.dskj.rbchat"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 191
|
versionCode = 192
|
||||||
versionName = "1.9.1"
|
versionName = "1.9.2"
|
||||||
multiDexEnabled = true
|
multiDexEnabled = true
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式
|
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式
|
||||||
@@ -126,8 +126,8 @@ android {
|
|||||||
"\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\""
|
"\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\""
|
||||||
)
|
)
|
||||||
//测试APPKEY
|
//测试APPKEY
|
||||||
manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
|
manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
|
||||||
//manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"
|
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,12 +49,12 @@ public interface ApiService {
|
|||||||
/**
|
/**
|
||||||
* 正式环境
|
* 正式环境
|
||||||
*/
|
*/
|
||||||
// String URL = "https://api.letschat2023.com/";
|
String URL = "https://api.letschat2023.com/";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 测试环境
|
* 测试环境
|
||||||
*/
|
*/
|
||||||
String URL = "https://api-test.letschat2023.com/";
|
//String URL = "https://api-test.letschat2023.com/";
|
||||||
|
|
||||||
|
|
||||||
String SUBSTATIONID = "1703655363476242434";
|
String SUBSTATIONID = "1703655363476242434";
|
||||||
|
|||||||
@@ -672,7 +672,7 @@ public abstract class ChatBaseViewModel extends BaseViewModel {
|
|||||||
String attachStr = forwardMessage.getAttachStr();
|
String attachStr = forwardMessage.getAttachStr();
|
||||||
CustomMessageBean customMessageBean = GsonUtils.getObjFromJSON(attachStr, CustomMessageBean.class);
|
CustomMessageBean customMessageBean = GsonUtils.getObjFromJSON(attachStr, CustomMessageBean.class);
|
||||||
String data = GsonUtils.beanToJSONString(customMessageBean.getData());
|
String data = GsonUtils.beanToJSONString(customMessageBean.getData());
|
||||||
if (TextUtils.isEmpty(customMessageBean.getType())) {
|
if (TextUtils.isEmpty(customMessageBean.getType()) || !isInteger(customMessageBean.getType())) {
|
||||||
return forwardMessage;
|
return forwardMessage;
|
||||||
}
|
}
|
||||||
if (Integer.parseInt(customMessageBean.getType()) == ChatMessageType.CUSTOM_STICKER_ALBUMS) {
|
if (Integer.parseInt(customMessageBean.getType()) == ChatMessageType.CUSTOM_STICKER_ALBUMS) {
|
||||||
@@ -711,6 +711,15 @@ public abstract class ChatBaseViewModel extends BaseViewModel {
|
|||||||
return forwardMessage;
|
return forwardMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean isInteger(String type) {
|
||||||
|
try {
|
||||||
|
Integer.parseInt(type);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void sendLocationMessage(ChatLocationBean locationBean) {
|
public void sendLocationMessage(ChatLocationBean locationBean) {
|
||||||
ALog.d(LIB_TAG, TAG, "sendLocationMessage:" + locationBean);
|
ALog.d(LIB_TAG, TAG, "sendLocationMessage:" + locationBean);
|
||||||
|
|||||||
Reference in New Issue
Block a user