wangmeng 2 vuotta sitten
vanhempi
commit
c65763b0e3

+ 8 - 14
WMBase.xcodeproj/project.pbxproj

@@ -8,11 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		1BF6834921DFAFDA883B86C6 /* libPods-WMBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E89EABCC77A5962AC62A701 /* libPods-WMBase.a */; };
-		9A0212E12A03E4D600422892 /* UIViewController+MM_configNet.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A0212E02A03E4D600422892 /* UIViewController+MM_configNet.m */; };
 		9A337E052A0487C300D058A5 /* CTMediator+Targets.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A337E042A0487C300D058A5 /* CTMediator+Targets.m */; };
 		9A337E0B2A049C5600D058A5 /* NSDate+YYadd.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A337E0A2A049C5600D058A5 /* NSDate+YYadd.m */; };
 		9A337E2F2A04E04900D058A5 /* UCMHttpRequestBaseVM.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A337E252A04E04900D058A5 /* UCMHttpRequestBaseVM.m */; };
-		9A337E302A04E04900D058A5 /* UIViewController+MM_configNet.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A337E272A04E04900D058A5 /* UIViewController+MM_configNet.m */; };
 		9A337E312A04E04900D058A5 /* UCMHttpRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A337E2C2A04E04900D058A5 /* UCMHttpRequest.m */; };
 		9A337E322A04E04900D058A5 /* UCMHttpRequestResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A337E2D2A04E04900D058A5 /* UCMHttpRequestResponse.m */; };
 		9A337E332A04E04900D058A5 /* UCMHttpRequestNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A337E2E2A04E04900D058A5 /* UCMHttpRequestNetworkManager.m */; };
@@ -74,6 +72,7 @@
 		9A6695272A03A5A0000AE75F /* KWLoginedManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A6695262A03A5A0000AE75F /* KWLoginedManager.m */; };
 		9A75429A2A0347CD0048C774 /* UCMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A7542992A0347CD0048C774 /* UCMViewController.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 */; };
 		9AA254CE2A025C3A0083EC60 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA254CD2A025C3A0083EC60 /* AppDelegate.m */; };
 		9AA254D12A025C3A0083EC60 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA254D02A025C3A0083EC60 /* SceneDelegate.m */; };
 		9AA254D42A025C3A0083EC60 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA254D32A025C3A0083EC60 /* ViewController.m */; };
