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

Merge branch 'yinyou_develop' into yinyou_develop_4.3.0_merge

Browse Source 
# Conflicts:
#	app/src/main/java/com/yizhuan/erban/MainActivity.java
#	app/src/main/java/com/yizhuan/erban/skill/SKillDataParser.kt
#	app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt
#	app/src/main/java/com/yizhuan/erban/skill/activity/EditSkillActivity.kt
#	app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt
#	app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt
#	app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt
#	app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt
#	app/src/main/java/com/yizhuan/erban/skill/widget/ItemAttribute.kt
#	app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt
#	app/src/main/java/com/yizhuan/erban/skill/widget/SkillAttribute.kt
#	app/src/main/java/com/yizhuan/erban/skill/widget/SkillCardView.kt
#	app/src/main/java/com/yizhuan/erban/skill/widget/SkillItemHelper.kt
#	app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt
#	app/src/main/res/layout/dialog_add_skill_item.xml
#	app/src/main/res/layout/layout_ok_cancel_dialog.xml
#	app/src/main/res/layout/layout_skill_audio.xml
#	app/src/main/res/values/attrs.xml
#	app/src/main/res/values/strings.xml
#	core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java
#	core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java
#	core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt
This commit is contained in:
yitao_hello
2022-02-27 19:12:02 +08:00
parent 7065815f90 1d4932cf2e
commit 73aff1285f
100 changed files with 1210 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -93,6 +93,7 @@ import com.yizhuan.erban.ui.im.chat.MsgViewHolderMatch;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderOnline;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPackage;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPacket;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderSkill;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderText;
import com.yizhuan.erban.ui.im.chat.SignInNoticeMsgViewHolder;
import com.yizhuan.erban.ui.im.chat.SysMsgV2ViewHolder;
@@ -148,6 +149,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.SkillMsgAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgV2Attachment;
import com.yizhuan.xchat_android_core.initial.InitialModel;
@@ -415,6 +417,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
NimUIKit.registerMsgItemViewHolder(ChatHintAttachment.class, MsgViewHolderChatHint.class);
NimUIKit.registerMsgItemViewHolder(MatchAttachment.class, MsgViewHolderMatch.class);
//技能卡
NimUIKit.registerMsgItemViewHolder(SkillMsgAttachment.class, MsgViewHolderSkill.class);
//CP
NimUIKit.registerMsgItemViewHolder(CpInviteAttachment.class, MsgViewHolderText.class);
NimUIKit.setSessionListener(listener);