Merge branch 'master' of http://gogs.hnwmzp.cn/nzk1/Asteria-APP

Asteria.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		2B3E96D298A3E04003DA2AD3 /* Pods_Asteria_NotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51AF3B78609F55449DF09609 /* Pods_Asteria_NotificationServiceExtension.framework */; };
+		81056D5C2B60F571009219A3 /* ASHelpListUrlModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 81056D5B2B60F571009219A3 /* ASHelpListUrlModel.m */; };
 		811F42462A40533C00DA68F1 /* ASPointsHomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 811F42452A40533C00DA68F1 /* ASPointsHomeViewController.m */; };
 		811F42492A40536C00DA68F1 /* ASPointHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 811F42482A40536C00DA68F1 /* ASPointHeadView.m */; };
 		812021152B14659A0026B8B5 /* ASUserInfoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 812021142B14659A0026B8B5 /* ASUserInfoManager.m */; };
@@ -323,6 +324,8 @@
 		3C97D3C0DD5DB3DCA3FF46B8 /* Pods-Asteria.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Asteria.debug.xcconfig"; path = "Target Support Files/Pods-Asteria/Pods-Asteria.debug.xcconfig"; sourceTree = "<group>"; };
 		51AF3B78609F55449DF09609 /* Pods_Asteria_NotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Asteria_NotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		54DCE8001991D89B696E7D44 /* Pods_Asteria.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Asteria.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		81056D5A2B60F571009219A3 /* ASHelpListUrlModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASHelpListUrlModel.h; sourceTree = "<group>"; };
+		81056D5B2B60F571009219A3 /* ASHelpListUrlModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASHelpListUrlModel.m; sourceTree = "<group>"; };
 		811F42442A40533C00DA68F1 /* ASPointsHomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASPointsHomeViewController.h; sourceTree = "<group>"; };
 		811F42452A40533C00DA68F1 /* ASPointsHomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASPointsHomeViewController.m; sourceTree = "<group>"; };
 		811F42472A40536C00DA68F1 /* ASPointHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASPointHeadView.h; sourceTree = "<group>"; };
@@ -1497,6 +1500,8 @@
 				81C7963E2A551FB0003083B8 /* ASInfomationSetController.m */,
 				81C796442A5542B2003083B8 /* ASHelpListViewController.h */,
 				81C796452A5542B2003083B8 /* ASHelpListViewController.m */,
+				81056D5A2B60F571009219A3 /* ASHelpListUrlModel.h */,
+				81056D5B2B60F571009219A3 /* ASHelpListUrlModel.m */,
 				81C7963C2A551F86003083B8 /* view */,
 			);
 			path = Setting;
@@ -2630,6 +2635,7 @@
 				9AD345FB2A08D60F005CA070 /* ZFOrientationObserver.m in Sources */,
 				9AD346192A08D679005CA070 /* GoodsBannerModel.m in Sources */,
 				81717C942A3BE4E000648139 /* ASProductListSortFilterCell.m in Sources */,
+				81056D5C2B60F571009219A3 /* ASHelpListUrlModel.m in Sources */,
 				9AD346082A08D60F005CA070 /* ZFIJKPlayerManager.m in Sources */,
 				9AD3459E2A08D545005CA070 /* GoodsDetailSrcView.m in Sources */,
 				81DFA56D2A46D86500DA708B /* ASPointDetailModel.m in Sources */,

Asteria/Fuction/UserCenter/Setting/ASHelpListUrlModel.h

@@ -0,0 +1,19 @@
+//
+//  ASHelpListUrlModel.h
+//  Asteria
+//
+//  Created by iOS on 2024/1/24.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ASHelpListUrlModel : NSObject
+
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *value;
+
+@end
+
+NS_ASSUME_NONNULL_END

Asteria/Fuction/UserCenter/Setting/ASHelpListUrlModel.m

@@ -0,0 +1,12 @@
+//
+//  ASHelpListUrlModel.m
+//  Asteria
+//
+//  Created by iOS on 2024/1/24.
+//
+
+#import "ASHelpListUrlModel.h"
+
+@implementation ASHelpListUrlModel
+
+@end

Asteria/Fuction/UserCenter/Setting/ASHelpListViewController.h

@@ -11,8 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ASHelpListViewController : ASBaseViewController
 
-@property (nonatomic, assign) BOOL isHelp;
-
 @end
 
 NS_ASSUME_NONNULL_END

Asteria/Fuction/UserCenter/Setting/ASHelpListViewController.m

