fix:bug

Asteria.xcodeproj/project.pbxproj

@@ -10,7 +10,6 @@
 		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 */; };
 		8110D1982C3CECF800000EFD /* App Privacy - iOS 13 API Deltas.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 8110D1972C3CECF800000EFD /* App Privacy - iOS 13 API Deltas.xcprivacy */; };
-		8110D19A2C3CEDC000000EFD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8110D1992C3CEDC000000EFD /* GoogleService-Info.plist */; };
 		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 */; };
@@ -233,6 +232,7 @@
 		8810F5AB2C045FD600346FD4 /* ToolStripePayment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5AA2C045FD600346FD4 /* ToolStripePayment.swift */; };
 		88484D262C4132AB007C3293 /* ASJumpHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 88484D252C4132AB007C3293 /* ASJumpHandler.m */; };
 		88484D292C4606DD007C3293 /* AppDelegate+PushNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 88484D282C4606DD007C3293 /* AppDelegate+PushNotification.m */; };
+		88484D2B2C48C8E5007C3293 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 88484D2A2C48C8E5007C3293 /* GoogleService-Info.plist */; };
 		88516B6E2C12E51600F2E396 /* ASLoginBindingC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88516B6D2C12E51600F2E396 /* ASLoginBindingC.m */; };
 		88C9F9202C3FC64400B47ADA /* ASPushOneSignalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C9F91F2C3FC64400B47ADA /* ASPushOneSignalManager.m */; };
 		8C24ECE114420CDEE7B9B22B /* Pods_Asteria.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54DCE8001991D89B696E7D44 /* Pods_Asteria.framework */; };
@@ -390,7 +390,6 @@
 		81056D5B2B60F571009219A3 /* ASHelpListUrlModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASHelpListUrlModel.m; sourceTree = "<group>"; };
 		8110D1962C3CECF800000EFD /* NotificationServiceExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = NotificationServiceExtension.entitlements; sourceTree = "<group>"; };
 		8110D1972C3CECF800000EFD /* App Privacy - iOS 13 API Deltas.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "App Privacy - iOS 13 API Deltas.xcprivacy"; sourceTree = "<group>"; };
-		8110D1992C3CEDC000000EFD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; 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>"; };
@@ -821,6 +820,7 @@
 		88484D252C4132AB007C3293 /* ASJumpHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASJumpHandler.m; sourceTree = "<group>"; };
 		88484D272C4606DD007C3293 /* AppDelegate+PushNotification.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+PushNotification.h"; sourceTree = "<group>"; };
 		88484D282C4606DD007C3293 /* AppDelegate+PushNotification.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+PushNotification.m"; sourceTree = "<group>"; };
+		88484D2A2C48C8E5007C3293 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		88516B6C2C12E51600F2E396 /* ASLoginBindingC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLoginBindingC.h; sourceTree = "<group>"; };
 		88516B6D2C12E51600F2E396 /* ASLoginBindingC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASLoginBindingC.m; sourceTree = "<group>"; };
 		88C9F91E2C3FC64400B47ADA /* ASPushOneSignalManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASPushOneSignalManager.h; sourceTree = "<group>"; };
@@ -1561,7 +1561,7 @@
 				817244A929F3B2EE005FA9C9 /* Assets.xcassets */,
 				817244AB29F3B2EE005FA9C9 /* LaunchScreen.storyboard */,
 				817244AE29F3B2EE005FA9C9 /* Info.plist */,
-				8110D1992C3CEDC000000EFD /* GoogleService-Info.plist */,
+				88484D2A2C48C8E5007C3293 /* GoogleService-Info.plist */,
 				817244AF29F3B2EE005FA9C9 /* main.m */,
 			);
 			path = Asteria;
@@ -2818,7 +2818,7 @@
 				814F5D0E2A11B76F003847A9 /* Roboto-BlackItalic.ttf in Resources */,
 				9A3F5CB22B3BF63A00DDB6A7 /* Goods.xcassets in Resources */,
 				814F5D072A11B76F003847A9 /* Roboto-Regular.ttf in Resources */,
