From a1cc29e66037f3dea8251b6c08095483a598b249 Mon Sep 17 00:00:00 2001 From: hzlichengda Date: Wed, 3 Apr 2024 15:51:12 +0800 Subject: [PATCH 1/2] feat(h5): add anonymous join for H5 --- SampleCode/H5/index.html | 305 +++++++++++++++++++++------------------ 1 file changed, 162 insertions(+), 143 deletions(-) diff --git a/SampleCode/H5/index.html b/SampleCode/H5/index.html index 257d421..15ab1c5 100644 --- a/SampleCode/H5/index.html +++ b/SampleCode/H5/index.html @@ -1,155 +1,174 @@ - - - - neWebMeeting demo - - - - - -
- - - - -
- - -
- - - -
- -
- - - + - - + ); + } + + + + \ No newline at end of file From a6361435a9d8862e9715ce7b9f344de8ebc25a9f Mon Sep 17 00:00:00 2001 From: hzlichengda Date: Thu, 13 Jun 2024 19:17:32 +0800 Subject: [PATCH 2/2] feat: update Android v4.6.0 --- SampleCode/Android/app/build.gradle | 8 +++---- .../meeting/sampleapp/data/MeetingItem.java | 22 ------------------- .../sampleapp/view/MeetingCommonFragment.java | 4 ++-- .../sampleapp/viewmodel/HomeViewModel.java | 2 -- .../sampleapp/viewmodel/MainViewModel.java | 2 +- 5 files changed, 7 insertions(+), 31 deletions(-) diff --git a/SampleCode/Android/app/build.gradle b/SampleCode/Android/app/build.gradle index 6304b73..6b21c1c 100644 --- a/SampleCode/Android/app/build.gradle +++ b/SampleCode/Android/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.netease.yunxin.kit.meeting.sampleapp" minSdkVersion 21 targetSdkVersion 34 - versionCode 40500 - versionName "4.5.1" + versionCode 40600 + versionName "4.6.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -65,8 +65,8 @@ dependencies { implementation "androidx.navigation:navigation-ui-ktx:2.3.0" implementation 'com.manu:MDatePicker:1.0.1' - implementation("com.netease.yunxin.kit.meeting:meeting:4.5.1") + implementation("com.netease.yunxin.kit.meeting:meeting:4.6.0") compileOnly 'com.netease.yunxin:nertc-full:5.5.40' compileOnly 'com.netease.nimlib:basesdk:9.16.0' -} +} \ No newline at end of file diff --git a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/data/MeetingItem.java b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/data/MeetingItem.java index cffb468..3faccb5 100644 --- a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/data/MeetingItem.java +++ b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/data/MeetingItem.java @@ -28,12 +28,6 @@ public class MeetingItem implements Comparable, Serializable { /** 会议结束时间戳 */ private long endTime; - /** 会议信息变更时间戳 */ - private long updateTime; - - /** 会议信息创建时间 */ - private long createTime; - /** 会议密码 */ private String password; /** 当前HH：mm */ @@ -137,14 +131,6 @@ public void setEndTime(long endTime) { this.endTime = endTime; } - public long getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(long updateTime) { - this.updateTime = updateTime; - } - public String getPassword() { return password; } @@ -193,14 +179,6 @@ public void setGroupFirst(boolean groupFirst) { isGroupFirst = groupFirst; } - public long getCreateTime() { - return createTime; - } - - public void setCreateTime(long createTime) { - this.createTime = createTime; - } - public NEMeetingItemLive getLive() { return live; } diff --git a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/view/MeetingCommonFragment.java b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/view/MeetingCommonFragment.java index a58c2cf..0596c8e 100644 --- a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/view/MeetingCommonFragment.java +++ b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/view/MeetingCommonFragment.java @@ -26,7 +26,7 @@ import com.netease.yunxin.kit.meeting.sampleapp.menu.InjectMenuArrangeActivity; import com.netease.yunxin.kit.meeting.sampleapp.menu.InjectMenuContainer; import com.netease.yunxin.kit.meeting.sampleapp.utils.AlertDialogUtil; -import com.netease.yunxin.kit.meeting.sdk.NEHistoryMeetingItem; +import com.netease.yunxin.kit.meeting.sdk.NELocalHistoryMeeting; import com.netease.yunxin.kit.meeting.sdk.NEMeetingChatroomConfig; import com.netease.yunxin.kit.meeting.sdk.NEMeetingCode; import com.netease.yunxin.kit.meeting.sdk.NEMeetingError; @@ -294,7 +294,7 @@ public void onResult(int resultCode, String resultMsg, Void resultData) { .getHistoryMeetingItem( (resultCode, resultMsg, resultData) -> { if (resultData != null && resultData.size() > 0) { - NEHistoryMeetingItem history = resultData.get(0); + NELocalHistoryMeeting history = resultData.get(0); Log.d("MeetingCommonFragment", "getHistoryMeetingItem: " + history); if (history .getMeetingNum() diff --git a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/HomeViewModel.java b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/HomeViewModel.java index 7f7a464..86c34cb 100644 --- a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/HomeViewModel.java +++ b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/HomeViewModel.java @@ -62,8 +62,6 @@ private List sort(List resultData) { item.setEndTime(neMeetingItem.getEndTime()); item.setSubject(neMeetingItem.getSubject()); item.setStatus(neMeetingItem.getStatus()); - item.setUpdateTime(neMeetingItem.getUpdateTime()); - item.setCreateTime(neMeetingItem.getCreateTime()); item.setMeetingId(neMeetingItem.getMeetingId()); String startTime = DateUtil.stampToDate(neMeetingItem.getStartTime()); item.setHourAndMin(startTime.substring(11, 16)); diff --git a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/MainViewModel.java b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/MainViewModel.java index 82ffbdb..e008e3c 100644 --- a/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/MainViewModel.java +++ b/SampleCode/Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/MainViewModel.java @@ -117,7 +117,7 @@ protected void onCleared() { @Override public void onInitialized(int initializeIndex) { getMeetingService().addMeetingStatusListener(this); - getMeetingInviteService().addEventListener(this); + getMeetingInviteService().addMeetingInviteStatusListener(this); NEMeetingStatus status = getMeetingService().getMeetingStatus(); if (status != null) { reactToMeetingStatus(status);