nothing

KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -62,8 +62,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1678"
-            endingLineNumber = "1678"
+            startingLineNumber = "1682"
+            endingLineNumber = "1682"
             landmarkName = "-pauseLiveActionBack:"
             landmarkType = "7">
          </BreakpointContent>
@@ -94,8 +94,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1408"
-            endingLineNumber = "1408"
+            startingLineNumber = "1412"
+            endingLineNumber = "1412"
             landmarkName = "-sendMessage:displayMessage:callback:"
             landmarkType = "7">
          </BreakpointContent>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicMessageCell.m

@@ -83,7 +83,7 @@
             self.playImage.hidden = YES;
             self.checkView.hidden = YES;
             self.actionView.hidden = NO;
-            self.actionLabel.text = @"详情";
+            self.actionLabel.text = @"编辑";
             self.actionButton.userInteractionEnabled = NO;
             self.actionLabel.textColor = HexRGB(0xFF4E19);
             [self.actionImage setImage:[UIImage imageNamed:@"edit_course"]];
@@ -95,7 +95,7 @@
             self.playImage.hidden = YES;
             self.checkView.hidden = YES;
             self.actionView.hidden = NO;
-            self.actionLabel.text = @"详情";
+            self.actionLabel.text = @"编辑";
             self.actionButton.userInteractionEnabled = NO;
             self.actionLabel.textColor = HexRGB(0xFF4E19);
             [self.actionImage setImage:[UIImage imageNamed:@"edit_course"]];

KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m

@@ -1015,9 +1015,13 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
                         for (RCRTCRemoteUser *user in remoteUserArray) {
                             if (user.remoteStreams.count) {
                                 [streamArray addObjectsFromArray:user.remoteStreams];
-                                [strongSelf subscribeRemoteResource:streamArray];
                             }
                         }
+                        // 如果存在远端流 订阅
+                        if (streamArray.count) {
+                            [strongSelf subscribeRemoteResource:streamArray];
+
+                        }
                     }
                 }
                 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m

@@ -234,6 +234,9 @@
     else if (index == 3) {
         status = COURSERSTATUS_COMPLETE;
     }
+    else if (index == 4) {
+        status = COURSERSTATUS_CANCLE;
+    }
     else {
         status = COURSERSTATUS_OUTSALE;
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.h

@@ -13,6 +13,7 @@ typedef NS_ENUM(NSInteger, COURSERSTATUS) {
     COURSERSTATUS_NOTSALE,    // 未上架
     COURSERSTATUS_APPLY,      // 报名中
     COURSERSTATUS_COMPLETE,   // 已完成
+    COURSERSTATUS_CANCLE,     // 已取消
     COURSERSTATUS_OUTSALE,    // 已下架
 };
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.m

@@ -101,7 +101,7 @@
             
         }
             break;
-        case COURSERSTATUS_OUTSALE:
+        case COURSERSTATUS_CANCLE:
         {
             self.statusView.backgroundColor = HexRGB(0xF0F0F0);
             self.statusLabel.textColor = HexRGB(0x666666);
@@ -109,6 +109,14 @@
             self.orderUser.hidden = NO;
         }
             break;
+        case COURSERSTATUS_OUTSALE:
+        {
+            self.statusView.backgroundColor = HexRGB(0xF0F0F0);
+            self.statusLabel.textColor = HexRGB(0x666666);
+            self.statusLabel.text = @"已下架";
+            self.orderUser.hidden = NO;
+        }
+            break;
         default:
             break;
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoCell.m

@@ -21,6 +21,8 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *subjectLabel;
 
+@property (weak, nonatomic) IBOutlet UIView *statusView;
+
 @end
 
 @implementation MinePageVideoCell
