项目整体格式修改-wm

Asteria.xcodeproj/project.pbxproj

@@ -313,7 +313,7 @@
 		9AD3461C2A08D6EF005CA070 /* GoodsInformationM.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoodsInformationM.m; sourceTree = "<group>"; };
 		9AD3461E2A08E30E005CA070 /* SelectVCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SelectVCollectionViewCell.h; sourceTree = "<group>"; };
 		9AD3461F2A08E30E005CA070 /* SelectVCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SelectVCollectionViewCell.m; sourceTree = "<group>"; };
-		9AD346212A08E828005CA070 /* ProjectConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProjectConfig.h; sourceTree = "<group>"; };
+		9AD346212A08E828005CA070 /* ProjectConfigDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProjectConfigDefine.h; sourceTree = "<group>"; };
 		9AD364C42A05E73E00452C7A /* AS_GoodsDetailsC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AS_GoodsDetailsC.h; sourceTree = "<group>"; };
 		9AD364C52A05E73E00452C7A /* AS_GoodsDetailsC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AS_GoodsDetailsC.m; sourceTree = "<group>"; };
 		9AD364CF2A05EC7800452C7A /* AS_TabBarViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AS_TabBarViewController.h; sourceTree = "<group>"; };
@@ -373,9 +373,12 @@
 		814F5CF12A11B337003847A9 /* ASUI */ = {
 			isa = PBXGroup;
 			children = (
+				81C3B45029F669C900D79294 /* ColorDefine.h */,
+				8199001E2A0206F7006FE68C /* SizeDefine.h */,
+				81C3B44B29F6691300D79294 /* Extensions */,
+				8199001F2A020A4F006FE68C /* Tools */,
 				81E257F72A122AAB004EEF71 /* Icons */,
 				81E257EF2A12093A004EEF71 /* CustomView */,
-				814F5CF62A11B76F003847A9 /* Font */,
 				814F5CF22A11B35B003847A9 /* ASUserAvater */,
 				814F5CF02A11B317003847A9 /* SimpleBase */,
 			);
@@ -449,8 +452,6 @@
 				9AD364CE2A05EC4500452C7A /* Tabber */,
 				9AD364CD2A05EC2700452C7A /* Config */,
 				9AD364CC2A05EBE800452C7A /* Fuction */,
-				8199001F2A020A4F006FE68C /* Tools */,
-				81C3B44B29F6691300D79294 /* Extensions */,
 				8172449D29F3B2ED005FA9C9 /* AppDelegate.h */,
 				8172449E29F3B2ED005FA9C9 /* AppDelegate.m */,
 				9ACBEC2A2A14CCA200A8F97A /* ThirdPartService.h */,
@@ -627,8 +628,8 @@
 			isa = PBXGroup;
 			children = (
 				9A65DE4F2A132FB700BB1269 /* LoginThirdAuthV.h */,
-				9A65DE502A132FB700BB1269 /* LoginThirdAuthV.m */,
 				9ACBEC262A1472AF00A8F97A /* LoginSignUpV.h */,
+				9A65DE502A132FB700BB1269 /* LoginThirdAuthV.m */,
 				9ACBEC272A1472AF00A8F97A /* LoginSignUpV.m */,
 			);
 			path = V;
@@ -867,9 +868,8 @@
 		9AD364CD2A05EC2700452C7A /* Config */ = {
 			isa = PBXGroup;
 			children = (
-				9AD346212A08E828005CA070 /* ProjectConfig.h */,
-				81C3B45029F669C900D79294 /* ColorDefine.h */,
-				8199001E2A0206F7006FE68C /* SizeDefine.h */,
+				814F5CF62A11B76F003847A9 /* Font */,
+				9AD346212A08E828005CA070 /* ProjectConfigDefine.h */,
 			);
 			path = Config;
 			sourceTree = "<group>";

Asteria/CTMediatoaTargets/CTMediator+ASTargerts.m

@@ -25,6 +25,6 @@
 
 #warning TODO 修改
 -(UIViewController *)getUserCenterVc:(NSDictionary *)params{
-    return [self performTarget:@"B" action:@"viewController" params:params shouldCacheTarget:NO];
+    return [self performTarget:@"userCenter" action:@"getUserCenterVc" params:params shouldCacheTarget:NO];
 }
 @end

Asteria/Config/ProjectConfig.h

@@ -1,12 +1,12 @@
 //
-//  ProjectConfig.h
+//  ProjectConfigDefine.h
 //  Asteria
 //
 //  Created by 王猛 on 2023/5/8.
 //
 
-#ifndef ProjectConfig_h
-#define ProjectConfig_h
+#ifndef ProjectConfigDefine_h
+#define ProjectConfigDefine_h
 
 ///////正式服务器
 #define WebBase_Server @"https://app.westkiss.com/"
@@ -35,4 +35,4 @@
 
 
 
-#endif /* ProjectConfig_h */
+#endif /* ProjectConfigDefine_h */

Asteria/Fuction/Login/V/LoginSignUpV.m

@@ -285,29 +285,23 @@
         YYTextHighlight *protocolHightlight = [[YYTextHighlight alloc] init];
         [attributed yy_setTextHighlight:protocolHightlight range:[string rangeOfString:@"Terms & Conditions"]];
         [attributed yy_setTextUnderline:[YYTextDecoration decorationWithStyle:YYTextLineStyleSingle] range:[string rangeOfString:@"Terms & Conditions"]];
+        
             
         YYTextHighlight *layHightlight = [[YYTextHighlight alloc] init];
         [attributed yy_setTextHighlight:layHightlight range:[string rangeOfString:@"Privacy Policy"]];
         [attributed yy_setTextUnderline:[YYTextDecoration decorationWithStyle:YYTextLineStyleSingle] range:[string rangeOfString:@"Privacy Policy"]];
-
+        
+        [attributed yy_setColor:ThemeColor range:[string rangeOfString:@"Terms & Conditions"]];
+        [attributed yy_setColor:ThemeColor range:[string rangeOfString:@"Privacy Policy"]];
+        @weakify(self)
+        [attributed yy_setTextHighlightRange:[string rangeOfString:@"Terms & Conditions"] color:ThemeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+            NSLog(@"----");
+        }];
+        [attributed yy_setTextHighlightRange:[string rangeOfString:@"Privacy Policy"] color:ThemeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+            NSLog(@"----");
+        }];
         _xxx_ClickLab.attributedText = attributed;
         _xxx_ClickLab.font = [UIFont systemFontOfSize:12];