@@ -7,13 +7,13 @@
 
 #import "ASHelpListViewController.h"
 #import "ASSettingListCell.h"
+#import "ASHelpListUrlModel.h"
 
 @interface ASHelpListViewController ()<UITableViewDelegate,UITableViewDataSource>
 
 @property (nonatomic, strong) UITableView *tableV;
 
-//@property (nonatomic, strong) KWSettingLinkListViewModel *vm;
-
+@property (nonatomic, strong) NSArray<ASHelpListUrlModel *> *linkArr;
 
 @end
 
@@ -22,7 +22,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.titleStr = self.isHelp ? @"Help & Support" : @"Customer Service";
+    self.titleStr = @"Help & Support";
     [self setNavRightSearch:^{
         
     }];
@@ -32,30 +32,23 @@
     
     [self loadSubVs];
     
-    
-//    self.vm = [KWSettingLinkListViewModel new];
-    
+        
     [self configData];
 }
 
 - (void)configData {
-//    [MBProgressHUD showHUDAddedTo:self.view animated:true];
-//    if (self.isHelp) {
-//        @weakify(self);
-//        [self.vm getHelpListData:^{
-//            [MBProgressHUD hideHUDForView:weak_self.view animated:true];
-//            [weak_self.tableV reloadData];
-//        }];
-//    } else {
-//        @weakify(self);
-//        [self.vm getCusServeListData:^{
-//            [MBProgressHUD hideHUDForView:weak_self.view animated:true];
-//            [weak_self.tableV reloadData];
-//        }];
-//    }
-//
-
-    [self.tableV reloadData];
+    [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    __weak typeof(self) weakSelf = self;
+    [ASNetTools.shared getWithPath:helpCenterUrl param:@{} success:^(id _Nonnull json) {
+        [MBProgressHUD hideHUDForView:weakSelf.view animated:true];
+        weakSelf.linkArr = [ASHelpListUrlModel mj_objectArrayWithKeyValuesArray:json];
+        [weakSelf.tableV reloadData];
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        [MBProgressHUD hideHUDForView:weakSelf.view animated:true];
+        weakSelf.linkArr = @[];
+        [weakSelf.tableV reloadData];
+        NSLog(@"----code:%@-msg:%@--", code, msg);
+    }];
 }
 
 
@@ -89,29 +82,30 @@
 }
 
 - (void)toActiveVc:(NSString *)pageUrl title:(NSString *)tit {
-    [Fuction_Tool push_BaseWebUrl:pageUrl  webTitle:tit];
+    UIViewController *vc = [CTMediator.sharedInstance getWebViewVc:@{
+        @"title":tit,
+        @"url":pageUrl
+    }];
+    [self.navigationController pushViewController:vc animated:true];
+    
 }
 
 #pragma mark - UITableViewDelegate,UITableViewDataSource
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-//    if (![self checkLogin:true]) {
-//        return;
-//    }
-//    KWMineUrlLinkModel *linkM = self.vm.linkArr[indexPath.row];
-//    [self toActiveVc:linkM.url title:linkM.title];
+    ASHelpListUrlModel *linkM = self.linkArr[indexPath.row];
+    [self toActiveVc:linkM.value title:linkM.title];
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 10;//self.vm.linkArr.count;
+    return self.linkArr.count;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
    
     ASSettingListCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ASSettingListCell" forIndexPath:indexPath];
-//    KWMineUrlLinkModel *link = self.vm.linkArr[indexPath.row];
-//    [cell setTitle:link.title points:@"" enable:true];
-    [cell setTitle:@"Shipping & Delivery" points:@"" enable:true];
+    ASHelpListUrlModel *link = self.linkArr[indexPath.row];
+    [cell setTitle:link.title points:@"" enable:true];
     return  cell;
 }
 

Asteria/Fuction/UserCenter/Setting/ASSettingViewController.m

@@ -48,7 +48,7 @@
     self.titleArr = @[@"INFORMATION",
                       @"SHIPPING ADDRESS",
                       @"SUBSCRIBE",
-                      @"CUSTOMER SERVICE",
+//                      @"CUSTOMER SERVICE",
                       @"HELP & SUPPORT",
                       @"LOG OUT",
                       @"DELETE ACCOUNT"];
@@ -158,21 +158,14 @@
         }
         case 3:{
             ASHelpListViewController *vc = [ASHelpListViewController new];
-            vc.isHelp = false;
             [self.navigationController pushViewController:vc animated:true];
             break;
         }
