no message

ZhiJi/AppDelegate.m

@@ -54,7 +54,7 @@
     self.window.backgroundColor = [UIColor whiteColor];
     self.window.rootViewController = [UIViewController new];
 //    guide setting
-    [ZJGuideConfig configWithWindow:self.window finishMainVC:[BaseTabBarViewController new]];
+//    [ZJGuideConfig configWithWindow:self.window finishMainVC:[BaseTabBarViewController new]];
 
     [self.window makeKeyAndVisible];
 

ZhiJi/Classes/Care/View/ZJXiaoXiTableViewCell.m

@@ -111,7 +111,7 @@
     [self.tongYiButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(self.contentView.mas_right).mas_offset(KScaleWidth(-14));
         make.centerY.equalTo(self.contentView).mas_offset(KScaleWidth(0));
-        make.size.mas_offset(CGSizeMake(KScaleWidth(64), KScaleWidth(27)));
+        make.size.mas_offset(CGSizeMake(KScaleWidth(72), KScaleWidth(27)));
     }];
     self.tongYiButton.layer.cornerRadius = KScaleWidth(13.5);
     self.tongYiButton.layer.masksToBounds = YES;
@@ -143,7 +143,7 @@
             self.tongYiButton.layer.borderColor = [UIColor colorWithHex:0xAAAAAA].CGColor;
             break;
         case 2:
-            [self.tongYiButton setTitle:@"已同意" forState:0];
+            [self.tongYiButton setTitle:kLocalizedString(@"message_complete") forState:0];
             [self.tongYiButton setTitleColor:[UIColor colorWithHex:0xAAAAAA] forState:0];
             self.tongYiButton.enabled = NO;
             self.tongYiButton.layer.borderColor = [UIColor colorWithHex:0xAAAAAA].CGColor;

ZhiJi/Classes/Care/View/ZJXiaoxiView.m

@@ -118,9 +118,17 @@
     [_juJueButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(_jieSouButton.mas_bottom).mas_offset(KScaleWidth(17));
         make.centerX.equalTo(_beiJingView);
-        make.size.mas_offset(CGSizeMake(KScaleWidth(50.5), KScaleWidth(15)));
+        make.size.mas_offset(CGSizeMake(KScaleWidth(300), KScaleWidth(15)));
     }];
+    _juJueButton.titleLabel.adjustsFontSizeToFitWidth = YES;
     [_juJueButton addTarget:self action:@selector(juJueButtonClick) forControlEvents:UIControlEventTouchUpInside];
+    
+    [_beiJingView mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_offset(KScaleWidth(302));
+        make.centerX.equalTo(self);
+        make.centerY.equalTo(self);
+        make.bottom.mas_equalTo(_juJueButton.mas_bottom).mas_offset(KScaleWidth(20));
+    }];
 }
 
 - (void)xButtonClick{

ZhiJi/Classes/Login/Controller/ZJAreaCodeSearchVC.m

@@ -13,12 +13,16 @@
 #import "ZYPinYinSearch.h"
 #import "ZJUserInfoManager.h"
 #import "UIImageView+WebCache.h"
+#import "UIImage+Extension.h"
 
-@interface ZJAreaCodeSearchVC ()<UITableViewDataSource,UITableViewDelegate,UISearchBarDelegate,UISearchDisplayDelegate>{
+@interface ZJAreaCodeSearchVC ()<UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate, UISearchDisplayDelegate>{
      BOOL isShow;
 }
 
 @property (strong, nonatomic) UITableView * tableView;
+
+@property (strong, nonatomic) UIView * footerView;
+
 @property (strong, nonatomic) NSMutableArray * dataSourceArr;/**<排序前的整个数据源*/
 
 @property (strong, nonatomic) NSDictionary * allDataSource;/**<排序后的整个数据源*/
@@ -71,11 +75,11 @@
     _tableView.delegate = self;
     _tableView.rowHeight = UITableViewAutomaticDimension;
     _tableView.estimatedRowHeight = 44;
-    _tableView.tableFooterView = [UIView new];
     [_tableView registerNib: [UINib nibWithNibName:@"ZJAreaCodeCell" bundle:nil] forCellReuseIdentifier:@"ZJAreaCodeCell"];
     [self.view addSubview:_tableView];
     
     [_tableView setTableHeaderView:[self searchView]];
+    _tableView.tableFooterView = self.footerView;
 }
 
 - (UIView *)searchView{
@@ -83,15 +87,15 @@
     UIView * searchBgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 76)];
     searchBgView.backgroundColor = kColorWithRGB(252, 252, 252);
     
-    UISearchBar * searchBar  = [[UISearchBar alloc]initWithFrame:CGRectMake(13, 16, KScreenWidth-26, 44)];
+    UISearchBar * searchBar  = [[UISearchBar alloc]initWithFrame:CGRectMake(13, 0, KScreenWidth-26, 76)];
     searchBar.delegate = self;
