修改机构首页切换控件加载到window上

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -7585,7 +7585,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.3;
+				CURRENT_PROJECT_VERSION = 1.6.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -7772,7 +7772,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.3;
+				CURRENT_PROJECT_VERSION = 1.6.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8105,7 +8105,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.3;
+				CURRENT_PROJECT_VERSION = 1.6.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8396,7 +8396,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.3;
+				CURRENT_PROJECT_VERSION = 1.6.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;

KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "TEST"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.h

@@ -26,8 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)configRequestMethodJSON;
 // 退出登录操作
 + (void)logoutAction;
-// 返回到登录页面
-+ (void)backLoginView;
+
 // 取消所有请求操作
 + (void)cancelAllRequest;
 

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m

@@ -195,18 +195,6 @@
     [APPLOGIN_MANAGER logoutAction];
 }
 
-// 返回到登录页面
-+ (void)backLoginView {
-    UITabBarController *tab = (UITabBarController *)[UIApplication sharedApplication].keyWindow.rootViewController;
-    CustomNavViewController *ctrl = (CustomNavViewController *)tab.selectedViewController;
-    [ctrl popToRootViewControllerAnimated:NO];
-
-    LoginViewController *logonVC = [[LoginViewController alloc] init];
-    CustomNavViewController *navCtrl = [[CustomNavViewController alloc] initWithRootViewController:logonVC];
-    navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
-    [tab.selectedViewController presentViewController:navCtrl animated:YES completion:nil];
-}
-
 /// 移除所以当前请求
 + (void)cancelAllRequest {
     [[VoNetworking sharedManager] cancleAllRequest];

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Controller/TenantDarkViewController.m

@@ -56,6 +56,8 @@
 
 @property (nonatomic, strong) GroupAlbumModel *albumModel; // 小组专辑信息
 
+@property (nonatomic, strong) AlbumSwitchView *switchView;
+
 @end
 
 @implementation TenantDarkViewController
@@ -461,7 +463,7 @@
 }
 
 - (void)switchAlbumAction {
-    AlbumSwitchView *transferView = [AlbumSwitchView shareInstance];
+    self.switchView = [AlbumSwitchView shareInstance];
     NSInteger lastChooseIndex = 0;
     for (NSInteger index = 0; index < self.albumListArray.count; index++) {
         GroupAlbumModel *model = self.albumListArray[index];
@@ -470,14 +472,15 @@
             lastChooseIndex = index;
         }
     }
-    [transferView albumChooseCallback:^(ALBUMSWITCH_TYPE type, NSInteger chooseIndex) {
+    MJWeakSelf;
+    [self.switchView albumChooseCallback:^(ALBUMSWITCH_TYPE type, NSInteger chooseIndex) {
         if (type == ALBUMSWITCH_TYPE_SWITCH) {
-            GroupAlbumModel *model = self.albumListArray[chooseIndex];
-            [self queryAlbumMessage:model.internalBaseClassIdentifier];
+            GroupAlbumModel *model = weakSelf.albumListArray[chooseIndex];
+            [weakSelf queryAlbumMessage:model.internalBaseClassIdentifier];
         }
     }];
-    [transferView configWithSource:self.albumListArray lastChooseIndex:lastChooseIndex];
-    [transferView showInDisplayView:self.view];
+    [self.switchView configWithSource:self.albumListArray lastChooseIndex:lastChooseIndex];
+    [self.switchView showInDisplayView:[NSObject getKeyWindow]];
 }
 
 - (void)queryAlbumMessage:(NSString *)tenantAlbumId {

KulexiuForStudent/KulexiuForStudent/Module/Login/Controller/InstrumentChooseViewController.m

@@ -51,7 +51,7 @@
 
 - (void)logoutAction {
     [self backAction];
-    [KSNetworkingManager backLoginView];
+    [APPLOGIN_MANAGER logoutAction];
 }
 
 - (void)configUI {

KulexiuForStudent/KulexiuForStudent/PrivacyInfo.xcprivacy

@@ -2,46 +2,46 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSPrivacyTracking</key>
-    <true/>
-    <key>NSPrivacyCollectedDataTypes</key>
-    <array/>
-    <key>NSPrivacyTrackingDomains</key>
-    <array/>
-    <key>NSPrivacyAccessedAPITypes</key>
-    <array>
-        <dict>
-            <key>NSPrivacyAccessedAPIType</key>
-            <string>NSPrivacyAccessedAPICategorySystemBootTime</string>
-            <key>NSPrivacyAccessedAPITypeReasons</key>
-            <array>
-                <string>35F9.1</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyAccessedAPIType</key>
-            <string>NSPrivacyAccessedAPICategoryDiskSpace</string>
-            <key>NSPrivacyAccessedAPITypeReasons</key>
-            <array>
-                <string>E174.1</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyAccessedAPIType</key>
-            <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
-            <key>NSPrivacyAccessedAPITypeReasons</key>
-            <array>
-                <string>C617.1</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyAccessedAPIType</key>
-            <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-            <key>NSPrivacyAccessedAPITypeReasons</key>
-            <array>
-                <string>CA92.1</string>
-            </array>
-        </dict>
-    </array>
+	<key>NSPrivacyTracking</key>
+	<true/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array>
+		<string>online.colexiu.com</string>
+	</array>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>E174.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>