首页认证弹窗修改

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -9356,7 +9356,6 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialUI",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ/QQSDK",
-					"$(PROJECT_DIR)/KulexiuForTeacher/ToolKit",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KulexiuForTeacher/Common/Define/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -9534,7 +9533,6 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialUI",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ/QQSDK",
-					"$(PROJECT_DIR)/KulexiuForTeacher/ToolKit",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KulexiuForTeacher/Common/Define/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -9840,7 +9838,6 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialUI",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ/QQSDK",
-					"$(PROJECT_DIR)/KulexiuForTeacher/ToolKit",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KulexiuForTeacher/Common/Define/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -10113,7 +10110,6 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialUI",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ/QQSDK",
-					"$(PROJECT_DIR)/KulexiuForTeacher/ToolKit",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KulexiuForTeacher/Common/Define/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -4,7 +4,8 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -52,7 +53,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/WorkspaceSettings.xcsettings

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildLocationStyle</key>
-	<string>UseAppPreferences</string>
-	<key>CustomBuildLocationType</key>
-	<string>RelativeToDerivedData</string>
-	<key>DerivedDataLocationStyle</key>
-	<string>Default</string>
-	<key>IssueFilterStyle</key>
-	<string>ShowActiveSchemeOnly</string>
-	<key>LiveSourceIssuesEnabled</key>
-	<true/>
-	<key>ShowSharedSchemesAutomaticallyEnabled</key>
-	<true/>
-</dict>
-</plist>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -915,14 +915,14 @@
     switch (type) {
         case HOMEHEADACTION_AUTH:
         {
-            
             [self toAuthDetail];
         }
             break;
         case HOMEHEADACTION_EDUCATION:
         case HOMEHEADACTION_EDUCATIONFINISH:
-        {     // 不弹窗
+        {     // 不弹窗 直接跳转
 //            [self showAuthEducationAlert];
+            [self toAuthEducation];
         }
             break;
         case HOMEHEADACTION_SUBJECTCHOOSE:

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNewHeadView.m

@@ -101,7 +101,6 @@
     self.failedView.hidden = YES;
     // 认证状态
     self.hasAuth = NO;
-//    infoMessage.entryStatus = @"UNPASS";
     if ([infoMessage.entryStatus isEqualToString:@"PASS"]) { // 审核通过
         self.authView.backgroundColor = HexRGB(0xEFFBF9);
         [self.authIcon setImage:[UIImage imageNamed:@"auth_success_icon"]];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/InstrumentChooseViewController.m

@@ -192,26 +192,26 @@
     if (self.isSingleChoose) { // 单选
         
         if (model.isChoose) {
-            // 取消上一个选中
+            // 取消上一个的选中
             if (self.chooseModel) {
                 self.chooseModel.isChoose = NO;
-                [self.collectionView reloadItemsAtIndexPaths:@[indexPath,self.chooseIndexPath]];
             }
-            self.chooseModel = model;
-            self.chooseIndexPath = indexPath;
         }
-        else {
+        else { // 如果是取消，移除选择状态（此时当前操作cell和之前选择的是一致的）
             self.chooseModel = nil;
             self.chooseIndexPath = nil;
         }
-        
+
         if (self.chooseIndexPath) {
             [self.collectionView reloadItemsAtIndexPaths:@[indexPath,self.chooseIndexPath]];
-
         }
         else {
             [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
         }
+        if (model.isChoose) {
+            self.chooseModel = model;
+            self.chooseIndexPath = indexPath;
+        }
     }
     else { // 多选
         if (model.isChoose) {