1、课程详情页的进入教室按钮固定显示在底部

2、老师端-收到评价的推送，跳到【我收到的评价】页面，右上角去掉【我的评价】按钮

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/View/GroupCreateView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -15,10 +15,17 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mct-5U-JZd">
-                    <rect key="frame" x="14" y="20" width="386" height="80"/>
+                    <rect key="frame" x="14" y="20" width="386" height="82"/>
                     <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tenant_group_name" translatesAutoresizingMaskIntoConstraints="NO" id="oFX-s4-Pbl">
+                            <rect key="frame" x="11" y="12" width="24" height="24"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="GT1-5j-bA8"/>
+                                <constraint firstAttribute="height" constant="24" id="Wmf-qy-XUG"/>
+                            </constraints>
+                        </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jnz-TD-TD3">
-                            <rect key="frame" x="21" y="12" width="8" height="24"/>
+                            <rect key="frame" x="38" y="12" width="8" height="24"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="24" id="lZv-UI-Sgp"/>
                             </constraints>
@@ -27,16 +34,16 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wye-f9-0ru">
-                            <rect key="frame" x="29" y="12" width="52" height="24"/>
+                            <rect key="frame" x="46" y="12" width="51" height="24"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="24" id="HsX-d4-Sy1"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入群聊名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ydi-WF-MOd">
-                            <rect key="frame" x="21" y="41" width="344" height="34"/>
+                            <rect key="frame" x="12" y="36" width="362" height="36"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <textInputTraits key="textInputTraits"/>
@@ -44,15 +51,17 @@
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
-                        <constraint firstItem="Ydi-WF-MOd" firstAttribute="top" secondItem="Jnz-TD-TD3" secondAttribute="bottom" constant="5" id="CLX-Bu-TcU"/>
-                        <constraint firstAttribute="bottom" secondItem="Ydi-WF-MOd" secondAttribute="bottom" constant="5" id="CaJ-V6-Z54"/>
-                        <constraint firstItem="wye-f9-0ru" firstAttribute="top" secondItem="mct-5U-JZd" secondAttribute="top" constant="12" id="K6I-7R-90x"/>
-                        <constraint firstAttribute="height" constant="80" id="NoQ-6s-ZxC"/>
+                        <constraint firstAttribute="bottom" secondItem="Ydi-WF-MOd" secondAttribute="bottom" constant="10" id="CaJ-V6-Z54"/>
+                        <constraint firstItem="Jnz-TD-TD3" firstAttribute="centerY" secondItem="oFX-s4-Pbl" secondAttribute="centerY" id="FBN-XZ-OMD"/>
+                        <constraint firstItem="wye-f9-0ru" firstAttribute="centerY" secondItem="oFX-s4-Pbl" secondAttribute="centerY" id="JKV-4M-G41"/>
+                        <constraint firstAttribute="height" constant="82" id="NoQ-6s-ZxC"/>
+                        <constraint firstItem="Jnz-TD-TD3" firstAttribute="leading" secondItem="oFX-s4-Pbl" secondAttribute="trailing" constant="3" id="aEf-lK-slF"/>
                         <constraint firstItem="wye-f9-0ru" firstAttribute="leading" secondItem="Jnz-TD-TD3" secondAttribute="trailing" id="dsx-eH-Wb8"/>
-                        <constraint firstAttribute="trailing" secondItem="Ydi-WF-MOd" secondAttribute="trailing" constant="21" id="eK6-Gs-psr"/>
-                        <constraint firstItem="Jnz-TD-TD3" firstAttribute="top" secondItem="mct-5U-JZd" secondAttribute="top" constant="12" id="koM-eY-5CL"/>
-                        <constraint firstItem="Ydi-WF-MOd" firstAttribute="leading" secondItem="mct-5U-JZd" secondAttribute="leading" constant="21" id="qrq-l6-aaq"/>
-                        <constraint firstItem="Jnz-TD-TD3" firstAttribute="leading" secondItem="mct-5U-JZd" secondAttribute="leading" constant="21" id="wfp-5Y-CFc"/>
+                        <constraint firstItem="oFX-s4-Pbl" firstAttribute="leading" secondItem="mct-5U-JZd" secondAttribute="leading" constant="11" id="duD-xl-QEN"/>
+                        <constraint firstAttribute="trailing" secondItem="Ydi-WF-MOd" secondAttribute="trailing" constant="12" id="eK6-Gs-psr"/>
+                        <constraint firstItem="Ydi-WF-MOd" firstAttribute="leading" secondItem="mct-5U-JZd" secondAttribute="leading" constant="12" id="qrq-l6-aaq"/>
+                        <constraint firstItem="Ydi-WF-MOd" firstAttribute="top" secondItem="oFX-s4-Pbl" secondAttribute="bottom" id="r0Y-d7-5xv"/>
+                        <constraint firstItem="oFX-s4-Pbl" firstAttribute="top" secondItem="mct-5U-JZd" secondAttribute="top" constant="12" id="rD3-s9-ecX"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -61,26 +70,33 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fwm-Fv-ZBM">
-                    <rect key="frame" x="14" y="112" width="386" height="190"/>
+                    <rect key="frame" x="14" y="114" width="386" height="191"/>
                     <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tenant_group_desc" translatesAutoresizingMaskIntoConstraints="NO" id="Zie-NE-iJI">
