1.3.0

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -824,7 +824,6 @@
 		BCC583FE28A9FA8100BAB4CF /* cloud_animation_24.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583DF28A9FA8100BAB4CF /* cloud_animation_24.png */; };
 		BCC583FF28A9FA8100BAB4CF /* cloud_animation_18.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583E028A9FA8100BAB4CF /* cloud_animation_18.png */; };
 		BCC5840028A9FA8100BAB4CF /* cloud_animation_15.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583E128A9FA8100BAB4CF /* cloud_animation_15.png */; };
-		BCC5840128A9FA8100BAB4CF /* cloud_animation_29.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583E228A9FA8100BAB4CF /* cloud_animation_29.png */; };
 		BCC5840228A9FA8100BAB4CF /* cloud_animation_28.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583E328A9FA8100BAB4CF /* cloud_animation_28.png */; };
 		BCC5840328A9FA8100BAB4CF /* cloud_animation_14.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583E428A9FA8100BAB4CF /* cloud_animation_14.png */; };
 		BCC5840428A9FA8100BAB4CF /* cloud_animation_16.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583E528A9FA8100BAB4CF /* cloud_animation_16.png */; };
@@ -846,6 +845,7 @@
 		BCC5841728A9FA9D00BAB4CF /* AccompanyLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC5841528A9FA9D00BAB4CF /* AccompanyLoadingView.m */; };
 		BCC5841A28AA36CF00BAB4CF /* BadgeIntroduceView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC5841928AA36CF00BAB4CF /* BadgeIntroduceView.m */; };
 		BCC5841C28AA36D700BAB4CF /* BadgeIntroduceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC5841B28AA36D700BAB4CF /* BadgeIntroduceView.xib */; };
+		BCC5842028AA559700BAB4CF /* icloud_animation_29.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC5841F28AA559700BAB4CF /* icloud_animation_29.png */; };
 		BCC9F35527F5F4FD00647449 /* LiveSeatMember.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC9F35427F5F4FD00647449 /* LiveSeatMember.m */; };
 		BCC9F40727F69BD200647449 /* SealClass.strings in Resources */ = {isa = PBXBuildFile; fileRef = BCC9F35C27F69BD100647449 /* SealClass.strings */; };
 		BCC9F40927F69BD200647449 /* ZoomControl.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC9F36427F69BD100647449 /* ZoomControl.m */; };
@@ -2406,7 +2406,6 @@
 		BCC583DF28A9FA8100BAB4CF /* cloud_animation_24.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_24.png; sourceTree = "<group>"; };
 		BCC583E028A9FA8100BAB4CF /* cloud_animation_18.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_18.png; sourceTree = "<group>"; };
 		BCC583E128A9FA8100BAB4CF /* cloud_animation_15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_15.png; sourceTree = "<group>"; };
-		BCC583E228A9FA8100BAB4CF /* cloud_animation_29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_29.png; sourceTree = "<group>"; };
 		BCC583E328A9FA8100BAB4CF /* cloud_animation_28.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_28.png; sourceTree = "<group>"; };
 		BCC583E428A9FA8100BAB4CF /* cloud_animation_14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_14.png; sourceTree = "<group>"; };
 		BCC583E528A9FA8100BAB4CF /* cloud_animation_16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_16.png; sourceTree = "<group>"; };
@@ -2430,6 +2429,7 @@
 		BCC5841828AA36CF00BAB4CF /* BadgeIntroduceView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BadgeIntroduceView.h; sourceTree = "<group>"; };
 		BCC5841928AA36CF00BAB4CF /* BadgeIntroduceView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BadgeIntroduceView.m; sourceTree = "<group>"; };
 		BCC5841B28AA36D700BAB4CF /* BadgeIntroduceView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BadgeIntroduceView.xib; sourceTree = "<group>"; };
+		BCC5841F28AA559700BAB4CF /* icloud_animation_29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icloud_animation_29.png; sourceTree = "<group>"; };
 		BCC9F35327F5F4FD00647449 /* LiveSeatMember.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LiveSeatMember.h; sourceTree = "<group>"; };
 		BCC9F35427F5F4FD00647449 /* LiveSeatMember.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LiveSeatMember.m; sourceTree = "<group>"; };
 		BCC9F35B27F69BD100647449 /* KSRemoteUserManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSRemoteUserManager.h; sourceTree = "<group>"; };
@@ -6070,8 +6070,8 @@
 				BCC583DE28A9FA8100BAB4CF /* cloud_animation_25.png */,
 				BCC583DF28A9FA8100BAB4CF /* cloud_animation_24.png */,
 				BCC583E028A9FA8100BAB4CF /* cloud_animation_18.png */,
