WMBase修改

WMBase.xcodeproj/project.pbxproj

@@ -71,6 +71,7 @@
 		9A6695212A03A2F3000AE75F /* KWLoginedUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A6695202A03A2F3000AE75F /* KWLoginedUserModel.m */; };
 		9A6695272A03A5A0000AE75F /* KWLoginedManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A6695262A03A5A0000AE75F /* KWLoginedManager.m */; };
 		9A75429A2A0347CD0048C774 /* UCMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A7542992A0347CD0048C774 /* UCMViewController.m */; };
+		9A7DA6A42A0CF76300136974 /* WMBase_Tool.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A7DA6A32A0CF76300136974 /* WMBase_Tool.m */; };
 		9A8369792A03651D00E0DA39 /* UCMBaseC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8369782A03651D00E0DA39 /* UCMBaseC.m */; };
 		9A8DD8BE2A0B880100573324 /* UIViewController+MM_configNet.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8DD8BC2A0B880100573324 /* UIViewController+MM_configNet.m */; };
 		9A8DD8CB2A0B9BAD00573324 /* WMBase.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A8DD8CA2A0B9BAD00573324 /* WMBase.xcassets */; };
@@ -222,6 +223,8 @@
 		9A6695262A03A5A0000AE75F /* KWLoginedManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWLoginedManager.m; sourceTree = "<group>"; };
 		9A7542982A0347CD0048C774 /* UCMViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UCMViewController.h; sourceTree = "<group>"; };
 		9A7542992A0347CD0048C774 /* UCMViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UCMViewController.m; sourceTree = "<group>"; };
+		9A7DA6A22A0CF76300136974 /* WMBase_Tool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMBase_Tool.h; sourceTree = "<group>"; };
+		9A7DA6A32A0CF76300136974 /* WMBase_Tool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WMBase_Tool.m; sourceTree = "<group>"; };
 		9A8369772A03651D00E0DA39 /* UCMBaseC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UCMBaseC.h; sourceTree = "<group>"; };
 		9A8369782A03651D00E0DA39 /* UCMBaseC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UCMBaseC.m; sourceTree = "<group>"; };
 		9A8DD8BB2A0B87AF00573324 /* WMBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMBase.h; sourceTree = "<group>"; };
@@ -515,14 +518,16 @@
 		9AA254E52A025C630083EC60 /* WMBase */ = {
 			isa = PBXGroup;
 			children = (
-				9A8DD8BB2A0B87AF00573324 /* WMBase.h */,
-				9A337E242A04E04900D058A5 /* Ucm_NetWork */,
+				9A337E022A0486F100D058A5 /* CTMediatoaTargets */,
 				9A6694D12A039C53000AE75F /* TT_GeneralProfile.h */,
+				9A6694402A039C52000AE75F /* UC_Commonmodule */,
+				9A337E242A04E04900D058A5 /* Ucm_NetWork */,
 				9A8369772A03651D00E0DA39 /* UCMBaseC.h */,
 				9A8369782A03651D00E0DA39 /* UCMBaseC.m */,
-				9A337E022A0486F100D058A5 /* CTMediatoaTargets */,
-				9A6694402A039C52000AE75F /* UC_Commonmodule */,
 				9A66951E2A03A20C000AE75F /* UserModel */,
+				9A7DA6A22A0CF76300136974 /* WMBase_Tool.h */,
+				9A7DA6A32A0CF76300136974 /* WMBase_Tool.m */,
+				9A8DD8BB2A0B87AF00573324 /* WMBase.h */,
 				9A6695172A039FFA000AE75F /* WRNavigationBar */,
 			);
 			path = WMBase;
@@ -661,6 +666,7 @@
 				9A6694F32A039C53000AE75F /* UIViewController+HUD.m in Sources */,
 				9A6695072A039C53000AE75F /* XXX_Datautil.m in Sources */,
 				9A66950E2A039C53000AE75F /* PPNetworkHelper.m in Sources */,
+				9A7DA6A42A0CF76300136974 /* WMBase_Tool.m in Sources */,
 				9A6694F92A039C53000AE75F /* UIButton+SDCategory.m in Sources */,
 				9A6694E12A039C53000AE75F /* UIViewController+TT_configV.m in Sources */,
 				9A66950B2A039C53000AE75F /* HWCookiesManager.m in Sources */,

WMBase/WMBase/CTMediatoaTargets/CTMediator+Targets.h

@@ -10,9 +10,13 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CTMediator (Targets)
+-(UIViewController *)B_viewControllerWithContentText:(NSDictionary *)params;
 
+///商品详情页面
 -(UIViewController *)Goods_GoodsDetaileC:(NSDictionary *)params;
--(UIViewController *)B_viewControllerWithContentText:(NSDictionary *)params;
+
+///登录页面
+-(UIViewController *)Login_LoginC:(NSDictionary *)params;
 @end
 
 NS_ASSUME_NONNULL_END

WMBase/WMBase/CTMediatoaTargets/CTMediator+Targets.m

@@ -12,6 +12,11 @@
     return [self performTarget:@"Goods" action:@"GoodsDetaileC" params:params shouldCacheTarget:NO];
 }
 
+-(UIViewController *)Login_LoginC:(NSDictionary *)params{
+    return [self performTarget:@"Login" action:@"AS_LoginC" params:params shouldCacheTarget:NO];
+}
+
+
 -(UIViewController *)B_viewControllerWithContentText:(NSDictionary *)params{
     return [self performTarget:@"B" action:@"viewController" params:params shouldCacheTarget:NO];
 }

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleKit/TT_BaseC.m

@@ -128,7 +128,7 @@
     NSInteger margin = 10;
     NSInteger buttonHeight = 44;
     NSInteger buttonWidth = 44;
-//    [XXX_Tabber shareInstance].xxx_barCartBtn.frame = CGRectMake(kScreenWidth - buttonWidth - margin, top, buttonWidth, buttonHeight);
+//    [XXX_Tabber shareInstance].xxx_barCartBtn.frame = CGRectMake(KScreenWidth - buttonWidth - margin, top, buttonWidth, buttonHeight);
 //    [self.customNavBar addSubview:[XXX_Tabber shareInstance].xxx_barCartBtn];
 }
 

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleNetWork/HZY_UploadFile.m

@@ -83,26 +83,27 @@ 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"];
     }
-    NSString *token = [sessionManager.requestSerializer valueForHTTPHeaderField:@"token"];
+//    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;  
+//    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;
 }
 
 

WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleNetWork/PPNetworkHelper.m

@@ -209,7 +209,16 @@ static AFHTTPSessionManager *_sessionManager;
     //读取缓存
     responseCache!=nil ? responseCache([PPNetworkCache httpCacheForURL:URL parameters:parameters]) : nil;
     // 打开状态栏的等待菊花
-    _sessionManager = [HZY_UploadFile configsessionManager];
+//    _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;
+    
     [AFNetworkActivityIndicatorManager sharedManager].enabled = YES;
     NSURLSessionTask *sessionTask = [_sessionManager POST:URL
                                                parameters:parameters