-				8110D19A2C3CEDC000000EFD /* GoogleService-Info.plist in Resources */,
+				88484D2B2C48C8E5007C3293 /* GoogleService-Info.plist in Resources */,
 				817244AD29F3B2EE005FA9C9 /* LaunchScreen.storyboard in Resources */,
 				9AD6A53E2A120CC3001DE3D9 /* Login.xcassets in Resources */,
 				814F5D0D2A11B76F003847A9 /* LICENSE.txt in Resources */,

Asteria/AppDelegate.m

@@ -16,6 +16,8 @@
 
 #import "AppDelegate+PushNotification.h"
 
+#import <FirebaseCore/FirebaseCore.h>
+
 @import Stripe;
 
 @interface AppDelegate ()<UNUserNotificationCenterDelegate>
@@ -56,6 +58,8 @@
     // 注册 FacebookAppID
     [[FBSDKSettings sharedSettings] setAppID:Facebook_AppID];
     
+    [FIRApp configure];
+    
     //推送相关配置
     if (ASUserInfoManager.shared.isLogin ) {
         [ASUserInfoManager.shared getInfo:^{

Asteria/Fuction/Cart/Cart_CheckoutC.m

@@ -540,6 +540,11 @@
 //下单
 -(void)requestSureOrder{
     
+    if (!ASUserInfoManager.shared.isLogin) {
+        [Fuction_Tool pop_toLoginVC];
+        return;
+    }
+    
     self.bottomView.backView.userInteractionEnabled = NO;
     
     K_WEAK_SELF;

Asteria/Fuction/Cart/Cart_MyCartC.m

@@ -349,16 +349,20 @@
         if(itemM.isGift){
             return;
         }
-//        UIViewController *viewController = [[CTMediator sharedInstance] Goods_GoodsDetailsC:@{@"entity_id":itemM.product_id}];
-//        [self.navigationController pushViewController:viewController animated:YES];
+        UIViewController *viewController = [[CTMediator sharedInstance] Goods_GoodsDetailsC:@{@"entity_id":itemM.product_id}];
+        [self.navigationController pushViewController:viewController animated:YES];
         
-        ASGoodsDetailsViewController *goodsVC = [[ASGoodsDetailsViewController alloc] init];
-        goodsVC.entity_id = itemM.product_id;
-        [self.navigationController pushViewController:goodsVC animated:YES];
+//        ASGoodsDetailsViewController *goodsVC = [[ASGoodsDetailsViewController alloc] init];
+//        goodsVC.entity_id = itemM.product_id;
+//        [self.navigationController pushViewController:goodsVC animated:YES];
     }
 }
 
 -(void)handle_postEvent:(UIButton *)btn{
+    if (!ASUserInfoManager.shared.isLogin) {
+        [Fuction_Tool pop_toLoginVC];
+        return;
+    }
     Cart_CheckoutC *vc = [[Cart_CheckoutC alloc]init];
     vc.totalsM = self.totalsM;
     [[Current_normalTool topViewController].navigationController pushViewController:vc animated:YES];

Asteria/Fuction/Cart/Checkout/ASCheckoutShipMethodCell.m

@@ -139,9 +139,8 @@
         [self.shipMethodLab mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(10);
             make.right.mas_equalTo(self.shipPriceLab.mas_left).offset(-8);
-            make.centerY.mas_equalTo(self);
+            make.centerY.equalTo(self);
             make.height.mas_equalTo(18);
-            make.bottom.mas_equalTo(-20);
         }];
     }
     return self;

Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.m

@@ -213,26 +213,6 @@ static ASCheckoutPayManager *_instance = nil;
             self.payFinishBlock(self.payType, 0, @{@"msg":@""});
         }
     }];
-    
-    
-//    [ASNetTools.shared postWithPath:Chectout_Verify_PayToken param:params success:^(id _Nonnull json) {
-//        K_STRONG_SELF;
-//        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
-//        
-//        
-//        NSDictionary *payReturnDic = (NSDictionary *)json;
-//        NSString *orderid = [payReturnDic objectForKey:@"id"];
-//        if (self.payFinishBlock) {
-//            self.payFinishBlock(self.payType, 1, @{@"orderid":orderid});
-//        }
-//        
-//    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
-//        K_STRONG_SELF;
-//        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
-//        if (self.payFinishBlock) {
-//            self.payFinishBlock(self.payType, 0, @{@"msg":msg});
-//        }
-//    }];
 }
 
 #pragma mark ----- klarna支付验证 -----