+				BCC5841F28AA559700BAB4CF /* icloud_animation_29.png */,
 				BCC583E128A9FA8100BAB4CF /* cloud_animation_15.png */,
-				BCC583E228A9FA8100BAB4CF /* cloud_animation_29.png */,
 				BCC583E328A9FA8100BAB4CF /* cloud_animation_28.png */,
 				BCC583E428A9FA8100BAB4CF /* cloud_animation_14.png */,
 				BCC583E528A9FA8100BAB4CF /* cloud_animation_16.png */,
@@ -6769,7 +6769,6 @@
 				BC71D2052887FDD40010F14B /* img_27.png in Resources */,
 				BC542E3828406F8000633781 /* UserAuthBodyView.xib in Resources */,
 				27A54CEE27E9B986007309A3 /* ModifyNameBodyView.xib in Resources */,
-				BCC5840128A9FA8100BAB4CF /* cloud_animation_29.png in Resources */,
 				BCC583FA28A9FA8100BAB4CF /* cloud_animation_26.png in Resources */,
 				2708565E27EDA83100EC8E72 /* GroupMemberListCell.xib in Resources */,
 				BCDE359A289BC02200A9A560 /* HomeHotAlbumCell.xib in Resources */,
@@ -6964,6 +6963,7 @@
 				BC71D1F02887FDD40010F14B /* img_3.png in Resources */,
 				BCC5841128A9FA8100BAB4CF /* cloud_animation_2.png in Resources */,
 				275E3DE327F467410010EC30 /* BaseEmoji.plist in Resources */,
+				BCC5842028AA559700BAB4CF /* icloud_animation_29.png in Resources */,
 				273C75A027E9681700F7C26F /* SettingBodyView.xib in Resources */,
 				BCC5840528A9FA8100BAB4CF /* cloud_animation_17.png in Resources */,
 				BC71D1F12887FDD40010F14B /* img_12.png in Resources */,
@@ -7924,7 +7924,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.2.0;
+				CURRENT_PROJECT_VERSION = 1.3.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7970,7 +7970,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -7986,7 +7986,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.2.0;
+				CURRENT_PROJECT_VERSION = 1.3.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8032,7 +8032,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

KulexiuForTeacher/KulexiuForTeacher/Common/Base/AccompanyLoadingView.xib

@@ -17,10 +17,11 @@
                     <rect key="frame" x="0.0" y="0.0" width="699" height="340"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gn9-HQ-HPj">
-                    <rect key="frame" x="81" y="0.0" width="537" height="340"/>
+                    <rect key="frame" x="199.5" y="70" width="300" height="200"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="Gn9-HQ-HPj" secondAttribute="height" multiplier="865:548" id="nMf-gF-jkz"/>
+                        <constraint firstAttribute="width" constant="300" id="m5J-oC-fe8"/>
+                        <constraint firstAttribute="width" secondItem="Gn9-HQ-HPj" secondAttribute="height" multiplier="3:2" id="nMf-gF-jkz"/>
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小酷正在努力加载，请稍等..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bjn-zM-LJW">
@@ -55,14 +56,12 @@
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="QuP-sd-KI7"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="centerY" secondItem="ncV-eS-8Yx" secondAttribute="centerY" id="TSR-47-coa"/>
                 <constraint firstAttribute="bottom" secondItem="Bjn-zM-LJW" secondAttribute="bottom" constant="30" id="YAP-rE-Kfk"/>
