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

Asteria/Fuction/Category/vc/ASCategoryViewController.m

@@ -57,28 +57,35 @@
     }];
 }
 
-//设置币种
-- (void)requestSetCurrency:(NSString *)currency {
-    
-    NSDictionary *param = @{@"currency_code":currency};
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    K_WEAK_SELF;
-    [self.vm setAllCurrencyToService:param complete:^(BOOL isSuc, NSString * _Nonnull msg) {
-        K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-        if (isSuc) {
-            [self.view makeToast:@"Success" duration:2 position:CSToastPositionCenter];
-            [ASCurrencyManager.shared setSelectCurrency:currency];
-            [self.rightTableV reloadData];
-        } else {
-            if (AS_String_valid(msg)) {
-                [self.view makeToast:msg duration:2 position:CSToastPositionCenter];
-            } else {
-                [self.view makeToast:@"failed" duration:2 position:CSToastPositionCenter];
-            }
-        }
-    }];
-}
+////设置币种
+//- (void)requestSetCurrency:(NSString *)currency {
+//    
+//    NSDictionary *param = @{@"currency_code":currency};
+//    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+//    K_WEAK_SELF;
+//    [self.vm setAllCurrencyToService:param complete:^(BOOL isSuc, NSString * _Nonnull msg) {
+//        K_STRONG_SELF;
+//        [MBProgressHUD hideHUDForView:self.view animated:YES];
+//        if (isSuc) {
+//            [self.view makeToast:@"Success" duration:2 position:CSToastPositionCenter];
+//            
+//            //更新header币种
+//            [ASNetTools.shared updateEngine];
+//            
+//            //切换币种之后通知首页数据刷新
+//            [NSNotificationCenter.defaultCenter postNotificationName:HomeDataUpdateByCurrency object:nil];
+//            
+//            [ASCurrencyManager.shared setSelectCurrency:currency];
+//            [self.rightTableV reloadData];
+//        } else {
+//            if (AS_String_valid(msg)) {
+//                [self.view makeToast:msg duration:2 position:CSToastPositionCenter];
+//            } else {
+//                [self.view makeToast:@"failed" duration:2 position:CSToastPositionCenter];
+//            }
+//        }
+//    }];
+//}
 
 - (void)loadSubVs {
     self.statusBgV.backgroundColor = _E0FFF5;
@@ -162,7 +169,17 @@
         [_rightTableV setCallBackSection:^(NSInteger index) {
             KWSubTypeSectionModel *m = weak_self.rightTableV.arr[index];
             if (m.isMoneyType) {
-                [weak_self requestSetCurrency:m.title];
+//                [weak_self requestSetCurrency:m.title];
+                
+                // 0
+                [ASCurrencyManager.shared setSelectCurrency:m.title];
+                [weak_self.rightTableV reloadData];
+                
+                //1 更新header币种
+                [ASNetTools.shared updateEngine];
+                
+                //2 切换币种之后通知首页数据刷新
+                [NSNotificationCenter.defaultCenter postNotificationName:HomeDataUpdateByCurrency object:nil];
                 
                 return;
             }

Asteria/Fuction/Goods/VC/ASGoodsDetailsViewController.m

@@ -172,9 +172,7 @@
         self.model.show_prices = [NSString stringWithFormat:@"%.2lf", show_prices];
     }
     
-    
-
-    
+    //通知价格变化
     [NSNotificationCenter.defaultCenter postNotificationName:GoodsDetailsUpdatePrice object:nil];
 }
 
@@ -350,16 +348,6 @@
     }
     
     
-//    if (self.isReview) {
-//        
-//        
-//        self.TableV.tableFooterView = nil;
-//        
-//    } else {
-//        self.TableV.tableFooterView = _footView;
-//    }
-    
-    
     [self.TableV reloadData];
 }
 

Asteria/Fuction/Home/ASHomeViewController.m

@@ -37,6 +37,10 @@
     self.vm = [ASHomeViewModel new];
     self.topVm = [ASProductListViewModel new];
     
+    //切换币种之后通知首页数据刷新
+    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(getHomeListData) name:HomeDataUpdateByCurrency object:nil];
+
+    
     __block typeof(self) wSelf = self;
     [self ucHomeStyle:^{
         // TODO: 跳转搜索模块

Asteria/NetTools/ASNetTools.m

@@ -58,12 +58,14 @@
     self.engine = [[MKNetworkEngine alloc] initWithHostName:HostPath customHeaderFields:@{
         @"Authorization":token,
         @"powerby": @"longyitec",
-        @"Content-Type": @"application/json;charset=utf-8"
+        @"Content-Type": @"application/json;charset=utf-8",
+        @"Content-Currency": ASCurrencyManager.shared.currentCur
     }];
     self.msgEngine = [[MKNetworkEngine alloc] initWithHostName:MsgHostPath customHeaderFields:@{
         @"Authorization":token,
         @"powerby": @"longyitec",
-        @"Content-Type": @"application/json;charset=utf-8"
+        @"Content-Type": @"application/json;charset=utf-8",
+        @"Content-Currency": ASCurrencyManager.shared.currentCur
     }];
     
 }

Asteria/NetTools/ASUserNotifyStatic.h

@@ -19,8 +19,9 @@
 
 /// 通知用户信息更新
 #define UserInfoUpdate @"ASUserInfoUpdate"
-
-#define GoodsDetailsUpdatePrice  @"GoodsDetailsUpdatePrice"
-
+/// 切换商品规格后更新商品价格
+#define GoodsDetailsUpdatePrice     @"GoodsDetailsUpdatePrice"
+/// 切换币种之后通知首页数据刷新
+#define HomeDataUpdateByCurrency    @"HomeDataUpdateByCurrency"
 
 #endif /* ASUserNotifyStatic_h */