-        _xxx_ClickLab.textColor = [UIColor colorWithHexString:@"#000000"];
-        @weakify(self)
-        _xxx_ClickLab.highlightTapAction = ^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
-            @strongify(self)
-            //wm_todo 确认跳转的网页
-            NSString *string = [text.string substringWithRange:range];
-            if ([string isEqualToString:@"Terms & Conditions"]) {
-//                [Fuction_Tool push_BaseWebUrl:@"https://www.westkiss.com/terms_conditions" webTitle:@"Terms & Conditions"];
-                
-            }else if([string isEqualToString:@"Privacy Policy"]){
-//                [self generaltriggermethodType:100 data:@{@"privacy":@"https://www.alipearlhair.com/privacy_policy"}];
-//                [Fuction_Tool push_BaseWebUrl:@"https://www.westkiss.com/privacy_policy" webTitle:@"Privacy Policy"];
-
-            }
-
-        };
     }
     return _xxx_ClickLab;
 }

Asteria/Fuction/Login/VC/AS_SignUpC.m

@@ -21,7 +21,7 @@
     // Do any additional setup after loading the view.
     self.customNavBar.hidden = YES;
     self.navigationController.navigationBar.hidden = YES;
-    [self ucm_veiwTapBlock];
+    [self sub_veiwTapBlock];
 }
 
 - (void)initSubviews{
@@ -39,7 +39,7 @@
     [self.xxx_signUpV sizeToFit];
     NSLog(@"------%@",self.xxx_signUpV);
 }
