Merge branch 'main' of https://github.com/kirito0206/NEMeeting into v…

…4.8.0
netease-kit · Oct 24, 2024 · 9e66138 · 9e66138
2 parents f9985b7 + b81f21f
commit 9e66138
Show file tree

Hide file tree

Showing 13 changed files with 13,986 additions and 197 deletions.
diff --git a/SampleCode/H5/NEMeetingKit_h5_v4.8.0.js b/SampleCode/H5/NEMeetingKit_h5_v4.8.0.js
diff --git a/SampleCode/H5/NEMeetingKit_h5_v4.8.2.js b/SampleCode/H5/NEMeetingKit_h5_v4.8.2.js
diff --git a/SampleCode/H5/index.html b/SampleCode/H5/index.html
@@ -47,13 +47,14 @@
   <!-- 预留一个dom用于挂载会议组件 -->
   <div id="ne-web-meeting"></div>
   <!-- 引入会议组件sdk -->
-  <script src="./NEMeetingKit_h5_v4.6.0.js"></script>
+  <script src="./NEMeetingKit_h5_v4.8.2.js"></script>
   <script>
     /**
      * 先执行项目初始化，将会议初始化操作执行结束后，会依据初始化提供的宽高，进行占位
      * 然后执行登陆，获取登陆人员信息
      * 此时，根据需要，可以进行会议的创建或加入
     */
+    NEMeetingKit = NEMeetingKit.default.oldNEMeetingKit
 
     /* 初始化
       * @param width：宽度(px)，为0则表示100%

diff --git a/SampleCode/Web/NEMeetingKit_v4.8.0.js b/SampleCode/Web/NEMeetingKit_v4.8.0.js
diff --git a/SampleCode/Web/NEMeetingKit_v4.8.2.js b/SampleCode/Web/NEMeetingKit_v4.8.2.js
diff --git a/SampleCode/Web/index.html b/SampleCode/Web/index.html
@@ -15,8 +15,9 @@
   <input class="meeting-id" type="text" placeholder="meetingId">
   <button onclick="join()">加入</button>
   <div id="ne-web-meeting"></div>
-  <script src="./NEMeetingKit_v4.6.0.js"></script>
+  <script src="./NEMeetingKit_v4.8.2.js"></script>
   <script>
+  NEMeetingKit = NEMeetingKit.default.oldNEMeetingKit
   /**
    * 先执行项目初始化，将会议初始化操作执行结束后，会依据初始化提供的宽高，进行占位
    * 然后执行登陆，获取登陆人员信息

diff --git a/SampleCode/iOS/NEMeetingDemo/Section/EnterMeetingVC.m b/SampleCode/iOS/NEMeetingDemo/Section/EnterMeetingVC.m
@@ -56,14 +56,22 @@ - (void)setupUI {
   [_configCheckBox
       setItemTitleWithArray:@[ @"入会时打开摄像头", @"入会时打开麦克风", @"显示会议持续时间" ]];
   [_settingCheckBox setItemTitleWithArray:@[
-    @"入会时关闭聊天菜单", @"入会时关闭邀请菜单", @"入会时隐藏最小化", @"使用默认会议设置",
-    @"入会时关闭画廊模式", @"仅显示会议ID长号",   @"仅显示会议ID短号", @"关闭摄像头切换",
-    @"关闭音频模式切换",   @"显示白板窗口",       @"隐藏白板菜单按钮", @"关闭会中改名",
-    @"隐藏Sip菜单",        @"显示用户角色标签",   @"显示会议结束提醒", @"聊天室文件消息",
-    @"聊天室图片消息",     @"开启静音检测",       @"关闭静音包",       @"显示屏幕共享者画面",
-    @"显示白板共享者画面", @"设置白板透明",       @"前置摄像头镜像",   @"显示麦克风浮窗",
-    @"入会时隐藏直播菜单", @"开启音频共享",       @"开启加密",         @"显示云录制菜单按钮",
-    @"显示云录制过程UI",   @"允许音频设备切换"
+    @"入会时关闭聊天菜单", @"入会时关闭邀请菜单",
+    @"入会时隐藏最小化",   @"使用默认会议设置",
+    @"入会时关闭画廊模式", @"仅显示会议ID长号",
+    @"仅显示会议ID短号",   @"关闭摄像头切换",
+    @"关闭音频模式切换",   @"显示白板窗口",
+    @"隐藏白板菜单按钮",   @"关闭会中改名",
+    @"隐藏Sip菜单",        @"显示用户角色标签",
+    @"显示会议结束提醒",   @"聊天室文件消息",
+    @"聊天室图片消息",     @"开启静音检测",
+    @"关闭静音包",         @"显示屏幕共享者画面",
+    @"显示白板共享者画面", @"设置白板透明",
+    @"前置摄像头镜像",     @"显示麦克风浮窗",
+    @"入会时隐藏直播菜单", @"开启音频共享",
+    @"开启加密",           @"显示云录制菜单按钮",
+    @"显示云录制过程UI",   @"自动画中画",
+    @"展示未入会成员",     @"主持人直接开关成员音视频"
   ]];
   _settingCheckBox.delegate = self;
   [self.settingCheckBox setItemSelected:YES index:MeetingSettingTypeChatroomEnableFile];
@@ -76,7 +84,10 @@ - (void)setupUI {
   [self.settingCheckBox setItemSelected:YES index:MeetingSettingTypeJoinOffLive];
   [self.settingCheckBox setItemSelected:YES index:MeetingSettingTypeShowCloudRecordingUI];
   [self.settingCheckBox setItemSelected:YES index:MeetingSettingTypeShowCloudRecordMenuItem];
-  [self.settingCheckBox setItemSelected:NO index:MeetingSettingTypeEnableAudioDeviceSwitch];
+  [self.settingCheckBox setItemSelected:YES index:MeetingSettingTypeEnablePIP];
+  [self.settingCheckBox setItemSelected:YES index:MeetingSettingTypeShowNotYetJoinedMembers];
+  [self.settingCheckBox setItemSelected:NO
+                                  index:MeetingSettingTypeEnableDirectMemberMediaControlByHost];
 }
 
 - (IBAction)onLeaveCurrentMeeting:(id)sender {
@@ -194,6 +205,11 @@ - (IBAction)onEnterMeetingAction:(id)sender {
       [self selectedSetting:MeetingSettingTypeShowCloudRecordMenuItem];
   // 配置是否展示云录制过程中的UI提示
   options.showCloudRecordingUI = [self selectedSetting:MeetingSettingTypeShowCloudRecordingUI];
+  options.enablePictureInPicture = [self selectedSetting:MeetingSettingTypeEnablePIP];
+  options.showNotYetJoinedMembers =
+      [self selectedSetting:MeetingSettingTypeShowNotYetJoinedMembers];
+  options.enableDirectMemberMediaControlByHost =
+      [self selectedSetting:MeetingSettingTypeEnableDirectMemberMediaControlByHost];
   WEAK_SELF(weakSelf);
   [SVProgressHUD show];
   // 匿名入会

diff --git a/SampleCode/iOS/NEMeetingDemo/Section/MeetingConfigEnum.h b/SampleCode/iOS/NEMeetingDemo/Section/MeetingConfigEnum.h
@@ -42,7 +42,9 @@ typedef NS_ENUM(NSInteger, MeetingSettingType) {
   MeetingSettingTypeEnableEncryption,
   MeetingSettingTypeShowCloudRecordMenuItem,
   MeetingSettingTypeShowCloudRecordingUI,
-  MeetingSettingTypeEnableAudioDeviceSwitch
+  MeetingSettingTypeEnablePIP,
+  MeetingSettingTypeShowNotYetJoinedMembers,
+  MeetingSettingTypeEnableDirectMemberMediaControlByHost,
 };
 
 /// 创建会议设置选项类型
@@ -83,8 +85,10 @@ typedef NS_ENUM(NSInteger, CreateMeetingSettingType) {
   CreateMeetingSettingTypeShowCloudRecordMenuItem,
   CreateMeetingSettingTypeShowCloudRecordingUI,
   CreateMeetingSettingTypeEnableWaitingRoom,
-  CreateMeetingSettingTypeEnableAudioDeviceSwitch,
-  CreateMeetingSettingTypeEnableGuestJoin
+  CreateMeetingSettingTypeEnableGuestJoin,
+  CreateMeetingSettingTypeEnablePIP,
+  CreateMeetingSettingTypeShowNotYetJoinedMembers,
+  CreateMeetingSettingTypeEnableDirectMemberMediaControlByHost,
 };
 
 #endif /* MeetingConfigEnum_h */
