调整编译器 相关 处理 iOS 12 启动崩溃

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCellView.m

@@ -85,7 +85,7 @@
     
     if ([sourceModel.chargeType isEqualToString:@"VIP"]) {
         self.typeImage.hidden = NO;
-        [self.typeImage setImage:[UIImage imageNamed:@"music_vip"]];
+        [self.typeImage setImage:[UIImage imageNamed:@"tan_music_vip"]];
     }
     else if ([sourceModel.chargeType isEqualToString:@"CHARGE"]) {
         self.typeImage.hidden = NO;

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCellView.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="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -29,7 +29,7 @@
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_vip" translatesAutoresizingMaskIntoConstraints="NO" id="OTP-wJ-ueO">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tan_music_vip" translatesAutoresizingMaskIntoConstraints="NO" id="OTP-wJ-ueO">
                             <rect key="frame" x="12" y="15" width="23" height="12"/>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tenant_homePlay" translatesAutoresizingMaskIntoConstraints="NO" id="zZJ-rK-8xk">
@@ -152,7 +152,7 @@
     <resources>
         <image name="music_like_nomal" width="15" height="16"/>
         <image name="music_placeholder" width="76.5" height="76.5"/>
-        <image name="music_vip" width="23" height="12"/>
+        <image name="tan_music_vip" width="23" height="12"/>
         <image name="tenant_homePlay" width="20" height="20"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForStudent/KulexiuForStudent/Module/Chat/Search/KSSearchViewController.m

@@ -39,8 +39,13 @@ static NSString *const HFId = @"HFId";
     _dataProvider.delegate = self;
     [self setupViews];
     [TUITool addUnsupportNotificationInVC:self];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(otherLogin) name:@"otherLogin" object:nil];
+}
+- (void)otherLogin {
+    [self.navigationController dismissViewControllerAnimated:YES completion:^{
+        [APPLOGIN_MANAGER logoutAction];
+    }];
 }
-
 - (void)dealloc {
     NSLog(@"%s dealloc", __FUNCTION__);
     [[NSNotificationCenter defaultCenter] removeObserver:self];

KulexiuForStudent/KulexiuForStudent/Module/Login/Model/UserInfoManager.m

@@ -56,45 +56,21 @@
             UITabBarController *tab = (UITabBarController *)window.rootViewController;
             CustomNavViewController *ctrl = (CustomNavViewController *)tab.selectedViewController;
             if ([ctrl.visibleViewController isKindOfClass:NSClassFromString(@"TXClassroomViewController")]) {
-                [self checkTokenEnableCallback:^(BOOL enable) {
-                    if (enable) {
-                        [[NSNotificationCenter defaultCenter] postNotificationName:@"classroomQuit" object:nil];
-                    }
-                    else {
-                        [[NSNotificationCenter defaultCenter] postNotificationName:@"classroomLogout" object:nil];
-                    }
-                }];
+                
+                [[NSNotificationCenter defaultCenter] postNotificationName:@"classroomLogout" object:nil];
                 return;
             }
             else if ([vc.presentedViewController isKindOfClass:NSClassFromString(@"CustomNavViewController")]) {
                 CustomNavViewController *nav = (CustomNavViewController *)vc.presentedViewController;
                 if ([nav.visibleViewController isKindOfClass:NSClassFromString(@"TXLiveRoomViewController")] || [nav.visibleViewController isKindOfClass:NSClassFromString(@"KSLiveWebViewController")]) {
-                    [self checkTokenEnableCallback:^(BOOL enable) {
-                        if (enable) {
-                            [[NSNotificationCenter defaultCenter] postNotificationName:@"liveroomQuit" object:nil];
-                            NSLog(@"-----liveroomQuit");
-                        }
-                        else {
-                            [[NSNotificationCenter defaultCenter] postNotificationName:@"liveroomLogout" object:nil];
-                            NSLog(@"-----liveroomLogout");
-                        }
-                    }];
+                    
+                    [[NSNotificationCenter defaultCenter] postNotificationName:@"liveroomLogout" object:nil];
                     return;
                 }
             }
             
             [self showMessage:@"登录过期，请重新登录"];
             [APPLOGIN_MANAGER logoutAction];
-//            [self checkTokenEnableCallback:^(BOOL enable) {
-//                if (enable) {
-//                    [self showTipsAlert];
-//                }
-//                else {
-//                    [self showMessage:@"登录过期，请重新登录"];
-//                    [APPLOGIN_MANAGER logoutAction];
-//                    NSLog(@"----dddd");
-//                }
-//            }];
         }
     });
 }