wmBase 更新

WMBase/WMBase/UCM_Web/DsJsInteractAPI.h

@@ -10,7 +10,7 @@
 #import "TT_GeneralProfile.h"
 
 NS_ASSUME_NONNULL_BEGIN
-//wm_todo 移动到 项目Config 里边
+
 @interface DsJsInteractAPI : NSObject
 @property (nonatomic, strong) XXX_BaseWebC *dsWebC;
 

WMBase/WMBase/UCM_Web/DsJsInteractAPI.m

@@ -6,6 +6,7 @@
 //
 
 #import "DsJsInteractAPI.h"
+#import <CTMediator/CTMediator.h>
 
 
 @implementation DsJsInteractAPI
@@ -35,6 +36,9 @@
 
 ///跳转商品详情
 -(NSString *)goto_pushGoodsDetailsC:(NSDictionary *)msgIc{
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    
+    UIViewController *loginC = [[CTMediator sharedInstance] performTarget:@"Goods" action:@"GoodsDetaileC" params:params shouldCacheTarget:NO];
 
     return @"";
 }

WMBase/WMBase/UCM_Web/XXX_BaseWebC.h

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 //- (void)configloadRequestWKweb_Url:(NSString *)WKweb_Url WKweb_data:(NSString *)WKweb_data WKweb_requesStatus:(TT_WKwebType)WKweb_requesStatus;
 -(void)xxx_dsWebLoadUrl:(NSString *)url;
 
-
+-(void)tool_dsWebViewAddJS;
 @end
 
 NS_ASSUME_NONNULL_END

WMBase/WMBase/UCM_Web/XXX_BaseWebC.m

@@ -61,12 +61,19 @@
     if(!_dwebview){
         _dwebview = [[DWKWebView alloc]initWithFrame:CGRectMake(0, securitytop_Y, KScreenWidth, securityNew_H)];
         _dwebview.navigationDelegate =self;
-        DsJsInteractAPI *apiObject = [[DsJsInteractAPI alloc]init];
-        [_dwebview addJavascriptObject:apiObject namespace:nil];
-        apiObject.dsWebC = self;
+
     }
     return _dwebview;
 }