-    searchBar.backgroundColor = [UIColor clearColor];
-//    searchBar.showsCancelButton = NO;
     searchBar.tintColor = kColorWithRGB(153, 153, 153);
     searchBar.placeholder = kLocalizedString(@"area_search");
     searchBar.showsCancelButton = YES;
-//    [searchBar setShowsCancelButton:YES animated:YES];
-    
+    //设置背景色
+    [searchBar setBackgroundColor:[UIColor clearColor]];
+    //设置文本框背景
+
     if ([[[UIDevice currentDevice]systemVersion]floatValue] >= 9.0) {
         [[UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UISearchBar class]]] setTitle:kLocalizedString(@"alert_cancel")];
         [[UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UISearchBar class]]] setTitleTextAttributes:@{NSForegroundColorAttributeName : kMassColor} forState:UIControlStateNormal];
@@ -99,30 +103,41 @@
         [[UIBarButtonItem appearanceWhenContainedIn:[UISearchBar class], nil] setTitle:kLocalizedString(@"alert_cancel")];
         [[UIBarButtonItem appearanceWhenContainedIn:[UISearchBar class], nil] setTitleTextAttributes:@{NSForegroundColorAttributeName : kMassColor} forState:UIControlStateNormal];
     }
-
-    for (UIView *subView in searchBar.subviews) {
-        if ([subView isKindOfClass:[UIView class]]) {
-            if (@available(iOS 13.0, *)) {
-                [subView.subviews objectAtIndex:0].hidden = YES;
-            } else {
-                [[subView.subviews objectAtIndex:0] removeFromSuperview];
-            }
-            if ([[subView.subviews objectAtIndex:0] isKindOfClass:[UITextField class]]) {
-                UITextField *textField = [subView.subviews objectAtIndex:0];
-                textField.backgroundColor = [UIColor colorWithRed:252/255.0 green:252/255.0 blue:252/255.0 alpha:1];
-//                textField.layer.borderColor = kColorWithRGB(218, 218, 218).CGColor;
-//                textField.layer.borderWidth = 1;
-//                textField.layer.cornerRadius = 5;
-//                textField.layer.masksToBounds = YES;
-                //设置默认文字颜色
-                UIColor *color = [UIColor grayColor];
-                [textField setAttributedPlaceholder:[[NSAttributedString alloc] initWithString:kLocalizedString(@"area_search") attributes:@{NSForegroundColorAttributeName:color, NSFontAttributeName : [UIFont systemFontOfSize:14]}]];
-                //修改默认的放大镜图片
-                UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
-                imageView.backgroundColor = textField.backgroundColor;
-//                imageView.image = [UIImage imageNamed:@"gww_search_misplaces"];
-                textField.leftView = imageView;
-                textField.leftViewMode = UITextFieldViewModeNever;
+    
+    if (@available(iOS 13.0, *)) {
+        UITextField *searchField = searchBar.searchTextField;
+        searchField.backgroundColor = [UIColor whiteColor];
+        
+        searchField.layer.borderColor = kColorWithRGB(218, 218, 218).CGColor;
+        searchField.layer.borderWidth = 1;
+        searchField.layer.cornerRadius = 5;
+        searchField.layer.masksToBounds = YES;
+    } else {
+        for (UIView *subView in searchBar.subviews) {
+            if ([subView isKindOfClass:[UIView class]]) {
+                if (@available(iOS 13.0, *)) {
+                    [subView.subviews objectAtIndex:0].hidden = YES;
+                } else {
+                    [[subView.subviews objectAtIndex:0] removeFromSuperview];
+                }
+                if ([[subView.subviews objectAtIndex:0] isKindOfClass:[UITextField class]]) {
+                    UITextField *textField = [subView.subviews objectAtIndex:0];
+                    //                textField.backgroundColor = [UIColor colorWithRed:252/255.0 green:252/255.0 blue:252/255.0 alpha:1];
+                    textField.backgroundColor = [UIColor whiteColor];
+                    textField.layer.borderColor = kColorWithRGB(218, 218, 218).CGColor;
+                    textField.layer.borderWidth = 1;
+                    textField.layer.cornerRadius = 5;
+                    textField.layer.masksToBounds = YES;
+                    //设置默认文字颜色
+                    UIColor *color = [UIColor grayColor];
+                    [textField setAttributedPlaceholder:[[NSAttributedString alloc] initWithString:kLocalizedString(@"area_search") attributes:@{NSForegroundColorAttributeName:color, NSFontAttributeName : [UIFont systemFontOfSize:14]}]];
+                    //修改默认的放大镜图片
+                    UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
+                    imageView.backgroundColor = textField.backgroundColor;
+                    //                imageView.image = [UIImage imageNamed:@"gww_search_misplaces"];
+                    textField.leftView = imageView;
+                    textField.leftViewMode = UITextFieldViewModeNever;
+                }
             }
         }
     }
@@ -131,6 +146,22 @@
     return searchBgView;
 }
 
+- (UIView *)footerView{
+    if (!_footerView) {
+        _footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 36)];
+        UILabel * hintLab = [[UILabel alloc] init];
+        hintLab.text = kLocalizedString(@"area_no_data");
+        hintLab.textAlignment = NSTextAlignmentCenter;
+        hintLab.textColor = kColorWithRGB(153, 153, 153);
+        hintLab.font = [UIFont systemFontOfSize:16];
+        [_footerView addSubview:hintLab];
+        [hintLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.bottom.mas_equalTo(_footerView);
+        }];
+    }
+    return _footerView;
+}
+
 #pragma mark - UITableViewDataSource
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     if (isShow) {
@@ -145,6 +176,7 @@
         NSArray *value = [_allDataSource objectForKey:_indexDataSource[section]];
         return value.count;
     }else {
+        _footerView.hidden = _searchDataSource.count != 0;
         return _searchDataSource.count;
     }
 }