-                <constraint firstItem="Gn9-HQ-HPj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="YeD-2h-0IN"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Z4M-rM-8kS"/>
                 <constraint firstItem="ZV3-qJ-uxE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="beT-6f-OTP"/>
                 <constraint firstAttribute="bottom" secondItem="ZV3-qJ-uxE" secondAttribute="bottom" id="hv4-uE-orY"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="22" id="ioX-pe-BBS"/>
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="jNQ-KE-15G"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="17" id="lw2-0g-sel"/>
-                <constraint firstAttribute="bottom" secondItem="Gn9-HQ-HPj" secondAttribute="bottom" id="mmb-Wl-p7o"/>
                 <constraint firstItem="Bjn-zM-LJW" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="qjV-MX-C2L"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>

KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch

@@ -116,23 +116,23 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/teacher")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (YES)
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/teacher")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (YES)
 
 //#else
 
-//#define hostURL (@"https://online.colexiu.com")
-//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://online.colexiu.com/teacher")
-//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"e5t4ouvpe42pa")
-//#define SUBMIT_UUID (YES)
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/teacher")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
 
 
 //#endif

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

@@ -236,7 +236,7 @@
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (self.selectIndex == 3 || self.selectIndex == 4) { // 失败和下架的可编辑
+    if (self.selectIndex == 3) {
         MusicMessageModel *model = self.dataArray[indexPath.row];
         KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
         webCtrl.url = [NSString stringWithFormat:@"%@/#/music-upload/%.0f/edit", WEBHOST, model.internalBaseClassIdentifier];

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

@@ -49,8 +49,13 @@
         self.orderView.hidden = NO;
         self.orderUser.text = [NSString stringWithFormat:@"%.0f人已购买",model.studentCount];
     }
+    if (model.coursePrice > 0) {
+        self.priceLabel.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.coursePrice,model.courseNum];
+    }
+    else {
+        self.priceLabel.text = [NSString  stringWithFormat:@"免费/%.0f课时",model.courseNum];
+    }
     
-    self.priceLabel.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.coursePrice,model.courseNum];
     // time
     NSDateFormatter *formatter = [NSObject getDateformatter];
     [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];

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

@@ -37,7 +37,13 @@
     self.courseTitle.text = [NSString returnNoNullStringWithString:model.lessonName];
     [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
     self.teacherName.text = [NSString returnNoNullStringWithString:model.username];
-    self.courseMessage.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.lessonPrice,model.lessonCount];
+    if (model.lessonPrice > 0) {
+        self.courseMessage.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.lessonPrice,model.lessonCount];
+    }
+    else {
+        self.courseMessage.text = [NSString  stringWithFormat:@"免费/%.0f课时",model.lessonCount];
+    }
+
     
     self.descLabel.text = [NSString stringWithFormat:@"%.0f人已购买",model.countStudent];
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.lessonSubjectName];

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

@@ -44,8 +44,13 @@
     else {
         self.teacherName.text = model.username;
     }
+    if (model.lessonPrice > 0) {
+        self.courseMessage.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.lessonPrice,model.lessonCount];
+    }
+    else {
+        self.courseMessage.text = [NSString  stringWithFormat:@"免费/%.0f课时",model.lessonCount];
+    }
     
-    self.courseMessage.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.lessonPrice,model.lessonCount];
     if (isCheck) {
         self.descView.hidden = YES;
         self.descLabel.text = @"";

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

@@ -204,7 +204,7 @@
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
     VideoCourseModel *model = [self.dataArray objectAtIndex:indexPath.row];
     NSString *url = @"";
-    if (self.selectIndex == 2 || self.selectIndex == 3) { // 失败和下架的可编辑
+    if (self.selectIndex == 2) {
         url = [NSString stringWithFormat:@"%@%@%.0f", WEBHOST, @"/#/videoCreate?groupId=",model.internalBaseClassIdentifier];
     }
     else {