feat: update Android v4.6.0 (#240)

* feat(h5): add anonymous join for H5 * feat: update Android v4.6.0 --------- Co-authored-by: hzlichengda <hzlichengda@corp.netease.com>
netease-kit · Jun 13, 2024 · 75b5ea0 · 75b5ea0
1 parent 45b3ef4
commit 75b5ea0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 31 deletions.
diff --git 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'
-}
+}
diff --git a/.../Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/data/MeetingItem.java b/.../Android/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/data/MeetingItem.java
@@ -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 */
@@ -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/...pp/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/view/MeetingCommonFragment.java b/...pp/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/...d/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/HomeViewModel.java b/...d/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/HomeViewModel.java
@@ -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));

diff --git a/...d/app/src/main/java/com/netease/yunxin/kit/meeting/sampleapp/viewmodel/MainViewModel.java b/...d/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);