Steven 2 年之前
父节点
当前提交
e9c1e0d1cf

+ 8 - 4
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -861,6 +861,7 @@
 		BCDB09402805C0EF00D0BDAD /* NewClassPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCDB093D2805C0EF00D0BDAD /* NewClassPopView.m */; };
 		BCDBC59D286156E700647197 /* LiveRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCDBC59C286156E700647197 /* LiveRoomViewController.m */; };
 		BCDBC5A028615E0300647197 /* HomeTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCDBC59F28615E0300647197 /* HomeTopView.m */; };
+		BCDE358A2897B48E00A9A560 /* shareImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCDE35892897B48E00A9A560 /* shareImage@2x.png */; };
 		BCE06F2B2818146700234817 /* KSConfirmAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE06F2A2818146700234817 /* KSConfirmAlertView.m */; };
 		BCE06F2D2818147000234817 /* KSConfirmAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCE06F2C2818147000234817 /* KSConfirmAlertView.xib */; };
 		BCE6A07F27F7FACA00C97704 /* UIView+SubViewExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE6A07E27F7FACA00C97704 /* UIView+SubViewExtension.m */; };
@@ -2437,6 +2438,7 @@
 		BCDBC59C286156E700647197 /* LiveRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LiveRoomViewController.m; sourceTree = "<group>"; };
 		BCDBC59E28615E0300647197 /* HomeTopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeTopView.h; sourceTree = "<group>"; };
 		BCDBC59F28615E0300647197 /* HomeTopView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeTopView.m; sourceTree = "<group>"; };
+		BCDE35892897B48E00A9A560 /* shareImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shareImage@2x.png"; sourceTree = "<group>"; };
 		BCE06F292818146700234817 /* KSConfirmAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSConfirmAlertView.h; sourceTree = "<group>"; };
 		BCE06F2A2818146700234817 /* KSConfirmAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSConfirmAlertView.m; sourceTree = "<group>"; };
 		BCE06F2C2818147000234817 /* KSConfirmAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KSConfirmAlertView.xib; sourceTree = "<group>"; };
@@ -2773,6 +2775,7 @@
 		275E8A6627E18F2300DD3F6E /* KulexiuForTeacher */ = {
 			isa = PBXGroup;
 			children = (
+				BCDE35892897B48E00A9A560 /* shareImage@2x.png */,
 				277935D927E325B90010E277 /* Module */,
 				2779309427E30F2D0010E277 /* Common */,
 				275E8ADD27E1B25200DD3F6E /* KulexiuForTeacher.entitlements */,
@@ -6595,6 +6598,7 @@
 				BC7CFFD22817FF6D00CAEB21 /* CardDisplayView.xib in Resources */,
 				BC2456E5286BE86600D1F7C0 /* MineStyleEmptyView.xib in Resources */,
 				27F9CB0127EC3D42003E0FE4 /* GroupListViewCell.xib in Resources */,
+				BCDE358A2897B48E00A9A560 /* shareImage@2x.png in Resources */,
 				BC8B6E582856ED0600866917 /* UMSocialSDKResources.bundle in Resources */,
 				BC1191F8280EBC8600A716F7 /* AccompanyDetailBottomView.xib in Resources */,
 				BCA9CE3027FD8A9900D558C6 /* AccompanyNavView.xib in Resources */,
@@ -7542,7 +7546,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.3;
+				CURRENT_PROJECT_VERSION = 1.1.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7588,7 +7592,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.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -7604,7 +7608,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.3;
+				CURRENT_PROJECT_VERSION = 1.1.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7650,7 +7654,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.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

二进制
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 22 - 6
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -649,9 +649,9 @@
             filePath = "KulexiuForTeacher/AppDelegate.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "653"
-            endingLineNumber = "653"
-            landmarkName = "-getVCUserInfoDict:"
+            startingLineNumber = "655"
+            endingLineNumber = "655"
+            landmarkName = "-configRootVC"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -963,14 +963,14 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "F53EA902-A58F-40F0-946C-E46164F7BDF9"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "163"
-            endingLineNumber = "163"
+            startingLineNumber = "166"
+            endingLineNumber = "166"
             landmarkName = "-requestData"
             landmarkType = "7">
          </BreakpointContent>
@@ -1023,5 +1023,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8003ACF9-C8EE-45CC-A5AB-E139DE0FD0FF"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/Controller/MineViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "98"
+            endingLineNumber = "98"
+            landmarkName = "-requsetUserMessage"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 5 - 3
KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -146,8 +146,6 @@
     [self registerRemoteNotification:application];
     
     
-    [self versionCheck];
-    
     if(@available(iOS 11.0, *)){
         
         [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[UIDocumentBrowserViewController class]]].tintColor = THEMECOLOR;
@@ -177,6 +175,7 @@
             
         }
     }
+    [self versionCheck];
 }
 
 - (void)registerSDK {
@@ -188,7 +187,10 @@
     if (self.hasCheckTrackAuth == NO) {
         if (@available(iOS 14, *)) {
             [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
-                [self configUM];
+                dispatch_main_async_safe(^{
+                    [self configUM];
+                });
+                
             }];
         } else {
             // Fallback on earlier versions

二进制
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/qrCode_placeImage.imageset/qrCode_placeImage@2x.png


+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSUpdateAlert.m

@@ -52,7 +52,7 @@
 }
 
 - (void)showAlert {
-    [[UIApplication sharedApplication].keyWindow addSubview:self];
+    [[NSObject getKeyWindow] addSubview:self];
     [self setPopAnimation];
 }
 

+ 14 - 14
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

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Tools/QRCodeGenerate/KSQRCreateManager.m

@@ -32,6 +32,7 @@
     //5.把中央图片划入二维码里面
     //5.1开启图形上下文
     UIGraphicsBeginImageContext(qrCodeImage.size);
+    UIGraphicsBeginImageContextWithOptions(qrCodeImage.size, NO, [UIScreen mainScreen].scale);
     //5.2将二维码的图片画入
     [qrCodeImage drawInRect:CGRectMake(0, 0, qrCodeImage.size.width, qrCodeImage.size.height)];
     

+ 4 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m

@@ -60,7 +60,10 @@
     [KSNetworkingManager batchSetReadRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             [self MBPShow:@"清除成功"];
-            [self resetSourceAndRequest];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [self resetSourceAndRequest];
+            });
+            
         }
         else {
             [self MBPShow:MESSAGEKEY];

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/MidiPlayer/ShareInChat/Controller/KSShareGroupViewController.m

@@ -44,6 +44,7 @@
         make.top.mas_equalTo(self.view);
         make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
     }];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
 }
 
 - (void)searchRequest:(NSString *)searchKey {

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -125,7 +125,7 @@
     
     [self.view addSubview:self.navView];
     [self.navView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(60);
+        make.width.mas_equalTo(100);
         make.right.top.mas_equalTo(self.view);
         make.height.mas_equalTo(kNaviBarHeight);
     }];

二进制
KulexiuForTeacher/KulexiuForTeacher/shareImage@2x.png