ZhiJi/Classes/Map/Controller/ZJBaseMapViewController.m

@@ -231,6 +231,10 @@
 #pragma mark 获取最后一次位置
 - (void)getLastLocation:(ZJFriendModel *)model{
 
+    if (![ZJUserInfoManager shared].isMember) {
+        return;
+    }
+    
     __weak typeof(self) _self = self;
     NSString *uid = model.friendUid;
     if (uid.length <= 0) {

ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m

@@ -415,7 +415,7 @@
 - (void)getLastLocation:(ZJFriendModel *)model{
     
     NSLog(@"%@", [ZJUserInfoManager shared].uid);
-    if ([ZJUserInfoManager shared].uid.length <= 0) {
+    if ([ZJUserInfoManager shared].uid.length <= 0 || ![ZJUserInfoManager shared].isMember) {
         ///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
         self.mapView.showsUserLocation = YES;
         self.mapView.userTrackingMode = MAUserTrackingModeFollow;

ZhiJi/Classes/Mine/View/ZJMineHeaderView.m

@@ -184,7 +184,7 @@
     if (isLogin) {
         if (Member) {
             _gongNengLabel.text = kLocalizedString(@"mine_unlocked");
-            _timeLabel.text = @"终身免费使用";
+            _timeLabel.text = kLocalizedString(@"mine_free_used");
 //            _xuFeiButton.hidden = YES;
         }else{
             _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");

ZhiJi/Classes/Tools/Guide/ZJGuideConfig.m

@@ -22,6 +22,8 @@
 
 @property (nonatomic, strong) UIViewController * finishMainVC;
 
+@property (nonatomic, strong) UIWindow * currentWindow;
+
 @end
 
 #define kAPP_Version @"app_version"
@@ -47,11 +49,14 @@
 + (void)configWithWindow:(UIWindow *)window finishMainVC:(UIViewController *)finishMainVC{
 
     ZJGuideConfig * config = [ZJGuideConfig shared];
-    [config fakeLaunchScreenWithWindow:window finishMainVC:finishMainVC];
+    if (!config.currentWindow) {
+        [config fakeLaunchScreenWithWindow:window finishMainVC:finishMainVC];
+    }
 //    [config checkVersionWithWindow:window finishMainVC:finishMainVC];
 }
 
 - (void)fakeLaunchScreenWithWindow:(UIWindow *)window finishMainVC:(UIViewController *)finishMainVC{
+    self.currentWindow = window;
     self.launchScreen = [[UINib nibWithNibName:@"LaunchScreenPlaceHolderView" bundle:nil] instantiateWithOwner:self options:nil].firstObject;
     [window addSubview:self.launchScreen];
     [self.launchScreen mas_makeConstraints:^(MASConstraintMaker *make) {

ZhiJi/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<string>en</string>
 	<key>CFBundleDisplayName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleExecutable</key>

ZhiJi/en.lproj/Localizable.strings

@@ -61,6 +61,7 @@ appName = "Family Mapp";
 "area_search"="Search countries or areas";
 
 "login_sms_code"="Please enter the SMS verification code";
+"area_no_data"="No result";
 
 //care
 "care_find_now"="Find now";
@@ -156,6 +157,8 @@ appName = "Family Mapp";
 "myself"="Myself";
 "myself_style2"="Myself";
 
+"mine_free_used"="Free use";
+
 //setting
 "setting"="Settings";
 "setting_version"="Version checking";

ZhiJi/zh-Hans.lproj/Localizable.strings

@@ -60,6 +60,7 @@ appName = "Family Mapp";
 
 "area"="区域";
 "area_search"="搜索国家或区域";
+"area_no_data"="无数据";
 
 //care
 "care_find_now"="立即查看";
@@ -154,6 +155,8 @@ appName = "Family Mapp";
 "myself"="自己";
 "myself_style2"="我自己";
 
+"mine_free_used"="终身免费使用";
+
 //setting
 "setting"="设置";
 "setting_version"="版本检测";