扫码无权限流程优化

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -8740,7 +8740,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.2;
+				CURRENT_PROJECT_VERSION = 1.7.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8787,7 +8787,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.7.2;
+				MARKETING_VERSION = 1.7.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (
@@ -8920,7 +8920,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.2;
+				CURRENT_PROJECT_VERSION = 1.7.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8967,7 +8967,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.7.2;
+				MARKETING_VERSION = 1.7.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (
@@ -9228,7 +9228,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.2;
+				CURRENT_PROJECT_VERSION = 1.7.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9275,7 +9275,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.7.2;
+				MARKETING_VERSION = 1.7.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (
@@ -9503,7 +9503,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.2;
+				CURRENT_PROJECT_VERSION = 1.7.3.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9550,7 +9550,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.7.2;
+				MARKETING_VERSION = 1.7.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (

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

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

KulexiuForTeacher/KulexiuForTeacher/Module/Home/ScanView/Controller/KSScanViewController.m

@@ -170,7 +170,7 @@
             [self.navigationController pushViewController:ctrl animated:YES];
         }
         else {
-            [LOADING_MANAGER KSShowMsg:MESSAGEKEY promptCompletion:^{
+            [LOADING_MANAGER KSShowMsg:[dic ks_stringValueForKey:@"message"] promptCompletion:^{
                 [self startScan];
             }];
         }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/ScanView/Controller/ScanFailViewController.m

@@ -38,6 +38,7 @@
     NSString *title = @"";
     NSString *desc = @"";
     NSString *headTitle = @"扫描结果";
+    BOOL reScan = YES;
     if (self.failType == SCANFAIL_EXPIRED) {
         imageName = @"scan_codeExpired";
         title = @"二维码已过期";
@@ -56,6 +57,7 @@
         desc = @"";
         headTitle = @"授权登录";
         [self addNoSupportAttrDesc];
+        reScan = NO;
     }
     else if (self.failType == SCANFAIL_UNRECOGNIZE) { // 无法识别
         imageName = @"scan_codeExpired";
@@ -67,6 +69,7 @@
     [self allocTitle:headTitle];
 
     [self.bodyView configWithImageName:imageName title:title desc:desc];
+    self.bodyView.backReScan = reScan;
 }
 
 - (void)addNoSupportAttrDesc {
@@ -86,8 +89,13 @@
     if (!_bodyView) {
         _bodyView = [ScanFailBodyView shareIntance];
         MJWeakSelf;
-        [_bodyView reScanAction:^{
-            [weakSelf reScanCode];
+        [_bodyView reScanAction:^(BOOL reScan) {
+            if (reScan) {
+                [weakSelf reScanCode];
+            }
+            else {
+                [weakSelf backAction];
+            }
         }];
     }
     return _bodyView;
@@ -97,7 +105,7 @@
     // 返回扫码页面
     UIViewController *ctrl = nil;
     for (UIViewController *controller in self.navigationController.viewControllers) {
-        if ([controller isKindOfClass:NSClassFromString(@"HomeScanViewController")]) {
+        if ([controller isKindOfClass:NSClassFromString(@"KSScanViewController")]) {
             ctrl = controller;
             break;
         }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/ScanView/View/ScanFailBodyView.h

@@ -7,12 +7,14 @@
 
 #import <UIKit/UIKit.h>
 
-typedef void(^ReScanCallback)(void);
+typedef void(^ReScanCallback)(BOOL reScan);
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ScanFailBodyView : UIView
 
+@property (nonatomic, assign) BOOL backReScan;
+
 + (instancetype)shareIntance;
 
 - (void)reScanAction:(ReScanCallback)callback;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/ScanView/View/ScanFailBodyView.m

@@ -10,14 +10,14 @@
 
 @interface ScanFailBodyView ()
 
+@property (weak, nonatomic) IBOutlet UIButton *backButton;
+
 @property (weak, nonatomic) IBOutlet UIImageView *imageView;
 
 @property (weak, nonatomic) IBOutlet UILabel *errorTitle;
 
 @property (weak, nonatomic) IBOutlet UILabel *descLabel;
 
-@property (weak, nonatomic) IBOutlet UIButton *backButton;
-
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *bottomSpace;
 
 @property (nonatomic, copy) ReScanCallback callback;
@@ -58,8 +58,20 @@
 
 - (IBAction)backScan:(id)sender {
     if (self.callback) {
-        self.callback();
+        self.callback(self.backReScan);
+    }
+}
+
+- (void)setBackReScan:(BOOL)backReScan {
+    _backReScan = backReScan;
+    NSString *backButtonTitle = nil;
+    if (backReScan) {
+        backButtonTitle = @"重新扫码";
+    }
+    else {
+        backButtonTitle = @"我知道了";
     }
+    [self.backButton setTitle:backButtonTitle forState:UIControlStateNormal];
 }
 /*
 // Only override drawRect: if you perform custom drawing.