@@ -28,6 +30,12 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
+    [self setupRadius];
+}
+
+- (void)setupRadius {
+    _statusView.layer.cornerRadius = 8.5f;
+    _statusView.layer.maskedCorners = kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner;
 }
 
 - (void)configSourceModel:(VideoCourseModel *)model {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoCell.xib

@@ -27,6 +27,24 @@
                                     <constraint firstAttribute="height" constant="111" id="nAv-x7-LNJ"/>
                                 </constraints>
                             </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mM7-Jr-9nv">
+                                <rect key="frame" x="0.0" y="6" width="55" height="17"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已上架" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pS1-qb-H8H">
+                                        <rect key="frame" x="12" y="2.5" width="31" height="12"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                        <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" red="0.83529411760000005" green="1" blue="0.96862745100000003" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="pS1-qb-H8H" secondAttribute="trailing" constant="12" id="3AN-E3-1gD"/>
+                                    <constraint firstAttribute="height" constant="17" id="ICz-Qo-u8d"/>
+                                    <constraint firstItem="pS1-qb-H8H" firstAttribute="leading" secondItem="mM7-Jr-9nv" secondAttribute="leading" constant="12" id="qY8-XT-leq"/>
+                                    <constraint firstItem="pS1-qb-H8H" firstAttribute="centerY" secondItem="mM7-Jr-9nv" secondAttribute="centerY" id="uq5-D7-gce"/>
+                                </constraints>
+                            </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UwI-V7-ylA">
                                 <rect key="frame" x="176.5" y="93" width="24.5" height="13"/>
                                 <subviews>
@@ -87,6 +105,7 @@
                             <constraint firstItem="uOk-ia-Vh6" firstAttribute="top" secondItem="U59-Pt-Ft1" secondAttribute="bottom" constant="6" id="1pe-xh-lmN"/>
                             <constraint firstAttribute="trailing" secondItem="U59-Pt-Ft1" secondAttribute="trailing" id="4Dp-mH-SWc"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1HX-v1-naa" secondAttribute="trailing" constant="14" id="8Y8-61-Q3f"/>
+                            <constraint firstItem="mM7-Jr-9nv" firstAttribute="top" secondItem="RA1-Ms-Rdt" secondAttribute="top" constant="6" id="9Is-5k-FxA"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Mbx-Mx-WUq" secondAttribute="trailing" constant="12" id="GWl-77-zOq"/>
                             <constraint firstItem="U59-Pt-Ft1" firstAttribute="top" secondItem="RA1-Ms-Rdt" secondAttribute="top" id="JRf-z3-v3b"/>
                             <constraint firstItem="1HX-v1-naa" firstAttribute="top" secondItem="W3y-Mv-wxM" secondAttribute="bottom" constant="1" id="OPI-20-hwd"/>
@@ -95,6 +114,7 @@
                             <constraint firstItem="uOk-ia-Vh6" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" constant="11" id="RTH-lX-k5P"/>
                             <constraint firstAttribute="trailing" secondItem="uOk-ia-Vh6" secondAttribute="trailing" constant="13" id="S4V-XM-Vxi"/>
                             <constraint firstItem="U59-Pt-Ft1" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" id="UyZ-0m-Zce"/>
+                            <constraint firstItem="mM7-Jr-9nv" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" id="dLl-95-RZp"/>
                             <constraint firstItem="W3y-Mv-wxM" firstAttribute="top" secondItem="U59-Pt-Ft1" secondAttribute="bottom" constant="49" id="jk7-MS-wHh"/>
                             <constraint firstItem="Mbx-Mx-WUq" firstAttribute="centerY" secondItem="W3y-Mv-wxM" secondAttribute="centerY" id="kcQ-QE-lJh"/>
                             <constraint firstAttribute="trailing" secondItem="UwI-V7-ylA" secondAttribute="trailing" constant="6" id="tge-Wr-QAs"/>
@@ -122,6 +142,7 @@
                 <outlet property="courseTitle" destination="uOk-ia-Vh6" id="vHO-8t-9sg"/>
                 <outlet property="coverImage" destination="U59-Pt-Ft1" id="46O-sh-EXw"/>
                 <outlet property="descLabel" destination="1HX-v1-naa" id="RbV-LD-Rl1"/>
+                <outlet property="statusView" destination="mM7-Jr-9nv" id="uJp-9P-QmL"/>
                 <outlet property="subjectLabel" destination="4gv-0P-tG8" id="ZbB-cP-L8Y"/>
             </connections>
             <point key="canvasLocation" x="245.6521739130435" y="142.96875"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoCourseCell.m

@@ -65,7 +65,7 @@
             self.statusLabel.textColor = HexRGB(0x2dc7aa);
             self.statusLabel.text = @"已上架";
             if (hideBottomView) {
-                self.statusView.hidden = YES;
+                self.statusView.hidden = NO;
             }
             else {
                 self.descLabel.hidden = NO;