Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update Android v4.6.0 #240

Merged
merged 4 commits into from
Jun 13, 2024
Merged

feat: update Android v4.6.0 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1cc29e
feat(h5): add anonymous join for H5
hzlichengda Apr 3, 2024
8ca3d8c
Merge branch 'main' of github.com:chandarlee/NEMeeting
hzlichengda Jun 13, 2024
ce51c6d
Merge branch 'main' of github.com:chandarlee/NEMeeting
hzlichengda Jun 13, 2024
a636143
feat: update Android v4.6.0
hzlichengda Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SampleCode/Android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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'
}
}
22 changes: 0 additions & 22 deletions .../Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/data/MeetingItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ public class MeetingItem implements Comparable<MeetingItem>, Serializable {
/** 会议结束时间戳 */
private long endTime;

/** 会议信息变更时间戳 */
private long updateTime;

/** 会议信息创建时间 */
private long createTime;

/** 会议密码 */
private String password;
/** 当前HH：mm */
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions ...pp/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/view/MeetingCommonFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions ...d/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/HomeViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ private List<MeetingItem> sort(List<NEMeetingItem> 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));
Expand Down
2 changes: 1 addition & 1 deletion ...d/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/MainViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading