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.

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 meetingkit iOS version 3.17.0 #223

Merged
merged 10 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 47 additions & 1 deletion SampleCode/iOS/NEMeetingDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -69,6 +69,11 @@
41F8C3A624B5971E0039301B /* strip_archs.sh in Resources */ = {isa = PBXBuildFile; fileRef = 41F8C3A524B5971E0039301B /* strip_archs.sh */; };
41FE2B9224AD8F5800624342 /* SystemAuthHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 41FE2B9124AD8F5800624342 /* SystemAuthHelper.m */; };
5354C49B286EEDDB000F5193 /* NSEditSubscribeMeetingVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 5354C499286EEDDB000F5193 /* NSEditSubscribeMeetingVC.m */; };
53AC393E2AF4D4F300A5D42A /* HomePageVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 53AC39392AF4D4F300A5D42A /* HomePageVC.m */; };
53AC393F2AF4D4F300A5D42A /* HomeItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 53AC393B2AF4D4F300A5D42A /* HomeItemCell.m */; };
53AC39402AF4D4F300A5D42A /* HomeItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 53AC393D2AF4D4F300A5D42A /* HomeItem.m */; };
53AC39442AF4D54200A5D42A /* NEMeetingSafeArea.m in Sources */ = {isa = PBXBuildFile; fileRef = 53AC39432AF4D54200A5D42A /* NEMeetingSafeArea.m */; };
53AC39472AF4D56900A5D42A /* ScreenShareVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 53AC39462AF4D56900A5D42A /* ScreenShareVC.m */; };
9E451CF125B041BF00E69CDE /* MeetingMenuSelectVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E451CF025B041BF00E69CDE /* MeetingMenuSelectVC.m */; };
9E451CF625B04C3100E69CDE /* MeetingMenuItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E451CF525B04C3100E69CDE /* MeetingMenuItemCell.m */; };
F97D528B8E70D69CC58B6CC9 /* Pods_NEMeetingDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B417BBB81DD9FF5688ED5537 /* Pods_NEMeetingDemo.framework */; };
Expand Down Expand Up @@ -215,6 +220,16 @@
5354C499286EEDDB000F5193 /* NSEditSubscribeMeetingVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSEditSubscribeMeetingVC.m; sourceTree = "<group>"; };
5354C49A286EEDDB000F5193 /* NSEditSubscribeMeetingVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSEditSubscribeMeetingVC.h; sourceTree = "<group>"; };
537437482ADFD7110058ECBB /* MeetingConfigEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeetingConfigEnum.h; sourceTree = "<group>"; };
53AC39382AF4D4F300A5D42A /* HomeItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeItem.h; sourceTree = "<group>"; };
53AC39392AF4D4F300A5D42A /* HomePageVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomePageVC.m; sourceTree = "<group>"; };
53AC393A2AF4D4F300A5D42A /* HomeItemCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeItemCell.h; sourceTree = "<group>"; };
53AC393B2AF4D4F300A5D42A /* HomeItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeItemCell.m; sourceTree = "<group>"; };
53AC393C2AF4D4F300A5D42A /* HomePageVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomePageVC.h; sourceTree = "<group>"; };
53AC393D2AF4D4F300A5D42A /* HomeItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeItem.m; sourceTree = "<group>"; };
53AC39422AF4D54200A5D42A /* NEMeetingSafeArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NEMeetingSafeArea.h; sourceTree = "<group>"; };
53AC39432AF4D54200A5D42A /* NEMeetingSafeArea.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NEMeetingSafeArea.m; sourceTree = "<group>"; };
53AC39452AF4D56900A5D42A /* ScreenShareVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreenShareVC.h; sourceTree = "<group>"; };
53AC39462AF4D56900A5D42A /* ScreenShareVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreenShareVC.m; sourceTree = "<group>"; };
7F47C73E59370BEEAE7064C7 /* Pods-NEMeetingDemo-Broadcaster.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NEMeetingDemo-Broadcaster.debug.xcconfig"; path = "Target Support Files/Pods-NEMeetingDemo-Broadcaster/Pods-NEMeetingDemo-Broadcaster.debug.xcconfig"; sourceTree = "<group>"; };
9E451CEF25B041BF00E69CDE /* MeetingMenuSelectVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MeetingMenuSelectVC.h; sourceTree = "<group>"; };
9E451CF025B041BF00E69CDE /* MeetingMenuSelectVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MeetingMenuSelectVC.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -256,6 +271,7 @@
410B431E24AB2B7500017FA6 /* Common */ = {
isa = PBXGroup;
children = (
53AC39412AF4D54200A5D42A /* SafeArea */,
410B435B24AC8E5E00017FA6 /* ViewController */,
410B435A24AC8E5000017FA6 /* View */,
410B435924AC8E4800017FA6 /* Catagories */,
Expand All @@ -267,6 +283,9 @@
410B434224AC665600017FA6 /* Section */ = {
isa = PBXGroup;
children = (
53AC39452AF4D56900A5D42A /* ScreenShareVC.h */,
53AC39462AF4D56900A5D42A /* ScreenShareVC.m */,
53AC39372AF4D4CC00A5D42A /* Home */,
537437482ADFD7110058ECBB /* MeetingConfigEnum.h */,
41E9117825010E6900E63D80 /* CustomViewController.h */,
41E9117925010E6900E63D80 /* CustomViewController.m */,
Expand Down Expand Up @@ -534,6 +553,28 @@
path = Helper;
sourceTree = "<group>";
};
53AC39372AF4D4CC00A5D42A /* Home */ = {
isa = PBXGroup;
children = (
53AC39382AF4D4F300A5D42A /* HomeItem.h */,
53AC393D2AF4D4F300A5D42A /* HomeItem.m */,
53AC393A2AF4D4F300A5D42A /* HomeItemCell.h */,
53AC393B2AF4D4F300A5D42A /* HomeItemCell.m */,
53AC393C2AF4D4F300A5D42A /* HomePageVC.h */,
53AC39392AF4D4F300A5D42A /* HomePageVC.m */,
);
path = Home;
sourceTree = "<group>";
};
53AC39412AF4D54200A5D42A /* SafeArea */ = {
isa = PBXGroup;
children = (
53AC39422AF4D54200A5D42A /* NEMeetingSafeArea.h */,
53AC39432AF4D54200A5D42A /* NEMeetingSafeArea.m */,
);
path = SafeArea;
sourceTree = "<group>";
};
9B38B1500FB22AF9DA704F66 /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -709,10 +750,13 @@
5354C49B286EEDDB000F5193 /* NSEditSubscribeMeetingVC.m in Sources */,
410B432524AB2FF800017FA6 /* MeetingControlVC.m in Sources */,
410B433F24AC5F1100017FA6 /* BaseViewController.m in Sources */,
53AC39472AF4D56900A5D42A /* ScreenShareVC.m in Sources */,
410B435524AC81F500017FA6 /* NSData+Demo.m in Sources */,
53AC393F2AF4D4F300A5D42A /* HomeItemCell.m in Sources */,
419EE4CE2508ABA3004F8984 /* SubMeetingCell.m in Sources */,
41937CAE24B4611C00A06BF2 /* SVIndefiniteAnimatedView.m in Sources */,
410B431124AB289600017FA6 /* CheckBox.m in Sources */,
53AC393E2AF4D4F300A5D42A /* HomePageVC.m in Sources */,
419EE5192509F413004F8984 /* NEFromTitleInputCell.m in Sources */,
3AAF4F422559733700EB25E5 /* NEMeetingLoginViewController.m in Sources */,
41A1C98C24A302F9003369D3 /* MainViewController.m in Sources */,
Expand Down Expand Up @@ -744,6 +788,7 @@
414EF1EC251AE73F00F9D91A /* MeetingActionVC.m in Sources */,
410B431A24AB294100017FA6 /* LoginViewController.m in Sources */,
410B432124AB2DB000017FA6 /* UIView+Toast.m in Sources */,
53AC39402AF4D4F300A5D42A /* HomeItem.m in Sources */,
2DA99BEC27FDEE8500D4CE12 /* AppDelegate+MeetingExtension.m in Sources */,
41937CAD24B4611C00A06BF2 /* SVProgressHUD.m in Sources */,
41937CB324B4626100A06BF2 /* LoginInfoManager.m in Sources */,
Expand All @@ -754,6 +799,7 @@
419EE4D42508BA23004F8984 /* SubscribeMeetingListVC.m in Sources */,
2D38F24825837EC800406DCC /* SelectedMenuItemCell.m in Sources */,
419EE5142509C547004F8984 /* NEFromTitleDateCell.m in Sources */,
53AC39442AF4D54200A5D42A /* NEMeetingSafeArea.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "share_screen.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions SampleCode/iOS/NEMeetingDemo/Common/SafeArea/NEMeetingSafeArea.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.

#import <Foundation/Foundation.h>

NS_ASSUME_NONNULL_BEGIN

typedef NS_ENUM(NSInteger, NEMeetingSafeAreaInsets) {
NEMeetingSafeAreaInsetsTop,
NEMeetingSafeAreaInsetsBottom,
NEMeetingSafeAreaInsetsLeft,
NEMeetingSafeAreaInsetsRight
};

@interface NEMeetingSafeArea : NSObject
/// 安全距离
+ (CGFloat)ne_distance:(NEMeetingSafeAreaInsets)insets;
@end

NS_ASSUME_NONNULL_END
43 changes: 43 additions & 0 deletions SampleCode/iOS/NEMeetingDemo/Common/SafeArea/NEMeetingSafeArea.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.

#import "NEMeetingSafeArea.h"

@implementation NEMeetingSafeArea
+ (CGFloat)ne_distance:(NEMeetingSafeAreaInsets)insets {
if (@available(iOS 13.0, *)) {
NSSet *set = [UIApplication sharedApplication].connectedScenes;
UIWindowScene *windowScene = [set anyObject];
UIWindow *window = windowScene.windows.firstObject;
switch (insets) {
case NEMeetingSafeAreaInsetsTop:
return window.safeAreaInsets.top > 0 ? window.safeAreaInsets.top : 0;
case NEMeetingSafeAreaInsetsLeft:
return window.safeAreaInsets.left > 0 ? window.safeAreaInsets.left : 0;
case NEMeetingSafeAreaInsetsRight:
return window.safeAreaInsets.right > 0 ? window.safeAreaInsets.right : 0;
case NEMeetingSafeAreaInsetsBottom:
return window.safeAreaInsets.bottom > 0 ? window.safeAreaInsets.bottom : 0;
default:
break;
}
return window.safeAreaInsets.top;
} else if (@available(iOS 11.0, *)) {
UIWindow *window = [UIApplication sharedApplication].windows.firstObject;
switch (insets) {
case NEMeetingSafeAreaInsetsTop:
return window.safeAreaInsets.top > 0 ? window.safeAreaInsets.top : 0;
case NEMeetingSafeAreaInsetsLeft:
return window.safeAreaInsets.left > 0 ? window.safeAreaInsets.left : 0;
case NEMeetingSafeAreaInsetsRight:
return window.safeAreaInsets.right > 0 ? window.safeAreaInsets.right : 0;
case NEMeetingSafeAreaInsetsBottom:
return window.safeAreaInsets.bottom > 0 ? window.safeAreaInsets.bottom : 0;
default:
break;
}
}
return 0;
}
@end
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ NS_ASSUME_NONNULL_BEGIN

- (void)showMessage:(NSString *)message;
- (void)showErrorCode:(NSInteger)code msg:(NSString *)msg;

- (void)setupSubviews;
- (void)makeConstraints;
@end

NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@ - (void)viewDidLoad {
self.navigationController.navigationBar.scrollEdgeAppearance = navBar;
self.navigationController.navigationBar.standardAppearance = navBar;
}
[self setupSubviews];
[self makeConstraints];
}
- (void)setupSubviews {
}
- (void)makeConstraints {
}

- (void)hiddenBackButton {
[self.navigationController.navigationItem setHidesBackButton:YES];
[self.navigationItem setHidesBackButton:YES];
Expand Down
15 changes: 15 additions & 0 deletions SampleCode/iOS/NEMeetingDemo/Section/Home/HomeItem.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.

#import <Foundation/Foundation.h>

NS_ASSUME_NONNULL_BEGIN

@interface HomeItem : NSObject
@property(nonatomic, copy) NSString *title;
@property(nonatomic, copy) NSString *imageName;
+ (instancetype)itemWithTitle:(NSString *)title imageName:(NSString *)imageName;
@end

NS_ASSUME_NONNULL_END
14 changes: 14 additions & 0 deletions SampleCode/iOS/NEMeetingDemo/Section/Home/HomeItem.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.

#import "HomeItem.h"

@implementation HomeItem
+ (instancetype)itemWithTitle:(NSString *)title imageName:(NSString *)imageName {
HomeItem *item = [self new];
item.title = title;
item.imageName = imageName;
return item;
}
@end
13 changes: 13 additions & 0 deletions SampleCode/iOS/NEMeetingDemo/Section/Home/HomeItemCell.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.

#import <UIKit/UIKit.h>
#import "HomeItem.h"
NS_ASSUME_NONNULL_BEGIN

@interface HomeItemCell : UICollectionViewCell
- (void)configWithItem:(HomeItem *)item;
@end

NS_ASSUME_NONNULL_END
58 changes: 58 additions & 0 deletions SampleCode/iOS/NEMeetingDemo/Section/Home/HomeItemCell.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.

#import "HomeItemCell.h"
#import <Masonry/Masonry.h>

@interface HomeItemCell ()
@property(nonatomic, strong) UIImageView *logoImage;
@property(nonatomic, strong) UILabel *nameLabel;
@end

@implementation HomeItemCell
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self setupSubviews];
[self makeConstraints];
}
return self;
}
- (void)configWithItem:(HomeItem *)item {
self.logoImage.image = [UIImage imageNamed:item.imageName];
self.nameLabel.text = item.title;
}
- (void)setupSubviews {
[self.contentView addSubview:self.logoImage];
[self.contentView addSubview:self.nameLabel];
}
- (void)makeConstraints {
[self.logoImage mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(60, 60));
make.centerX.mas_equalTo(0);
make.centerY.equalTo(self.contentView.mas_centerY).offset(-10);
}];
[self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(5);
make.right.mas_equalTo(-5);
make.height.mas_equalTo(15);
make.top.equalTo(self.logoImage.mas_bottom).offset(5);
}];
}
#pragma mark------------------------ Getter ------------------------
- (UIImageView *)logoImage {
if (!_logoImage) {
_logoImage = [[UIImageView alloc] initWithFrame:CGRectZero];
}
return _logoImage;
}
- (UILabel *)nameLabel {
if (!_nameLabel) {
_nameLabel = [[UILabel alloc] initWithFrame:CGRectZero];
_nameLabel.font = [UIFont systemFontOfSize:14];
_nameLabel.textAlignment = NSTextAlignmentCenter;
}
return _nameLabel;
}
@end
13 changes: 13 additions & 0 deletions SampleCode/iOS/NEMeetingDemo/Section/Home/HomePageVC.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.

#import "BaseViewController.h"

NS_ASSUME_NONNULL_BEGIN

@interface HomePageVC : BaseViewController

@end

NS_ASSUME_NONNULL_END
Loading
Loading