@@ -87,19 +86,15 @@
 		06AB721C87866BD3C0854E17 /* Pods-WMBase.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WMBase.debug.xcconfig"; path = "Target Support Files/Pods-WMBase/Pods-WMBase.debug.xcconfig"; sourceTree = "<group>"; };
 		1E89EABCC77A5962AC62A701 /* libPods-WMBase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WMBase.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5A8C6AAAD042B49E5F154C8B /* Pods-WMBase.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WMBase.release.xcconfig"; path = "Target Support Files/Pods-WMBase/Pods-WMBase.release.xcconfig"; sourceTree = "<group>"; };
-		9A0212DF2A03E4D600422892 /* UIViewController+MM_configNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+MM_configNet.h"; path = "WMBase/WMBase/Ucm_NetWork/UIViewController+MM_configNet.h"; sourceTree = SOURCE_ROOT; };
-		9A0212E02A03E4D600422892 /* UIViewController+MM_configNet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+MM_configNet.m"; path = "WMBase/WMBase/Ucm_NetWork/UIViewController+MM_configNet.m"; sourceTree = SOURCE_ROOT; };
 		9A337E032A0487C300D058A5 /* CTMediator+Targets.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CTMediator+Targets.h"; sourceTree = "<group>"; };
 		9A337E042A0487C300D058A5 /* CTMediator+Targets.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CTMediator+Targets.m"; sourceTree = "<group>"; };
 		9A337E092A049C5600D058A5 /* NSDate+YYadd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDate+YYadd.h"; sourceTree = "<group>"; };
 		9A337E0A2A049C5600D058A5 /* NSDate+YYadd.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+YYadd.m"; sourceTree = "<group>"; };
 		9A337E252A04E04900D058A5 /* UCMHttpRequestBaseVM.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UCMHttpRequestBaseVM.m; sourceTree = "<group>"; };
 		9A337E262A04E04900D058A5 /* UCMHttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UCMHttpRequest.h; sourceTree = "<group>"; };
-		9A337E272A04E04900D058A5 /* UIViewController+MM_configNet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+MM_configNet.m"; sourceTree = "<group>"; };
 		9A337E282A04E04900D058A5 /* UCMHttpRequestNetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UCMHttpRequestNetworkManager.h; sourceTree = "<group>"; };
 		9A337E292A04E04900D058A5 /* UCMHttpRequestResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UCMHttpRequestResponse.h; sourceTree = "<group>"; };
 		9A337E2A2A04E04900D058A5 /* UCMHttpRequestBaseVM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UCMHttpRequestBaseVM.h; sourceTree = "<group>"; };
-		9A337E2B2A04E04900D058A5 /* UIViewController+MM_configNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+MM_configNet.h"; sourceTree = "<group>"; };
 		9A337E2C2A04E04900D058A5 /* UCMHttpRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UCMHttpRequest.m; sourceTree = "<group>"; };
 		9A337E2D2A04E04900D058A5 /* UCMHttpRequestResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UCMHttpRequestResponse.m; sourceTree = "<group>"; };
 		9A337E2E2A04E04900D058A5 /* UCMHttpRequestNetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UCMHttpRequestNetworkManager.m; sourceTree = "<group>"; };
@@ -215,7 +210,6 @@
 		9A6694CE2A039C53000AE75F /* PPNetworkCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPNetworkCache.m; sourceTree = "<group>"; };
 		9A6694CF2A039C53000AE75F /* HZY_UploadFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HZY_UploadFile.m; sourceTree = "<group>"; };
 		9A6694D12A039C53000AE75F /* TT_GeneralProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TT_GeneralProfile.h; sourceTree = "<group>"; };
-		9A6694D22A039C53000AE75F /* UC_CommonmoduleMaco.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UC_CommonmoduleMaco.h; sourceTree = "<group>"; };
 		9A6695162A039E55000AE75F /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
 		9A6695182A039FFA000AE75F /* WRNavigationBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WRNavigationBar.m; sourceTree = "<group>"; };
 		9A6695192A039FFA000AE75F /* WRCustomNavigationBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WRCustomNavigationBar.h; sourceTree = "<group>"; };
@@ -229,6 +223,9 @@
 		9A7542992A0347CD0048C774 /* UCMViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UCMViewController.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>"; };
+		9A8DD8BC2A0B880100573324 /* UIViewController+MM_configNet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+MM_configNet.m"; sourceTree = "<group>"; };
+		9A8DD8BD2A0B880100573324 /* UIViewController+MM_configNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+MM_configNet.h"; sourceTree = "<group>"; };
 		9AA254C92A025C3A0083EC60 /* WMBase.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WMBase.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9AA254CC2A025C3A0083EC60 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		9AA254CD2A025C3A0083EC60 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -278,11 +275,9 @@
 			children = (
 				9A337E252A04E04900D058A5 /* UCMHttpRequestBaseVM.m */,
 				9A337E262A04E04900D058A5 /* UCMHttpRequest.h */,
-				9A337E272A04E04900D058A5 /* UIViewController+MM_configNet.m */,
 				9A337E282A04E04900D058A5 /* UCMHttpRequestNetworkManager.h */,
 				9A337E292A04E04900D058A5 /* UCMHttpRequestResponse.h */,
 				9A337E2A2A04E04900D058A5 /* UCMHttpRequestBaseVM.h */,
-				9A337E2B2A04E04900D058A5 /* UIViewController+MM_configNet.h */,
 				9A337E2C2A04E04900D058A5 /* UCMHttpRequest.m */,
 				9A337E2D2A04E04900D058A5 /* UCMHttpRequestResponse.m */,
 				9A337E2E2A04E04900D058A5 /* UCMHttpRequestNetworkManager.m */,