diff --git a/SampleCode/iOS/NEMeetingDemo/Section/StartMeetingVC.m b/SampleCode/iOS/NEMeetingDemo/Section/StartMeetingVC.m
@@ -38,6 +38,8 @@ @interface StartMeetingVC () <CheckBoxDelegate, MeetingMenuSelectVCDelegate, Mee
 @property(weak, nonatomic) IBOutlet UITextField *subjectInput;
 /// 加密密钥输入框
 @property(weak, nonatomic) IBOutlet UITextField *encryptionKeyInput;
+/// 小应用通知弹窗时间配置
+@property(weak, nonatomic) IBOutlet UITextField *notifyDurationInput;
 
 @property(nonatomic, copy) NSString *meetingNum;
 @property(nonatomic, assign) BOOL audioOffAllowSelfOn;
@@ -74,20 +76,46 @@ - (void)setupUI {
   [_configCheckBox
       setItemTitleWithArray:@[ @"入会时打开摄像头", @"入会时打开麦克风", @"显示会议持续时间" ]];
   [_settingCheckBox setItemTitleWithArray:@[
-    @"入会时关闭聊天菜单", @"入会时关闭邀请菜单", @"入会时隐藏最小化",
-    @"使用个人会议号",     @"使用默认会议设置",   @"入会时关闭画廊模式",
-    @"仅显示会议ID长号",   @"仅显示会议ID短号",   @"关闭摄像头切换",
+    @"入会时关闭聊天菜单",
+    @"入会时关闭邀请菜单",
+    @"入会时隐藏最小化",
+    @"使用个人会议号",
+    @"使用默认会议设置",
+    @"入会时关闭画廊模式",
+    @"仅显示会议ID长号",
+    @"仅显示会议ID短号",
+    @"关闭摄像头切换",
     @"关闭音频模式切换",
     @"展示白板",  // 10
-    @"隐藏白板菜单按钮",   @"关闭会中改名",       @"开启云录制",
-    @"隐藏Sip菜单",        @"显示用户角色标签",   @"自动静音(可解除)",
-    @"自动静音(不可解除)", @"自动关视频(可解除)", @"自动关视频(不可解除)",
-    @"显示会议结束提醒",   @"聊天室文件消息",     @"聊天室图片消息",
-    @"开启静音检测",       @"关闭静音包",         @"显示屏幕共享者画面",
-    @"显示白板共享者画面", @"设置白板透明",       @"前置摄像头镜像",
-    @"显示麦克风浮窗",     @"入会时隐藏直播菜单", @"开启音频共享",
-    @"开启加密",           @"显示云录制菜单按钮", @"显示云录制过程UI",
-    @"开启等候室",         @"允许音频设备切换",   @"允许访客入会"
+    @"隐藏白板菜单按钮",
+    @"关闭会中改名",
+    @"开启云录制",
+    @"隐藏Sip菜单",
+    @"显示用户角色标签",
+    @"自动静音(可解除)",
+    @"自动静音(不可解除)",
+    @"自动关视频(可解除)",
+    @"自动关视频(不可解除)",
+    @"显示会议结束提醒",
+    @"聊天室文件消息",
+    @"聊天室图片消息",
+    @"开启静音检测",
+    @"关闭静音包",
+    @"显示屏幕共享者画面",
+    @"显示白板共享者画面",
+    @"设置白板透明",
+    @"前置摄像头镜像",
+    @"显示麦克风浮窗",
+    @"入会时隐藏直播菜单",
+    @"开启音频共享",
+    @"开启加密",
+    @"显示云录制菜单按钮",
+    @"显示云录制过程UI",
+    @"开启等候室",
+    @"允许访客入会",
+    @"自动画中画",
+    @"展示未入会成员",
+    @"主持人直接开关成员音视频"
   ]];
   _settingCheckBox.delegate = self;
   [self.settingCheckBox setItemSelected:YES index:CreateMeetingSettingTypeChatroomEnableFile];
@@ -100,8 +128,12 @@ - (void)setupUI {
   [self.settingCheckBox setItemSelected:YES index:CreateMeetingSettingTypeJoinOffLive];
   [self.settingCheckBox setItemSelected:YES index:CreateMeetingSettingTypeShowCloudRecordMenuItem];
   [self.settingCheckBox setItemSelected:YES index:CreateMeetingSettingTypeShowCloudRecordingUI];
-  [self.settingCheckBox setItemSelected:YES index:CreateMeetingSettingTypeEnableAudioDeviceSwitch];
   [self.settingCheckBox setItemSelected:NO index:CreateMeetingSettingTypeEnableGuestJoin];
+  [self.settingCheckBox setItemSelected:YES index:CreateMeetingSettingTypeEnablePIP];
+  [self.settingCheckBox setItemSelected:YES index:CreateMeetingSettingTypeShowNotYetJoinedMembers];
+  [self.settingCheckBox
+      setItemSelected:NO
+                index:CreateMeetingSettingTypeEnableDirectMemberMediaControlByHost];
 }
 #pragma mark-----------------------------  自定义toolbar/更多 菜单  -----------------------------
 
@@ -264,6 +296,16 @@ - (void)doStartMeeting {
 
   options.enableWaitingRoom = [self selectedSetting:CreateMeetingSettingTypeEnableWaitingRoom];
   options.enableGuestJoin = [self selectedSetting:CreateMeetingSettingTypeEnableGuestJoin];
+  if (self.notifyDurationInput.text.length) {
+    options.pluginNotifyDuration = [self.notifyDurationInput.text intValue];
+  }
+  options.enablePictureInPicture = [self selectedSetting:CreateMeetingSettingTypeEnablePIP];
+  // 视图展示未入会成员
+  options.showNotYetJoinedMembers =
+      ![self selectedSetting:CreateMeetingSettingTypeShowNotYetJoinedMembers];
+
+  options.enableDirectMemberMediaControlByHost =
+      [self selectedSetting:CreateMeetingSettingTypeEnableDirectMemberMediaControlByHost];
   WEAK_SELF(weakSelf);
   [SVProgressHUD show];
   [[NEMeetingKit getInstance].getMeetingService

diff --git a/SampleCode/iOS/NEMeetingDemo/Section/StartMeetingVC.xib b/SampleCode/iOS/NEMeetingDemo/Section/StartMeetingVC.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -17,6 +17,7 @@
                 <outlet property="extraInput" destination="s17-VQ-gVv" id="wak-lf-rd7"/>
                 <outlet property="meetingIdInput" destination="Jfc-T7-66b" id="nLq-kn-RQA"/>
                 <outlet property="nickInput" destination="7cy-0b-BqG" id="Oip-dc-DvA"/>
+                <outlet property="notifyDurationInput" destination="dli-Mw-o1H" id="zjR-LS-yEs"/>
                 <outlet property="passwordInput" destination="9kc-hk-n8f" id="Qk6-Vm-B3s"/>
                 <outlet property="settingCheckBox" destination="MKt-2h-9Ht" id="Sdr-yn-F0a"/>
                 <outlet property="tagInput" destination="0AT-Vn-itT" id="oLp-B7-7en"/>
@@ -171,6 +172,14 @@
                         <constraint firstAttribute="height" constant="1" id="Vnr-JL-ZuA"/>
                     </constraints>
                 </view>
+                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="小应用通知弹窗时间配置" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dli-Mw-o1H">
+                    <rect key="frame" x="12" y="636" width="351" height="34"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="34" id="jOJ-h4-a5b"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits"/>
+                </textField>
             </subviews>
             <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -181,6 +190,7 @@
                 <constraint firstItem="3e7-LZ-R6s" firstAttribute="width" secondItem="OwW-lk-i1Y" secondAttribute="width" multiplier="0.894737" id="4B9-Hl-uS5"/>
                 <constraint firstItem="qbz-xI-xj7" firstAttribute="top" secondItem="GQg-aJ-MU0" secondAttribute="bottom" constant="7.6666666666666288" id="4pF-5J-Xgl"/>
                 <constraint firstItem="WRG-Pt-POL" firstAttribute="top" secondItem="MKt-2h-9Ht" secondAttribute="bottom" constant="16" id="6CD-PL-CK4"/>
+                <constraint firstItem="3e7-LZ-R6s" firstAttribute="top" secondItem="dli-Mw-o1H" secondAttribute="bottom" constant="14" id="7x1-df-XMc"/>
                 <constraint firstItem="0AT-Vn-itT" firstAttribute="width" secondItem="9kc-hk-n8f" secondAttribute="width" id="8xb-5o-leS"/>
                 <constraint firstItem="Jdc-RQ-DhW" firstAttribute="top" secondItem="WRG-Pt-POL" secondAttribute="top" id="C99-vp-DoD"/>
                 <constraint firstItem="GQg-aJ-MU0" firstAttribute="top" secondItem="Jdc-RQ-DhW" secondAttribute="bottom" constant="16" id="DOK-mR-AVl"/>
@@ -197,6 +207,7 @@
                 <constraint firstItem="MKt-2h-9Ht" firstAttribute="top" secondItem="F15-my-g2s" secondAttribute="bottom" constant="4" id="NHm-ae-lc4"/>
                 <constraint firstItem="7cy-0b-BqG" firstAttribute="top" secondItem="mEx-5R-qub" secondAttribute="bottom" constant="16" id="NeM-oa-h5w"/>
                 <constraint firstItem="Jfc-T7-66b" firstAttribute="leading" secondItem="afo-Xb-gX8" secondAttribute="leading" id="P1g-Jl-bWm"/>
+                <constraint firstItem="dli-Mw-o1H" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="12" id="QMT-i3-Y2G"/>
                 <constraint firstItem="s17-VQ-gVv" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="10" id="QkH-tg-bJ1"/>
                 <constraint firstItem="OwW-lk-i1Y" firstAttribute="leading" secondItem="3e7-LZ-R6s" secondAttribute="trailing" constant="10" id="R4A-yi-fWq"/>
                 <constraint firstItem="CTz-SU-8uc" firstAttribute="trailing" secondItem="7cy-0b-BqG" secondAttribute="trailing" id="RDW-5l-4wV"/>
@@ -215,6 +226,7 @@
                 <constraint firstItem="qbz-xI-xj7" firstAttribute="trailing" secondItem="i5M-Pr-FkT" secondAttribute="trailingMargin" id="fXk-1i-hfN"/>
                 <constraint firstItem="s17-VQ-gVv" firstAttribute="width" secondItem="4rM-kd-1UT" secondAttribute="width" multiplier="1.02395" id="gNb-ve-grs"/>
                 <constraint firstItem="MKt-2h-9Ht" firstAttribute="trailing" secondItem="F15-my-g2s" secondAttribute="trailing" id="iCk-vI-vto"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="dli-Mw-o1H" secondAttribute="trailing" constant="12" id="ixj-C9-9dx"/>
                 <constraint firstItem="CTz-SU-8uc" firstAttribute="top" secondItem="7cy-0b-BqG" secondAttribute="bottom" constant="4" id="k4h-xP-kfF"/>
                 <constraint firstItem="WRG-Pt-POL" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="30" id="lZY-Xe-ghe"/>
                 <constraint firstItem="F15-my-g2s" firstAttribute="leading" secondItem="7cy-0b-BqG" secondAttribute="leading" id="lsS-c5-wQ5"/>
@@ -234,7 +246,7 @@
                 <constraint firstItem="4rM-kd-1UT" firstAttribute="leading" secondItem="s17-VQ-gVv" secondAttribute="trailing" constant="10" id="zD1-OT-tOS"/>
                 <constraint firstItem="3e7-LZ-R6s" firstAttribute="bottom" secondItem="OwW-lk-i1Y" secondAttribute="bottom" id="zkL-4g-otg"/>
             </constraints>
-            <point key="canvasLocation" x="131.8840579710145" y="153.34821428571428"/>
+            <point key="canvasLocation" x="130.40000000000001" y="152.95566502463055"/>
         </view>
     </objects>
     <resources>

diff --git a/SampleCode/iOS/NEMeetingDemo/Section/menu/view/MeetingMenuItemCell.m b/SampleCode/iOS/NEMeetingDemo/Section/menu/view/MeetingMenuItemCell.m
@@ -74,6 +74,24 @@ - (NSString *)getMenuItemText:(NEMeetingMenuItem *)item {
       return @"安全";
     case DISCONNECT_AUDIO_MENU_ID:
       return @"断开音频";
+    case SETTINGS_MENU_ID:
+      return @"设置";
+    case FEEDBACK_MENU_ID:
+      return @"反馈";
+    case SIP_CALL_MENU_ID:
+      return @"SIP";
+    case CAPTIONS_MENU_ID:
+      return @"字幕";
+    case TRANSCRIPTION_MENU_ID:
+      return @"实时转写";
+    case INTERPRETATION_MENU_ID:
+      return @"同声传译";
+    case BEAUTY_MENU_ID:
+      return @"美颜";
+    case VIRTUAL_BACKGROUND_MENU_ID:
+      return @"虚拟背景";
+    case LIVE_MENU_ID:
+      return @"直播";
     default:
       break;
   }