Asteria/Fuction/Manager/NotificationManager/ASJumpHandler.m

@@ -144,7 +144,8 @@ static  ASJumpHandler *jumpHandler = nil;
                 [Fuction_Tool pop_toLoginVC];
                 return;
             }
-            [self to_checkInVc];
+            //跳转我的
+            [Fuction_Tool popToRootViewController:3];
         }
             break;
         case 14:// 首页
@@ -256,11 +257,5 @@ static  ASJumpHandler *jumpHandler = nil;
     [[Current_normalTool topViewController].navigationController pushViewController:vc animated:true];
 }
 
-- (void)to_checkInVc {
-//    WK_CheckPointsC *vc = [[WK_CheckPointsC alloc] init];
-//    KWLoginedUserModel *m = [KWLoginedManager.shareInstance getCurrentLoginedUser];
-//    vc.points = m.points;
-//    [[Current_normalTool topViewController].navigationController pushViewController:vc animated:true];
-}
 
 @end

Asteria/Fuction/UserCenter/Address/ASAddressViewModel.m

@@ -46,14 +46,38 @@
         NSArray *list = json;
         NSMutableArray *arr = [KWCountryAddressModel mj_objectArrayWithKeyValuesArray:list];
         NSMutableArray *result = [NSMutableArray array];
+        
+        NSMutableArray *keysArr = [[NSMutableArray alloc] initWithCapacity:1];
         for (KWCountryAddressModel *m in arr) {
             if (m.full_name_english == nil || m.full_name_english.isEmpty) {
                 continue;
             }
+            
+            [keysArr addObject:m.full_name_english];
             [result addObject:m];
         }
-        self.countryArr = result;
+        
+        NSArray *sortedArray = [keysArr sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2){
+            return [obj1 compare:obj2 options:NSNumericSearch];
+        }];
+        
+        NSMutableArray *sortArray = [[NSMutableArray alloc] initWithCapacity:1];
+        
+        for (int i = 0; i < sortedArray.count; i++) {
+            NSString *sortStr = [sortedArray objectAtIndex:i];
+            
+            for (KWCountryAddressModel *m in result) {
+                if ([m.full_name_english isEqualToString:sortStr]) {
+                    [sortArray addObject:m];
+                    [result removeObject:m];
+                    break;
+                }
+            }
+        }
+        self.countryArr = sortArray;
+       
         success();
+        
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         self.countryArr = [NSMutableArray array];
         success();

Asteria/Fuction/UserCenter/UserCenterHome/ASUserCenterViewController.m

@@ -53,9 +53,15 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [self setData];
-    [self getSignInfoData];
-    [self getOrders];
+    
+    if (ASUserInfoManager.shared.isLogin) {
+        [self setData];
+        [self getSignInfoData];
+        [self getOrders];
+    } else {
+        [Fuction_Tool pop_toLoginVC];
+    }
+    
 }
 
 // MARK: - setData

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

@@ -30,19 +30,18 @@
     [self addSubview:self.signV];
     [self addSubview:self.itemsV];
     [self.topV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.leading.trailing.equalTo(self);
-        make.height.equalTo(@226);
+        make.top.left.right.mas_equalTo(0);
+        make.height.mas_equalTo(226);
     }];
     [self.signV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.topV.mas_bottom);
-        make.leading.trailing.equalTo(self);
-        make.height.equalTo(@183);
+        make.top.mas_equalTo(self.topV.mas_bottom);
+        make.left.right.mas_equalTo(0);
+        make.height.mas_equalTo(183);
     }];
     [self.itemsV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.signV.mas_bottom);
-        make.leading.trailing.equalTo(self);
-        make.height.equalTo(@219);
-        make.bottom.equalTo(self);
+        make.left.right.bottom.mas_equalTo(0);
+        make.height.mas_equalTo(219);
     }];
     
 }

Asteria/Fuction/UserCenter/VipCenter/ASVipCenterViewController.m