@@ -427,8 +422,8 @@
 		9A6694C02A039C53000AE75F /* UC_CommonmoduleNetWork */ = {
 			isa = PBXGroup;
 			children = (
-				9A0212DF2A03E4D600422892 /* UIViewController+MM_configNet.h */,
-				9A0212E02A03E4D600422892 /* UIViewController+MM_configNet.m */,
+				9A8DD8BD2A0B880100573324 /* UIViewController+MM_configNet.h */,
+				9A8DD8BC2A0B880100573324 /* UIViewController+MM_configNet.m */,
 				9A6694CC2A039C53000AE75F /* FTT_NetWorkkingManager.h */,
 				9A6694C82A039C53000AE75F /* FTT_NetWorkkingManager.m */,
 				9A6694C42A039C53000AE75F /* HZY_UploadFile.h */,
@@ -509,7 +504,7 @@
 		9AA254E52A025C630083EC60 /* WMBase */ = {
 			isa = PBXGroup;
 			children = (
-				9A6694D22A039C53000AE75F /* UC_CommonmoduleMaco.h */,
+				9A8DD8BB2A0B87AF00573324 /* WMBase.h */,
 				9A337E242A04E04900D058A5 /* Ucm_NetWork */,
 				9A6694D12A039C53000AE75F /* TT_GeneralProfile.h */,
 				9A8369772A03651D00E0DA39 /* UCMBaseC.h */,
@@ -670,6 +665,7 @@
 				9A66951D2A039FFA000AE75F /* WRCustomNavigationBar.m in Sources */,
 				9A337E052A0487C300D058A5 /* CTMediator+Targets.m in Sources */,
 				9A6695272A03A5A0000AE75F /* KWLoginedManager.m in Sources */,
+				9A8DD8BE2A0B880100573324 /* UIViewController+MM_configNet.m in Sources */,
 				9A6694FA2A039C53000AE75F /* UIImageView+SDCategory.m in Sources */,
 				9A6694FC2A039C53000AE75F /* TSShareHelper.m in Sources */,
 				9A6694F52A039C53000AE75F /* NSDictionary+PropertyCode.m in Sources */,
@@ -683,7 +679,6 @@
 				9A337E332A04E04900D058A5 /* UCMHttpRequestNetworkManager.m in Sources */,
 				9A6695002A039C53000AE75F /* UC_Generalconfig.m in Sources */,
 				9A6694E82A039C53000AE75F /* TT_BaseModel.m in Sources */,
-				9A337E302A04E04900D058A5 /* UIViewController+MM_configNet.m in Sources */,
 				9A66950D2A039C53000AE75F /* FTT_ShareLayer.m in Sources */,
 				9A6694DB2A039C53000AE75F /* TT_BaseC.m in Sources */,
 				9A6695092A039C53000AE75F /* FTT_HudTool.m in Sources */,
@@ -705,7 +700,6 @@
 				9A6695052A039C53000AE75F /* FTT_Helper.m in Sources */,
 				9A6694EE2A039C53000AE75F /* TT_BaseTableV.m in Sources */,
 				9A6695212A03A2F3000AE75F /* KWLoginedUserModel.m in Sources */,
-				9A0212E12A03E4D600422892 /* UIViewController+MM_configNet.m in Sources */,
 				9A66950C2A039C53000AE75F /* Current_normalTool.m in Sources */,
 				9A6694D72A039C53000AE75F /* TT_SlidedownwardTool.m in Sources */,
 				9AA254D12A025C3A0083EC60 /* SceneDelegate.m in Sources */,

BIN
WMBase.xcworkspace/xcuserdata/wangmeng.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 2
WMBase/WMBase/CTMediatoaTargets/CTMediator+Targets.m

@@ -9,10 +9,10 @@
 
 @implementation CTMediator (Targets)
 -(UIViewController *)Goods_GoodsDetaileC:(NSDictionary *)params{
-    return [self performTarget:@"Goods" action:@"GoodsDetaileC" params:nil shouldCacheTarget:NO];
+    return [self performTarget:@"Goods" action:@"GoodsDetaileC" params:params shouldCacheTarget:NO];
 }
 
 -(UIViewController *)B_viewControllerWithContentText:(NSDictionary *)params{
-    return [self performTarget:@"B" action:@"viewController" params:nil shouldCacheTarget:NO];
+    return [self performTarget:@"B" action:@"viewController" params:params shouldCacheTarget:NO];
 }
 @end

+ 3 - 1
WMBase/WMBase/UCMBaseC.h

@@ -13,7 +13,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UCMBaseC : QMUICommonViewController
 
-
+#pragma mark -- 公开方法
+-(void)ucm_bindvmmodel;
+-(void)ucm_changedefault;
 @end
 
 NS_ASSUME_NONNULL_END

+ 1 - 0
WMBase/WMBase/UCMBaseC.m

@@ -16,6 +16,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.view.backgroundColor = [UIColor qmui_colorWithHexString:@"#FFFFFF"];
     [self ucm_bindvmmodel]; //绑定网络请求
     [self ucm_changedefault];
 }

+ 4 - 3
WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleKit/TT_BaseScrollView.h

@@ -33,11 +33,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// 回调
 @property (nonatomic , weak) id <TT_BaseScrollViewDelegate> TTscrolldelegate;
 /// 修改默认值 或 配置属性
-- (void)tengteng_changeDefault;
+- (void)tt_changeDefault;
 
-- (void)tengteng_addsubviewS;
+- (void)tt_addsubviewS;
 
-- (void)tengteng_setupFrameS;
+- (void)tt_setupFrameS;
+- (void)tt_configData:(id)data;
 @end
 
 NS_ASSUME_NONNULL_END

+ 9 - 5
WMBase/WMBase/UC_Commonmodule/UC_CommonmoduleKit/TT_BaseScrollView.m

@@ -122,17 +122,21 @@
 
 #pragma mark 公开方法
 
-- (void)tengteng_changeDefault {
+- (void)tt_changeDefault {
     
 }
 
-- (void)tengteng_addsubviewS {
+- (void)tt_addsubviewS {
     
 }
 
-- (void)tengteng_setupFrameS {
+- (void)tt_setupFrameS {
     
 }
+- (void)tt_configData:(id)data{
+    
+}
+
 
 #pragma mark 私有方法
 
@@ -142,13 +146,13 @@
     self.delegate = self;
     self.showsVerticalScrollIndicator = NO;
     self.showsHorizontalScrollIndicator = NO;
-    [self tengteng_addsubviewS];
+    [self tt_addsubviewS];
 }
 
 
 - (void)tengteng_config {
     [self tengteng_configDefault];
-    [self tengteng_changeDefault];
+    [self tt_changeDefault];
 }
 
 

+ 0 - 31
WMBase/WMBase/UC_CommonmoduleMaco.h

@@ -1,31 +0,0 @@
-//
-//  UC_CommonmoduleMaco.h
-//  Pods
-//
-//  Created by 樊腾 on 2020/8/24.
-//
-
-#ifndef UC_CommonmoduleMaco_h
-#define UC_CommonmoduleMaco_h
-
-
-
-#if __has_include(<WMBase/UC_CommonmoduleMaco.h>)
-
-
-#import <WMBase/TT_GeneralProfile.h>
-#import <WMBase/UC_CommonmoduleCat.h>
-#import <WMBase/UC_CommonmoduleKit.h>
-#import <WMBase/UC_CommonmoduleNetWork.h>
-#import <WMBase/UC_CommonmoduleTool.h>
-
-#else
-
-#import "TT_GeneralProfile.h"
-#import "UC_CommonmoduleCat.h"
-#import "UC_CommonmoduleKit.h"
-#import "UC_CommonmoduleNetWork.h"
-#import "UC_CommonmoduleTool.h"
-#endif
-
-#endif /* UC_CommonmoduleMaco_h */

+ 34 - 0
WMBase/WMBase/WMBase.h

@@ -0,0 +1,34 @@
+//
+//  WMBase.h
+//  Pods
+//
+//  Created by 王猛 on 2023/5/10.
+//
+
+#ifndef WMBase_h
+#define WMBase_h
+#if __has_include(<WMBase.h>)
+
+
+#import <TT_GeneralProfile.h>
+#import <UC_CommonmoduleCat.h>
+#import <UC_CommonmoduleKit.h>
+#import <UC_CommonmoduleNetWork.h>
+#import <UC_CommonmoduleTool.h>
+#import <UCMBaseC.h>
+#import <CTMediator+Targets.h>
+#import <TT_GeneralProfile.h>
+
+
+#else
+
+#import "TT_GeneralProfile.h"
+#import "UC_CommonmoduleCat.h"
+#import "UC_CommonmoduleKit.h"
+#import "UC_CommonmoduleNetWork.h"
+#import "UC_CommonmoduleTool.h"
+#import "UCMBaseC.h"
+#import "CTMediator+Targets.h"
+#import "TT_GeneralProfile.h"
+
+#endif /* WMBase_h */