添加登录接口异常code

NetrainFrame/NetrainFrame/Base/BaseModelAgent/BaseHttpModel.h

@@ -9,6 +9,14 @@
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
 
+#define kBaseApiOtherError  @"服务器错误，请稍后再试"
+
+typedef enum : NSUInteger {
+    kHttpCode_Success = 0,
+    kHttpCode_NotPublic,
+    kHttpCode_OtherLogin,
+} kHttpCode;
+
 @interface BaseHttpModel : NSObject
 @property(nonatomic, assign) NSInteger code;
 @property(nonatomic, strong) NSString *msg;

NetrainFrame/NetrainFrame/Base/BaseModelAgent/BaseHttpModel.m

@@ -8,13 +8,10 @@
 
 #import "BaseHttpModel.h"
 
-#define kBaseApiOtherError  @"服务器错误，请稍后再试"
-#define kSuccHttpCode 0
-
 @implementation BaseHttpModel
 
 - (BOOL)isSucc {
-    return self.code == kSuccHttpCode;
+    return self.code == kHttpCode_Success;
 }
 - (NSString *)errorMsg {
     return self.msg.length > 0 ? self.msg : kBaseApiOtherError;

NetrainFrame/NetrainFrame/Base/BaseRequest/NRBaseRequest.h

@@ -10,6 +10,7 @@
 #import "NRGlobalUrlModel.h"
 #import "NRBaseModelAgent.h"
 #import "BaseHttpModel.h"
+
 /*
  接口请求基类，所有请求必须继承此类
  这里采用的是YTKNetwork网络库，中大型APP专用，可满足所有网络需求

NetrainFrame/NetrainFrame/Base/BaseRequest/NRBaseRequest.m

@@ -8,8 +8,6 @@
 #import "NRBaseRequest.h"
 #import "NRGlobalUrlModel.h"
 
-#define kBaseApiOtherError  @"服务器错误，请稍后再试"
-
 @interface NRBaseRequest()
 
 @property(nonatomic, strong) BaseHttpModel *httpModel;

NetrainFrame/NetrainFrame/Modules/Login/Logic/NRLoginLogic.m

@@ -72,10 +72,14 @@
         if(!error){
             NSString* pubKey = [[publicKeyRequest.httpModel.data objectAtIndex:0] objectForKey:@"publicKey"];
             NSString *publicKey=[NSString formatPulicKeys:pubKey password:[params objectForKey:@"password"]];
-//            if(!publicKey.isNotBlank){
-//                [ToastView showMessageCaption:@"登录失败，请重新登录"];
-//                return ;
-//            }
+            if(!publicKey.isNotBlank){
+                request.httpModel.code = kHttpCode_NotPublic;
+                request.httpModel.msg = @"登录失败，请重新登录";
+                if (self.logicDelegate && [self.logicDelegate respondsToSelector:@selector(requestDataCompleted:)]) {
+                    [self.logicDelegate requestDataCompleted:request.httpModel];
+                }
+                return ;
+            }
             [params setObject:publicKey forKey:@"password"];
             [self passwordLoginRequest:params];
         }else{
@@ -99,6 +103,7 @@
     [pwdLoginRequest startWithCompletionBlock:^(NRBaseRequest * _Nonnull request, NSString * _Nonnull error) {
         if(!error){
             [pwdLoginRequest saveModel];
+///TO DO 退出过程中有其他人登录该账号，该设备的记录将被清除
         }
         if (self.logicDelegate && [self.logicDelegate respondsToSelector:@selector(requestDataCompleted:)]) {
             [self.logicDelegate requestDataCompleted:request.httpModel];