|
@@ -12,7 +12,6 @@
|
|
|
#import "AccompanyDetailBottomView.h"
|
|
|
#import "HomeworkDetailModel.h"
|
|
|
#import "EvaluateDetailModel.h"
|
|
|
-#import "AccompanyAlertView.h"
|
|
|
#import "KSChatConversationViewController.h"
|
|
|
#import "KSGroupConversationController.h"
|
|
|
#import <WMPlayer.h>
|
|
@@ -35,8 +34,6 @@
|
|
|
|
|
|
@property (nonatomic, strong) UITableView *tableView;
|
|
|
|
|
|
-@property (nonatomic, strong) AccompanyAlertView *alertView;
|
|
|
-
|
|
|
@property (nonatomic, strong) NSMutableArray *fileArray;
|
|
|
|
|
|
@property (nonatomic, strong) KSMediaManager *mediaManager;
|
|
@@ -125,10 +122,16 @@
|
|
|
self.canModify = YES;
|
|
|
}
|
|
|
if ([self.homeworkModel.courseStatus isEqualToString:@"COMPLETE"]) {
|
|
|
- self.tableView.tableFooterView = [UIView new];
|
|
|
+ self.bottomView.hidden = YES;
|
|
|
+ UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 15)];
|
|
|
+ self.tableView.tableFooterView = bottomView;
|
|
|
}
|
|
|
else {
|
|
|
- self.tableView.tableFooterView = self.bottomView;
|
|
|
+ CGFloat bottomHeight = [AccompanyDetailBottomView getViewHeight];
|
|
|
+ UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, bottomHeight)];
|
|
|
+ self.tableView.tableFooterView = bottomView;
|
|
|
+
|
|
|
+ self.bottomView.hidden = NO;
|
|
|
self.bottomView.actionButton.userInteractionEnabled = YES;
|
|
|
[self.bottomView.actionButton setTitle:@"进入教室" forState:UIControlStateNormal];
|
|
|
[self.bottomView.actionButton setBackgroundColor:THEMECOLOR];
|
|
@@ -142,8 +145,17 @@
|
|
|
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
make.left.right.mas_equalTo(self.view);
|
|
|
make.top.mas_equalTo(self.view.mas_top);
|
|
|
- make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
|
|
|
+ make.bottom.mas_equalTo(self.view.mas_bottom);
|
|
|
+ }];
|
|
|
+
|
|
|
+ CGFloat bottomHeight = [AccompanyDetailBottomView getViewHeight];
|
|
|
+
|
|
|
+ [self.view addSubview:self.bottomView];
|
|
|
+ [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
+ make.left.right.bottom.mas_equalTo(self.view);
|
|
|
+ make.height.mas_equalTo(bottomHeight);
|
|
|
}];
|
|
|
+ self.bottomView.hidden = YES;
|
|
|
}
|
|
|
|
|
|
- (void)evaluateWithStatusLabel:(UILabel *)statusLabel {
|
|
@@ -422,7 +434,6 @@
|
|
|
- (AccompanyDetailBottomView *)bottomView {
|
|
|
if (!_bottomView) {
|
|
|
_bottomView = [AccompanyDetailBottomView shareInstance];
|
|
|
- _bottomView.frame = CGRectMake(0, 0, kScreenWidth, 70);
|
|
|
MJWeakSelf;
|
|
|
[_bottomView sureAction:^{
|
|
|
[weakSelf bottomButtonAction];
|
|
@@ -433,6 +444,7 @@
|
|
|
- (UITableView *)tableView {
|
|
|
if (!_tableView) {
|
|
|
_tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
|
|
|
+ _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
|
|
|
_tableView.backgroundColor = [UIColor clearColor];
|
|
|
_tableView.delegate = self;
|
|
|
_tableView.dataSource = self;
|
|
@@ -445,8 +457,6 @@
|
|
|
[_tableView registerNib:[UINib nibWithNibName:@"AccompanyArrangeCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"AccompanyArrangeCell"];
|
|
|
[_tableView registerNib:[UINib nibWithNibName:@"AccompanyHomeworkCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"AccompanyHomeworkCell"];
|
|
|
[_tableView registerNib:[UINib nibWithNibName:@"AccompanyRemarkCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"AccompanyRemarkCell"];
|
|
|
- _tableView.tableFooterView = self.bottomView;
|
|
|
-
|
|
|
}
|
|
|
return _tableView;
|
|
|
}
|