-- (void)ucm_veiwTapBlock{
+- (void)sub_veiwTapBlock{
     @weakify(self)
     self.xxx_signUpV.ViewtapClose = ^(NSInteger num, id  _Nonnull data) {
         @strongify(self)

Asteria/Fuction/UserCenter/Target_userCenter.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface Target_userCenter : NSObject
-
+- (UIViewController *)Action_getUserCenterVc:(NSDictionary *)params;
 @end
 
 NS_ASSUME_NONNULL_END

Asteria/PreFixHeader.h

@@ -8,12 +8,13 @@
 #ifndef PreFixHeader_h
 #define PreFixHeader_h
 
-#import "ProjectConfig.h"
+#import "ProjectConfigDefine.h"
+#import "CTMediator+ASTargerts.h"
+
 #import "UIView+PublicInit.h"
 #import "UIColor+AS.h"
 #import "ColorDefine.h"
 #import "SizeDefine.h"
-#import "CTMediator+ASTargerts.h"
 
 ///基础库的导入内容
 #import <WMBase/WMBase.h>

Pods/Target Support Files/WMBase/WMBase-umbrella.h

@@ -16,41 +16,41 @@
 #import "UCMHttpRequestBaseVM.h"
 #import "UCMHttpRequestNetworkManager.h"
 #import "UCMHttpRequestResponse.h"
+#import "dsbridge.h"
+#import "DSCallInfo.h"
+#import "DWKWebView.h"
+#import "InternalApis.h"
+#import "JSBUtil.h"
+#import "DsJsInteractAPI.h"
+#import "XXX_BaseWebC.h"
 #import "NSDate+YYadd.h"
 #import "NSDictionary+PropertyCode.h"
 #import "NSString+URL.h"
 #import "SYBJ_ColorS.h"
 #import "UC_CommonmoduleCat.h"
+#import "UIButton+SDCategory.h"
 #import "UIColor+Categpry.h"
 #import "UIImage+Rotate.h"
+#import "UIImageView+SDCategory.h"
 #import "UIView+Frame.h"
-#import "UIViewController+HUD.h"
-#import "Msg_BackNormalFooter.h"
 #import "TT_BaceProtocol.h"
 #import "TT_BaseC.h"
 #import "TT_BaseCell.h"
 #import "TT_BaseCollectionV.h"
 #import "TT_BaseCollectionViewCell.h"
-#import "TT_BaseModel.h"
 #import "TT_BaseScrollView.h"
 #import "TT_BaseTableV.h"
 #import "TT_BaseV.h"
+#import "TT_Custonbtn.h"
+#import "TT_CustonTF.h"
 #import "TT_CycleCollectionViewFlowLayout.h"
 #import "TT_Lable.h"
-#import "TT_MongoliaV.h"
 #import "TT_NothingV.h"
 #import "TT_ProgressV.h"
-#import "TT_SlidedownwardTool.h"
 #import "TT_TitleV.h"
-#import "TT_ViewAppearOrdisappear.h"
-#import "TT_WKweb.h"
 #import "UC_CommonmoduleKit.h"
 #import "UIDevice+StateHeight.h"
 #import "UIViewController+TT_configV.h"
-#import "WeakScriptMessageDelegate.h"
-#import "WKProcessPool+SharedProcessPool.h"
-#import "XXX_ToolWKData.h"
-#import "FTT_NetWorkkingManager.h"
 #import "HZY_UploadFile.h"
 #import "PPNetworkCache.h"
 #import "PPNetworkHelper.h"
@@ -59,25 +59,13 @@
 #import "UIViewController+MM_configNet.h"
 #import "Current_normalTool.h"
 #import "DataUtil.h"
-#import "FTT_AnimationTool.h"
-#import "FTT_ArcRotateV.h"
-#import "FTT_BombBox.h"
-#import "FTT_ButtonModule.h"
 #import "FTT_Helper.h"
 #import "FTT_HudTool.h"
-#import "FTT_LoadConfig.h"
-#import "FTT_ShareLayer.h"
 #import "HWCookiesManager.h"
 #import "TSShareHelper.h"
 #import "TT_ControlTool.h"
-#import "TT_Custonbtn.h"
-#import "TT_CustonTF.h"
 #import "TT_DarkmodeTool.h"
 #import "UC_CommonmoduleTool.h"
-#import "UC_Generalconfig.h"
-#import "UIButton+SDCategory.h"
-#import "UIImageView+SDCategory.h"
-#import "XXX_Datautil.h"
 #import "KWLoginedManager.h"
 #import "KWLoginedUserModel.h"
 #import "WMBase.h"