-        case 4:{
-            ASHelpListViewController *vc = [ASHelpListViewController new];
-            vc.isHelp = true;
-            [self.navigationController pushViewController:vc animated:true];
-            break;
-        }
-        case 5: {
+        case 4: {
             [self logout];
             break;
         }
-        case 6: {
+        case 5: {
             [self showDeleteAccountAlert];
             break;
         }

Asteria/Fuction/UserCenter/UserCenterHome/ASUserCenterViewController.m

@@ -203,7 +203,7 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
     if (section == 0) {
-        return 80;
+        return self.orderArr.count == 0 ? 0 : 80;
     }
     return 0;
 }

Asteria/Fuction/UserCenter/UserCenterHome/views/KWMineMoreProductTypeCell.m

@@ -18,7 +18,6 @@
 - (void)setTitle:(NSString *)title isSelect:(BOOL)select {
     self.titleLb.text = title;
     self.titleLb.textColor = select ? UIColor.whiteColor :  UIColor.blackColor;
-//    self.titleLb.font = select ? [UIFont fontWithName:Rob_Bold size:12] : [UIFont fontWithName:Rob_Regular size:12];
     self.titleLb.backgroundColor = select ? _113632 : _F8F8F8;
 }
 

Asteria/Fuction/WebView/ASWebViewController.m

@@ -23,8 +23,35 @@
     [self beginLoad];
 }
 
+- (void)dealloc
+{
+    [self deleteWebCache];
+}
+
+- (void)deleteWebCache {
+//allWebsiteDataTypes清除所有缓存
+ NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
+
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
+        
+    }];
+}
+
 - (void)beginLoad {
-    NSURL *url = [NSURL URLWithString:self.webUrl];
+    NSMutableString *endUrl = [NSMutableString stringWithString:self.webUrl];
+    if ([self.webUrl hasSuffix:@"/"]) {
+        [endUrl deleteCharactersInRange:NSMakeRange(endUrl.length-1, 1)];
+    }
+    NSURL *url = [NSURL URLWithString:endUrl];
+    NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
+    NSMutableArray *array = [NSMutableArray arrayWithArray:components.queryItems];
+    NSURLQueryItem *item = [NSURLQueryItem queryItemWithName:@"hidenav" value:@"1"];
+    [array addObject:item];
+    components.queryItems = array;
+    [components setQueryItems:array];
+    url = [components URLRelativeToURL:url];
     if (!url) {
         return;
     }

Asteria/NetTools/ASNetApis.h

@@ -53,6 +53,7 @@
 #define putUserPassword BaseRequestrUrl(@"customers/me/password")
 
 //MARK: - 个人中心
+#define helpCenterUrl BaseRequestrUrl(@"about")
 #define postLogOut BaseRequestrUrl(@"integration/customer/revoke-customer-token")
 #define getSignStateUrl BaseRequestrUrl(@"sign/index")
 #define postSignUrl BaseRequestrUrl(@"sign/add")

Asteria/NetTools/ASNetTools.m

@@ -125,9 +125,9 @@
             faild([NSString stringWithFormat:@"%ld", error.code], error.localizedDescription);
         });
     }];
-    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
+//    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
         [self.engine enqueueOperation:op];
-    });
+//    });d
 }
 
 // formData的post请求
@@ -248,9 +248,9 @@
             faild([NSString stringWithFormat:@"%ld", error.code], error.localizedDescription);
         });
     }];
-    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
-        [self.engine enqueueOperation:op];
-    });
+    [self.engine enqueueOperation:op];
+//    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
+//    });
 
 }
 
@@ -309,9 +309,9 @@
             faild([NSString stringWithFormat:@"%ld", error.code], error.localizedDescription);
         });
     }];
-    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
+//    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
         [self.engine enqueueOperation:op];
-    });
+//    });
 
 }
 
@@ -370,9 +370,9 @@
             faild([NSString stringWithFormat:@"%ld", error.code], error.localizedDescription);
         });
     }];
-    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
+//    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
         [self.engine enqueueOperation:op];
-    });
+//    });
 
 }
 
@@ -400,8 +400,8 @@
 
 + (void)login {
     NSDictionary *param = @{
-        @"username" :@"Britneyngwafa@gmail.com",//@"abc123456789@qq.com",
-        @"password":@"1qazXSW@123"//@"A123456a"
+        @"username" :@"abc123456789@qq.com",//@"Britneyngwafa@gmail.com",//
+        @"password":@"A123456a",//@"1qazXSW@123",//
     };
     [ASNetTools.shared postWithPath:loginUrl param:param success:^(id _Nonnull result) {
         NSString *token = [NSString stringWithFormat:@"Bearer %@", result];