+                            <rect key="frame" x="11" y="12" width="24" height="24"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="tTo-Ao-j2R"/>
+                                <constraint firstAttribute="height" constant="24" id="xiF-hZ-weo"/>
+                            </constraints>
+                        </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tJX-ua-o6g">
-                            <rect key="frame" x="21" y="12" width="52" height="24"/>
+                            <rect key="frame" x="38" y="12" width="51" height="24"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="24" id="Wsq-J4-wof"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Wg-F3-b3t">
-                            <rect key="frame" x="21" y="46" width="344" height="134"/>
+                            <rect key="frame" x="0.0" y="36" width="386" height="145"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <color key="textColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
                         </textView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请输入群简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6cC-ME-Lxn">
-                            <rect key="frame" x="21" y="55" width="98" height="19.5"/>
+                            <rect key="frame" x="10" y="45" width="95.5" height="19.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <color key="textColor" red="0.75686274509803919" green="0.75686274509803919" blue="0.75686274509803919" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -88,15 +104,17 @@
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
-                        <constraint firstItem="tJX-ua-o6g" firstAttribute="leading" secondItem="Fwm-Fv-ZBM" secondAttribute="leading" constant="21" id="2IO-zs-UeF"/>
-                        <constraint firstItem="6cC-ME-Lxn" firstAttribute="top" secondItem="tJX-ua-o6g" secondAttribute="bottom" constant="19" id="BQV-Fc-3xK"/>
-                        <constraint firstAttribute="trailing" secondItem="8Wg-F3-b3t" secondAttribute="trailing" constant="21" id="Ghc-M5-Te1"/>
-                        <constraint firstItem="6cC-ME-Lxn" firstAttribute="leading" secondItem="Fwm-Fv-ZBM" secondAttribute="leading" constant="21" id="QUe-dK-f3g"/>
+                        <constraint firstItem="Zie-NE-iJI" firstAttribute="leading" secondItem="Fwm-Fv-ZBM" secondAttribute="leading" constant="11" id="4xq-L0-lJf"/>
+                        <constraint firstAttribute="trailing" secondItem="8Wg-F3-b3t" secondAttribute="trailing" id="Ghc-M5-Te1"/>
+                        <constraint firstItem="6cC-ME-Lxn" firstAttribute="top" secondItem="Zie-NE-iJI" secondAttribute="bottom" constant="9" id="Mb6-d7-AIV"/>
+                        <constraint firstItem="tJX-ua-o6g" firstAttribute="centerY" secondItem="Zie-NE-iJI" secondAttribute="centerY" id="NbX-jp-IBw"/>
+                        <constraint firstItem="6cC-ME-Lxn" firstAttribute="leading" secondItem="Fwm-Fv-ZBM" secondAttribute="leading" constant="10" id="QUe-dK-f3g"/>
                         <constraint firstAttribute="bottom" secondItem="8Wg-F3-b3t" secondAttribute="bottom" constant="10" id="UJc-G0-jNm"/>
-                        <constraint firstItem="8Wg-F3-b3t" firstAttribute="top" secondItem="tJX-ua-o6g" secondAttribute="bottom" constant="10" id="ZbZ-ZN-FZN"/>
-                        <constraint firstAttribute="height" constant="190" id="gw5-ew-i0y"/>
-                        <constraint firstItem="tJX-ua-o6g" firstAttribute="top" secondItem="Fwm-Fv-ZBM" secondAttribute="top" constant="12" id="oeT-5N-1gr"/>
-                        <constraint firstItem="8Wg-F3-b3t" firstAttribute="leading" secondItem="Fwm-Fv-ZBM" secondAttribute="leading" constant="21" id="v73-op-vAA"/>
+                        <constraint firstItem="8Wg-F3-b3t" firstAttribute="top" secondItem="Zie-NE-iJI" secondAttribute="bottom" id="VVJ-Ly-9bE"/>
+                        <constraint firstAttribute="height" constant="191" id="gw5-ew-i0y"/>
+                        <constraint firstItem="tJX-ua-o6g" firstAttribute="leading" secondItem="Zie-NE-iJI" secondAttribute="trailing" constant="3" id="rQR-w6-vUF"/>
+                        <constraint firstItem="Zie-NE-iJI" firstAttribute="top" secondItem="Fwm-Fv-ZBM" secondAttribute="top" constant="12" id="rvN-Yd-cYL"/>
+                        <constraint firstItem="8Wg-F3-b3t" firstAttribute="leading" secondItem="Fwm-Fv-ZBM" secondAttribute="leading" id="v73-op-vAA"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -105,7 +123,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3wa-2h-3g3">
-                    <rect key="frame" x="28" y="332" width="358" height="44"/>
+                    <rect key="frame" x="28" y="335" width="358" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="rHg-0G-vFh"/>
@@ -147,6 +165,8 @@
         </view>
     </objects>
     <resources>