@@ -220,16 +220,16 @@
             if (tempM.type.integerValue == 1) { // 优惠券
                 ASVipCouponsViewController *vc = [ASVipCouponsViewController new];
                 vc.level = vipM.level;
-                [self.navigationController pushViewController:vc animated:true];
+                [weakSelf.navigationController pushViewController:vc animated:true];
             } else if (tempM.type.integerValue == 2) { // 生日
                 if (ASUserInfoManager.shared.birthStatus.integerValue == -1) {
                     ASInfomationSetController *vc = [ASInfomationSetController new];
-                    [self.navigationController pushViewController:vc animated:true];
+                    [weakSelf.navigationController pushViewController:vc animated:true];
                     return;
                 }
                 ASBirthdayTreatViewController *vc = [ASBirthdayTreatViewController new];
                 vc.isBirthday = ASUserInfoManager.shared.birthStatus.integerValue == 2;
-                [self.navigationController pushViewController:vc animated:true];
+                [weakSelf.navigationController pushViewController:vc animated:true];
             }
         };
         [self.bottomVArr addObject:v];

Asteria/GoogleService-Info.plist

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>594754156247-kr2fsqoh1pcfvru597lg9slat2enfitf.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.594754156247-kr2fsqoh1pcfvru597lg9slat2enfitf</string>
-	<key>API_KEY</key>
-	<string>AIzaSyB5uLVHDIl3mWUt3OjmvPitH9xGDjkGTIw</string>
-	<key>GCM_SENDER_ID</key>
-	<string>594754156247</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.hcb.westkiss</string>
-	<key>PROJECT_ID</key>
-	<string>westkiss-app-79a3a</string>
-	<key>STORAGE_BUCKET</key>
-	<string>westkiss-app-79a3a.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false/>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false/>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true/>
-	<key>IS_GCM_ENABLED</key>
-	<true/>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true/>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:594754156247:ios:b4029713212399bba76292</string>
-</dict>
-</plist>

Asteria/NetTools/ASNetTools.m

@@ -120,6 +120,8 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -188,6 +190,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -245,6 +248,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -307,6 +311,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -369,6 +374,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -430,6 +436,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -498,6 +505,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -558,6 +566,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -620,6 +629,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }
@@ -681,6 +691,7 @@
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];
                     [weakSelf updateEngine];
+                    msg = @"Login is invalid, please login again!";
                     faild(status, msg);
                     return;
                 }

Podfile

@@ -46,7 +46,7 @@ target 'Asteria' do
   pod 'Reachability'
   pod 'CTMediator'
 
-pod 'FBSDKLoginKit' , '14.1.0'
+  pod 'FBSDKLoginKit' , '14.1.0'
   
   pod 'GoogleSignIn', '7.0.0'
 
@@ -72,23 +72,23 @@ pod 'FBSDKLoginKit' , '14.1.0'
   pod 'StripePaymentsUI'
   pod 'StripeApplePay'
   
-#  pod 'PayPal-iOS-SDK'
-
-pod 'OneSignalXCFramework', '>= 3.0.0', '< 4.0'
-
-# 数据分析
-# Add the Firebase pod for Google Analytics
-pod 'FirebaseAnalytics'
-# Google 地点自动补齐
-pod 'GooglePlaces'
-
-# For Analytics without IDFA collection capability, use this pod instead
-# pod ‘Firebase/AnalyticsWithoutAdIdSupport’
-
-# Add the pods for any other Firebase products you want to use in your app
-# For example, to use Firebase Authentication and Cloud Firestore
-pod 'FirebaseCore'#, :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'master'
-pod 'FirebaseFirestore'#, :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'master'
+  #  pod 'PayPal-iOS-SDK'
+  
+  pod 'OneSignalXCFramework', '>= 3.0.0', '< 4.0'
+  
+  # 数据分析
+  # Add the Firebase pod for Google Analytics
+  pod 'FirebaseAnalytics'
+  # Google 地点自动补齐
+  pod 'GooglePlaces'
+  
+  # For Analytics without IDFA collection capability, use this pod instead
+  # pod ‘Firebase/AnalyticsWithoutAdIdSupport’
+  
+  # Add the pods for any other Firebase products you want to use in your app
+  # For example, to use Firebase Authentication and Cloud Firestore
+  pod 'FirebaseCore'#, :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'master'
+  pod 'FirebaseFirestore'#, :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'master'
 
   target 'NotificationServiceExtension' do #'OneSignalNotificationServiceExtension' do
     # Comment the next line if you don't want to use dynamic frameworks