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

1.相亲模式房间横幅

Browse Source 
2.相亲提示弹窗文案修改
This commit is contained in:
huangjian
2021-02-25 18:14:51 +08:00
parent dddd0e651c
commit 4567a62a54
16 changed files with 312 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
View File

@@ -217,6 +217,7 @@ import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUS
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DATING;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DATING_All;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_END;
@@ -243,6 +244,7 @@ import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUS
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_IN_ROOM;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ME;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DATING_Al_NOTIFY;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_HEART;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_LIKE;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_RESULT;
@@ -1323,6 +1325,11 @@ public final class IMNetEaseManager {
break;
}
break;
case CUSTOM_MSG_DATING_All:
if (second == CUSTOM_MSG_SUB_DATING_Al_NOTIFY) {
noticeRoomEvent(msg, RoomEvent.DATING_ALL_NOTIFY);
}
break;
default:
break;
}

40
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java
View File

@@ -132,9 +132,9 @@ public class CustomAttachParser implements MsgAttachmentParser {
attachment = new AuctionAttachment(first, second);
break;
case CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT:
if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_GIFT){
if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_GIFT) {
attachment = new GiftAttachment(first, second);
}else if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT){
} else if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT) {
attachment = new MultiLuckyGiftAttachment(first, second);
}
break;
@@ -143,9 +143,9 @@ public class CustomAttachParser implements MsgAttachmentParser {
attachment = new MultiGiftAttachment(first, second);
} else if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_BATCH_SEND_GIFT) {
attachment = new GiftBatchAttachment(first, second);
} else if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT){
} else if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT) {
attachment = new MultiLuckyGiftAttachment(first, second);
} else if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT){
} else if (second == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT) {
attachment = new MultiLuckyGiftAttachment(first, second);
}
break;
@@ -284,7 +284,7 @@ public class CustomAttachParser implements MsgAttachmentParser {
}
break;
case CUSTOM_MSG_LEVEL_UP:
switch (second){
switch (second) {
case CUSTOM_MSG_EXPER_LEVEL_UP:
case CUSTOM_MSG_CHARM_LEVEL_UP:
attachment = new LevelUpAttachment(CUSTOM_MSG_LEVEL_UP, second);
@@ -513,7 +513,7 @@ public class CustomAttachParser implements MsgAttachmentParser {
}
break;
case CustomAttachment.CUSTOM_MSG_LUCKY_GIFT:
switch (second){
switch (second) {
case CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_ROOM_NOTIFY:
case CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY:
attachment = new RoomReceivedLuckyGiftAttachment(second);
@@ -529,18 +529,22 @@ public class CustomAttachParser implements MsgAttachmentParser {
}
break;
case CustomAttachment.CUSTOM_MSG_DATING:
switch (second) {
case CustomAttachment.CUSTOM_MSG_SUB_DATING_SELECT:
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_LIKE:
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_HEART:
attachment = new DatingAttachment(second);
break;
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_RESULT:
attachment = new DatingPublishAttachment(first, second);
break;
}
break;
switch (second) {
case CustomAttachment.CUSTOM_MSG_SUB_DATING_SELECT:
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_LIKE:
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_HEART:
attachment = new DatingAttachment(second);
break;
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_RESULT:
attachment = new DatingPublishAttachment(first, second);
break;
}
break;
case CustomAttachment.CUSTOM_MSG_DATING_All:
if (second == CustomAttachment.CUSTOM_MSG_SUB_DATING_Al_NOTIFY) {
attachment = new DatingAllNotifyAttachment(second);
}
break;
case CustomAttachment.CUSTOM_MESS_TAROT:
attachment = new TarotAttachment(CustomAttachment.CUSTOM_MESS_TAROT, CustomAttachment.CUSTOM_MESS_TAROT_SUCCESS);
break;

4
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java
View File

@@ -378,6 +378,10 @@ public class CustomAttachment implements MsgAttachment {
public static final int CUSTOM_MSG_SUB_DATING_PUBLISH_LIKE = 723;
public static final int CUSTOM_MSG_SUB_DATING_PUBLISH_HEART = 724;
//相亲模式全服飘屏
public static final int CUSTOM_MSG_DATING_All = 73;
public static final int CUSTOM_MSG_SUB_DATING_Al_NOTIFY = 731;
public CustomAttachment() {
}

39
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java Normal file
View File

@@ -0,0 +1,39 @@
package com.yizhuan.xchat_android_core.im.custom.bean;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.yizhuan.xchat_android_core.room.bean.DatingAllNotifyInfo;
import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo;
/**
* @author xiaoyu
*/
public class DatingAllNotifyAttachment extends CustomAttachment {
private DatingAllNotifyInfo datingAllNotifyInfo;
public DatingAllNotifyAttachment(int second) {
super(CUSTOM_MSG_DATING_All, second);
}
public DatingAllNotifyInfo getDatingAllNotifyInfo() {
return datingAllNotifyInfo;
}
public void setDatingAllNotifyInfo(DatingAllNotifyInfo datingAllNotifyInfo) {
this.datingAllNotifyInfo = datingAllNotifyInfo;
}
@Override
protected void parseData(JSONObject data) {
datingAllNotifyInfo = new Gson().fromJson(data.toJSONString(), DatingAllNotifyInfo.class);
}
@Override
protected JSONObject packData() {
String jsonStr = new Gson().toJson(datingAllNotifyInfo);
return JSONObject.parseObject(jsonStr);
}
}

1
core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java
View File

@@ -207,6 +207,7 @@ public class RoomEvent {
public static final int BOX_NOTIFY_SVGA = 69;
public static final int DATING_PUBLISH_RESULT = 70;
public static final int DATING_ALL_NOTIFY = 71;
private int event = NONE;
private int micPosition = Integer.MIN_VALUE;

43
core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt Normal file
View File

@@ -0,0 +1,43 @@
package com.yizhuan.xchat_android_core.room.bean
import java.io.Serializable
data class DatingAllNotifyInfo(
/**
* 消息唯一标识
*/
val messId: String,
/**
* 消息创建时间
*/
val messTime: Long,
/**
* 用户昵称
*/
val oneUserNick: String,
/**
* 另一个用户昵称
*/
val anotherUserNick: String,
/**
* 房间uid
*/
val roomUid: Long,
/**
* 房间title
*/
val roomTitle: String,
/**
* 飘屏图片地址
*/
val backgroundUrl: String,
/**
* 心动场景等级
*/
val joinHandLevel: Int,
/**
* 心动场景等级
*/
val joinHandName: String,
) : Serializable