+        <image name="tenant_group_desc" width="24" height="24"/>
+        <image name="tenant_group_name" width="24" height="24"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/Controller/AccompanyDetailViewController.m

@@ -137,16 +137,29 @@
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
         make.top.mas_equalTo(self.view.mas_top).offset(kNaviBarHeight);
-        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
+        make.bottom.mas_equalTo(self.view.mas_bottom);
     }];
+    [self.view addSubview:self.bottomView];
+    CGFloat bottomHeight = [AccompanyDetailBottomView getViewHeight];
+    [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.bottom.mas_equalTo(self.view);
+        make.height.mas_equalTo(bottomHeight);
+    }];
+    self.bottomView.hidden = YES;
 }
 
 - (void)evaluateViewDisplay {
     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.sureButton.userInteractionEnabled = YES;
         [self.bottomView.sureButton setTitle:@"进入教室" forState:UIControlStateNormal];
         [self.bottomView.sureButton setBackgroundColor:THEMECOLOR];
@@ -424,6 +437,7 @@
 - (UITableView *)tableView {
     if (!_tableView) {
         _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+        _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         _tableView.delegate = self;
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyDetailBottomView.h

@@ -19,6 +19,8 @@ typedef void(^JoinClassroomAction)(void);
 
 - (void)joinroomCallback:(JoinClassroomAction)callback;
 
++ (CGFloat)getViewHeight;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyDetailBottomView.m

@@ -32,6 +32,14 @@
     }
 }
 
++ (CGFloat)getViewHeight {
+    if (IS_iPhoneX) {
+        return 44 + 10 + iPhoneXSafeBottomMargin;
+    }
+    else {
+        return 44 + 10 + 20;
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyDetailBottomView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,7 +14,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rQe-Un-bUG">
-                    <rect key="frame" x="28" y="15" width="358" height="44"/>
+                    <rect key="frame" x="28" y="10" width="358" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="ObK-NO-oFb"/>
@@ -34,7 +34,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="rQe-Un-bUG" secondAttribute="trailing" constant="28" id="9dH-1T-aSO"/>
-                <constraint firstItem="rQe-Un-bUG" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15" id="ldd-sP-BZe"/>
+                <constraint firstItem="rQe-Un-bUG" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="ldd-sP-BZe"/>
                 <constraint firstItem="rQe-Un-bUG" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="pLN-ap-tbg"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/Controller/MusicRoomViewController.m

@@ -57,6 +57,15 @@
         make.top.mas_equalTo(self.view.mas_top);
         make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
     }];
+    
+    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)viewWillAppear:(BOOL)animated {
@@ -104,10 +113,16 @@
 
 - (void)evaluateBottomButtonStatus {
     if ([self.detailModel.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.sureButton.userInteractionEnabled = YES;
         [self.bottomView.sureButton setTitle:@"进入教室" forState:UIControlStateNormal];
         [self.bottomView.sureButton setBackgroundColor:THEMECOLOR];
@@ -232,6 +247,7 @@
 - (UITableView *)tableView {
     if (!_tableView) {
         _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
+        _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         _tableView.delegate = self;
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -243,8 +259,8 @@
         [_tableView registerNib:[UINib nibWithNibName:@"MusicRoomCourseInfoCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MusicRoomCourseInfoCell"];
         [_tableView registerNib:[UINib nibWithNibName:@"AccompanyArrangeCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"AccompanyArrangeCell"];
         [_tableView registerNib:[UINib nibWithNibName:@"MusicRoomStudentCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MusicRoomStudentCell"];
-        self.bottomView.frame = CGRectMake(0, 0, kScreenWidth, 70);
-        _tableView.tableFooterView = self.bottomView;
+        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 12)];
+        _tableView.tableHeaderView = headView;
     }
     return _tableView;
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Course/VIPCourse/Controller/VipCouseDetailViewController.m

@@ -114,10 +114,16 @@
 
 - (void)evaluateViewDisplay {
     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.sureButton.userInteractionEnabled = YES;
         [self.bottomView.sureButton setTitle:@"进入教室" forState:UIControlStateNormal];
         [self.bottomView.sureButton setBackgroundColor:THEMECOLOR];
@@ -151,8 +157,16 @@
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
         make.top.mas_equalTo(self.view.mas_top).offset(kNaviBarHeight);
-        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 {
@@ -425,6 +439,7 @@
 - (UITableView *)tableView {
     if (!_tableView) {
         _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+        _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         _tableView.delegate = self;
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -439,8 +454,6 @@
         [_tableView registerNib:[UINib nibWithNibName:@"AccompanyHomeworkCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"AccompanyHomeworkCell"];
         [_tableView registerNib:[UINib nibWithNibName:@"AccompanyRemarkCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"AccompanyRemarkCell"];
         _tableView.estimatedRowHeight = 136.0f;
-        self.bottomView.frame = CGRectMake(0, 0, kScreenWidth, 70);
-        _tableView.tableFooterView = self.bottomView;
     }
     return _tableView;
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/ReceiveEvaluate/Controller/ReceiveEvaluateListController.m

@@ -30,15 +30,10 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self allocTitle:@"我收到的评价"];
-    [self rightButtonTitle:@"我的评价"];
     [self configDefault];
     [self configUI];
 }
 
-- (void)rightBtnClick {
-    [self backAction];
-}
-
 - (void)configDefault {
     [self.dateFormatter setDateFormat:@"yyyy-MM"];
     NSDate *date = [NSDate date];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/InstrumentChooseViewController.m

@@ -52,10 +52,11 @@
 - (void)configUI {
     [self.scrollView removeFromSuperview];
     [self.view addSubview:self.bottomView];
+    CGFloat bottomHeight = [InstrumentChooseBottonView getViewHeight];
     [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
-        make.height.mas_equalTo(90);
+        make.bottom.mas_equalTo(self.view.mas_bottom);
+        make.height.mas_equalTo(bottomHeight);
     }];
     
     UIView *headView = [[UIView alloc] init];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/InstrumentChooseBottonView.h

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)sureCallback:(InstrumentChooseCallback)callback;
 
++ (CGFloat)getViewHeight;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/InstrumentChooseBottonView.m

@@ -32,6 +32,15 @@
     }
 }
 
++ (CGFloat)getViewHeight {
+    if (IS_iPhoneX) {
+        return 44 + 30 + iPhoneXSafeBottomMargin;
+    }
+    else {
+        return 44 + 30 + 20;
+    }
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/InstrumentChooseBottonView.xib

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="InstrumentChooseBottonView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="109"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uf1-mj-TtD">
-                    <rect key="frame" x="28" y="10" width="358" height="44"/>
+                    <rect key="frame" x="28" y="30" width="358" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="d5b-G6-Zxi"/>
@@ -34,8 +34,8 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="Uf1-mj-TtD" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="2ev-7D-ncM"/>
-                <constraint firstItem="Uf1-mj-TtD" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="XfO-IP-zIf"/>
                 <constraint firstAttribute="trailing" secondItem="Uf1-mj-TtD" secondAttribute="trailing" constant="28" id="d7h-AJ-pUx"/>
+                <constraint firstItem="Uf1-mj-TtD" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="30" id="kUv-HD-1fh"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/VipCourse/MinePageVipProgramCell.m

@@ -8,6 +8,7 @@
 #import "MinePageVipProgramCell.h"
 
 @interface MinePageVipProgramCell ()
+@property (weak, nonatomic) IBOutlet UIView *layerBg;
 
 @property (weak, nonatomic) IBOutlet UIImageView *subjectImage;
 
@@ -29,6 +30,8 @@
     [super awakeFromNib];
     // Initialization code
     self.selectionStyle = UITableViewCellSelectionStyleNone;
+    self.layerBg.layer.cornerRadius = 6.0f;
+    self.layerBg.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMaxXMinYCorner;
 }
 
 - (void)configWithSource:(CoursePargramListModel *)model callback:(EditPragamAction)callback {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/VipCourse/MinePageVipProgramCell.xib

@@ -128,6 +128,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="durationLabel" destination="hwq-i8-T3E" id="U7s-4V-TNK"/>
+                <outlet property="layerBg" destination="iRv-tB-juu" id="L5J-sP-Bkx"/>
                 <outlet property="priceLabel" destination="nwI-CN-eRd" id="mfh-xQ-DRQ"/>
                 <outlet property="programName" destination="geC-8C-ZFK" id="7qz-Z9-uu8"/>
                 <outlet property="subjectImage" destination="lj2-cE-uvp" id="cps-mN-qoa"/>