+#pragma mark - ****************公开方法  ****************
+
+-(void)tool_dsWebViewAddJS{
+    DsJsInteractAPI *apiObject = [[DsJsInteractAPI alloc]init];
+    [self.dwebview addJavascriptObject:apiObject namespace:nil];
+    apiObject.dsWebC = self;
+}
+
+
 //添加web加载的进度条
 - (TT_ProgressV *)wkweb_pv {
     if (!_wkweb_pv) {

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleKit/TT_BaseC.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-//wm_todo 判断是否绑定网络请求
+
 #import "UIViewController+MM_configNet.h"
 #import <QMUIKit/QMUIKit.h>
 

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleNetWork/HZY_UploadFile.m

@@ -34,7 +34,6 @@ compleSuccess:(void(^)(id  _Nullable responseObject))Success
     AFHTTPResponseSerializer *responseSerializer = [AFHTTPResponseSerializer serializer];
     responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/html", @"text/json", @"text/plain", @"text/javascript", @"text/xml", @"image/*",@"image/jpeg",@"image/jpg",@"image/png",@"application/x-javascript",nil];
     manage.responseSerializer = responseSerializer;
-    manage.responseSerializer = [AFHTTPResponseSerializer serializer];
     
     [manage GET:URL
      parameters:parameters
@@ -82,28 +81,15 @@ compleSuccess:(void(^)(id  _Nullable responseObject))Success
 
 
 + (AFHTTPSessionManager *)configsessionManager {
-    AFHTTPSessionManager *sessionManager = [[AFHTTPSessionManager alloc]init];
-    sessionManager.requestSerializer = [AFHTTPRequestSerializer serializer];
-    sessionManager.requestSerializer.timeoutInterval = 20;
-    AFJSONResponseSerializer *responseSerializer = [AFJSONResponseSerializer serializerWithReadingOptions:NSJSONReadingMutableContainers];
-    // 设置安全策略
-    if (![[UC_CommonmoduleNetWorkTool getUserToken] isEqualToString:@""]) {
-        [sessionManager.requestSerializer setValue:[UC_CommonmoduleNetWorkTool getUserToken] forHTTPHeaderField:@"token"];
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.requestSerializer = [AFJSONRequestSerializer serializer];
+    [manager.requestSerializer setValue:@"longyitec" forHTTPHeaderField:@"powerby"];
+    if (![[UC_CommonmoduleNetWorkTool judgeUserIsLogin] isEqualToString:@""]) {
+        [manager.requestSerializer setValue:[NSString stringWithFormat:@"Bearer %@",[UC_CommonmoduleNetWorkTool judgeUserIsLogin]] forHTTPHeaderField:@"Authorization"];
     }
-//    NSString *token = [sessionManager.requestSerializer valueForHTTPHeaderField:@"token"];
-    NSString *now_time = [UC_CommonmoduleNetWorkTool tt_getNowTimeTimestamp];
-    responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/html", @"text/json", @"text/plain", @"text/javascript", @"text/xml", @"image/*",@"image/jpeg",@"image/jpg",@"image/png",@"application/x-javascript",nil];
-//    sessionManager.responseSerializer = responseSerializer;
-//    NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
-//    NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
-//    [sessionManager.requestSerializer setValue:app_Version forHTTPHeaderField:@"version"];
-//    [sessionManager.requestSerializer setValue:[UC_CommonmoduleNetWorkTool tt_getCurrentDeviceModel] forHTTPHeaderField:@"device"];
-//    [sessionManager.requestSerializer setValue:@"ios" forHTTPHeaderField:@"system"];
-//    [sessionManager.requestSerializer setValue:[UC_CommonmoduleNetWorkTool tt_getOSVersion] forHTTPHeaderField:@"systemVersion"];
-//    [sessionManager.requestSerializer setValue:[UC_CommonmoduleNetWorkTool tt_getIDFA] forHTTPHeaderField:@"deviceId"];
-//    [sessionManager.requestSerializer setValue:now_time forHTTPHeaderField:@"x-t"];
-//    sessionManager.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
-    return sessionManager;
+     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+     manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json",@"text/json", @"text/plain", @"text/html", nil];
+    return manager;
 }
 
 

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleNetWork/PPNetworkHelper.h

@@ -322,6 +322,6 @@ typedef void(^PPNetworkStatus)(PPNetworkStatusType status);
         一个域名。因为SSL证书上的域名是独立的,假如证书上注册的域名是www.google.com, 那么mail.google.com是无法验证通过的.
  */
 + (void)setSecurityPolicyWithCerPath:(NSString *)cerPath validatesDomainName:(BOOL)validatesDomainName;
-
++(NSDictionary *)too_DataToDic:(NSData *)data;
 @end
 

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleNetWork/PPNetworkHelper.m

@@ -209,15 +209,8 @@ static AFHTTPSessionManager *_sessionManager;
     //读取缓存
     responseCache!=nil ? responseCache([PPNetworkCache httpCacheForURL:URL parameters:parameters]) : nil;
     // 打开状态栏的等待菊花
-//    _sessionManager = [HZY_UploadFile configsessionManager];
-    AFHTTPSessionManager *manager =[AFHTTPSessionManager manager];
-    
-    manager.requestSerializer = [AFJSONRequestSerializer serializer];
-    
-    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    
-    manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json",@"text/json", @"text/plain", @"text/html", nil];
-    _sessionManager = manager;
+    _sessionManager = [HZY_UploadFile configsessionManager];
+
     
     [AFNetworkActivityIndicatorManager sharedManager].enabled = YES;
     NSURLSessionTask *sessionTask = [_sessionManager POST:URL
@@ -225,28 +218,64 @@ static AFHTTPSessionManager *_sessionManager;
                                                   headers:nil
                                                  progress:nil
                                                   success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
-        responseObject = [UC_CommonmoduleNetWorkTool tt_changeType:responseObject];
+        
+       
+        NSMutableDictionary *temDic =[NSMutableDictionary dictionaryWithDictionary:[PPNetworkHelper too_DataToDic:responseObject]];
+        temDic = [UC_CommonmoduleNetWorkTool tt_changeType:temDic];
         if (_isOpenLog) {PPLog(@"URL = %@ ,\n params = %@",URL,parameters);}
-//        if (_isOpenLog) {PPLog(@"header = %@",task.currentRequest.allHTTPHeaderFields);}
-        if (_isOpenLog) {PPLog(@"responseObject = %@",responseObject);}
+        if (_isOpenLog) {PPLog(@"header = %@",task.currentRequest.allHTTPHeaderFields);}
+        if (_isOpenLog) {PPLog(@"responseObject = %@",temDic);}
+        NSLog(@"gittest");
         //对数据进行异步缓存
-        if (((NSNumber *)responseObject[@"code"]).integerValue ==200) {
-            responseCache !=nil ? [PPNetworkCache setHttpCache:responseObject URL:URL parameters:parameters] : nil;
+        if (((NSNumber *)temDic[@"status"]).integerValue ==1) {
+            responseCache !=nil ? [PPNetworkCache setHttpCache:temDic URL:URL parameters:parameters] : nil;
         }
         [[self allSessionTask] removeObject:task];
-        success ? success(responseObject) : nil;
+        success ? success(temDic) : nil;
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         if (_isOpenLog) {PPLog(@"URL = %@ ,\n params = %@",URL,parameters);}
         if (_isOpenLog) {PPLog(@"error = %@",error);}
         [[PPNetworkHelper allSessionTask] removeObject:task];
         failure ? failure(error) : nil;
         NSLog(@"%@",error);
+
+
+//        //http状态码
+//       NSHTTPURLResponse * responses = (NSHTTPURLResponse *)task.response;
+//        if (responses.statusCode == 401) {
+//            
+//        }
+//         
+//       //服务器返回失败信息
+//       NSLog(@"%@",error);
+//       if([error.domain isEqualToString:AFURLResponseSerializationErrorDomain]){
+//           // server error
+//           id response = [NSJSONSerialization JSONObjectWithData:error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] options:0 error:nil];
+//          NSLog(@"%@",response);
+//           NSLog(@"%@",response[@"code"]);
+//       }else if ([error.domain isEqualToString:NSCocoaErrorDomain]) {
+//           // server throw exception
+//           
+//       } else if ([error.domain isEqualToString:NSURLErrorDomain]) {
+//           // network error
+//           
+//       }
     }];
+    
     // 添加最新的sessionTask到数组
     sessionTask ? [[self allSessionTask] addObject:sessionTask] : nil ;
     return sessionTask;
 }
 
++(NSDictionary *)too_DataToDic:(NSData *)data{
+    // NSData转NSDictionary
+    NSError *error;
+    NSDictionary *resultDic = [NSJSONSerialization JSONObjectWithData:data
+                                                              options:NSJSONReadingMutableContainers
+                                                                error:&error];
+    return resultDic;
+}
+
 #pragma mark - 上传文件
 + (NSURLSessionTask *)uploadFileWithURL:(NSString *)URL
                              parameters:(id)parameters

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleNetWork/UC_CommonmoduleNetWorkTool.h

@@ -16,8 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 +(id)tt_changeType:(id)myObj;
 //获取版本号
 + (NSString *)getAppVersion;
-///获取用户 Token ；如果没有登录返回 @“”
-+ (NSString *)getUserToken ;
+//判断用户是否登录
++ (NSString *)judgeUserIsLogin;
 + (NSString *)getUser_id ;
 
 //获取当前时间戳

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleNetWork/UC_CommonmoduleNetWorkTool.m

@@ -21,15 +21,17 @@
     return [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
 }
 
-
 //判断用户是否登录
-+ (NSString *)getUserToken {
-    NSString *token = [KWLoginedManager.shareInstance getCurrentLoginedUser].token;
++ (NSString *)judgeUserIsLogin {
+    NSString *token = [[NSUserDefaults standardUserDefaults] objectForKey:@"loginToken"];
     if (!token || [token isEqualToString:@""]) {
         return @""  ;
     }
     return token;
 }
+
+
+
 + (NSString *)getUser_id {
     NSString *userId = [KWLoginedManager.shareInstance getCurrentLoginedUser].user_id;
     if (!userId || [userId isEqualToString:@""]) {