fix

ZhiJi.xcodeproj/project.pbxproj

@@ -439,7 +439,6 @@
 		A95F5CC42490A37F001DB97E /* UILabel+FontAppearance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+FontAppearance.h"; sourceTree = "<group>"; };
 		A95F5CC52490A37F001DB97E /* UILabel+FontAppearance.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+FontAppearance.m"; sourceTree = "<group>"; };
 		A9619E5124A8B3E4009A2012 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		A9619E5324A8B3FF009A2012 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
 		A9619E5424A8B3FF009A2012 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		A9619E5924A8B445009A2012 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		A9619E5B24A8B446009A2012 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -1599,7 +1598,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				686A7CA62487644800C7200C /* Base */,
-				A9619E5324A8B3FF009A2012 /* zh-Hans */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";

ZhiJi/AppDelegate.m

@@ -32,6 +32,7 @@
     [self initializeIQKeyboardManager];
 //    501f8a894329f4b57bbfee208a11676f
     [AMapServices sharedServices].apiKey = @"31b57777dd1b5f65e45c1dab247e3950";
+    [AMapServices sharedServices].enableHTTPS = YES;
     
     [[FBSDKApplicationDelegate sharedInstance] application:application
     didFinishLaunchingWithOptions:launchOptions];
@@ -44,10 +45,6 @@
     
     [self observationNetwork];
 
-//    AMapServices.sharedServices.apiKey = @"XXX";
-//    ///地图需要v4.5.0及以上版本才必须要打开此选项（v4.5.0以下版本，需要手动配置info.plist）
-//    [AMapServices sharedServices].enableHTTPS = YES;
-    
     [self logCollection];
     
     self.window = [[UIWindow alloc] init];

ZhiJi/Classes/Care/Controller/ZJCareStyle2ViewController.m

@@ -56,15 +56,25 @@
         make.size.mas_offset(CGSizeMake(KScaleWidth(10), KScaleWidth(12)));
     }];
     
-    UIButton * trackBtn = [[UIButton alloc] initWithframe:CGRectMake(0, 0, 188, KScaleWidth(14)) setImage:@"care_style2_table_header_arrow" title:kLocalizedString(@"track_mine") titleFont:[UIFont systemFontOfSize:KFont(14)] titleColor:kColorWithRGB(34, 34, 34) backgroundColor:[UIColor clearColor] imageLeft:NO interval:KScaleWidth(10) target:self action:@selector(myTrack)];
-    
+//    UIButton * trackBtn = [[UIButton alloc] initWithframe:CGRectMake(0, 0, 188, KScaleWidth(14)) setImage:@"care_style2_table_header_arrow" title:kLocalizedString(@"track_mine") titleFont:[UIFont systemFontOfSize:KFont(14)] titleColor:kColorWithRGB(34, 34, 34) backgroundColor:[UIColor clearColor] imageLeft:NO interval:KScaleWidth(10) target:self action:@selector(myTrack)];
+    UIButton * trackBtn = [[UIButton alloc] init];
+    [trackBtn setTitle:kLocalizedString(@"track_mine") forState:(UIControlStateNormal)];
+    [trackBtn setTitleColor:kColorWithRGB(34, 34, 34) forState:UIControlStateNormal];
+    [trackBtn addTarget:self action:@selector(myTrack) forControlEvents:(UIControlEventTouchUpInside)];
+    trackBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(14)];
     [self.view addSubview:trackBtn];
     [trackBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(locationIV.mas_right);
+        make.left.mas_equalTo(locationIV.mas_right).mas_offset(KScaleWidth(8));
         make.centerY.mas_equalTo(self.xiaoXiButton);
-        make.size.mas_offset(CGSizeMake(188, KScaleWidth(14)));
+        make.height.mas_equalTo(KScaleWidth(16));
     }];
     
+    UIImageView * arrowImV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"care_style2_table_header_arrow"]];
+    [self.view addSubview:arrowImV];
+    [arrowImV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(trackBtn.mas_right).mas_offset(KScaleWidth(8));
+        make.centerY.mas_equalTo(self.xiaoXiButton);
+    }];
     //MemberTabView
     self.memberTableView = [[ZJBasetableView alloc] initWithFrame:CGRectZero];
     [self.view addSubview:self.memberTableView];

ZhiJi/Classes/Map/View/ZJMapTrackDatePickerView.m

@@ -27,12 +27,13 @@
     self.selectedDate = [NSDate date];
     
     // 设置DatePickView显示中文
-    NSLocale *locale = [[NSLocale alloc]initWithLocaleIdentifier:@"zh_CN"];
+//    NSLocale *locale = [[NSLocale alloc]initWithLocaleIdentifier:@"zh_CN"];
+    NSLocale * locale = [NSLocale currentLocale];
     self.datePickerView.locale = locale;
 
     self.datePickerTitleLabel.text = kLocalizedString(@"track_start_time");
-    [_confirmBtn setTitle:kLocalizedString(@"map_track_datepicker_commit") forState:(UIControlStateNormal)];
-    [_cancelBtn setTitle:kLocalizedString(@"map_track_datepicker_cancel") forState:(UIControlStateNormal)];
+    [_confirmBtn setImage:[UIImage imageNamed:kLocalizedString(@"map_track_datepicker_commit")] forState:(UIControlStateNormal)];
+    [_cancelBtn setImage:[UIImage imageNamed:kLocalizedString(@"map_track_datepicker_cancel")] forState:(UIControlStateNormal)];
 }
 
 - (IBAction)cancelAction:(UIButton *)sender {

ZhiJi/Classes/Map/View/ZJMapTrackDatePickerView.xib

@@ -29,14 +29,14 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Arv-7A-22x">
                             <rect key="frame" x="0.0" y="0.0" width="414" height="40"/>
                             <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MPF-Uk-amq">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MPF-Uk-amq">
                                     <rect key="frame" x="10" y="7" width="51" height="29"/>
                                     <state key="normal" backgroundImage="map_track_datepicker_cancel"/>
                                     <connections>
                                         <action selector="cancelAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="DmU-8T-kwO"/>
                                     </connections>
                                 </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qIk-wq-rm4">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qIk-wq-rm4">
                                     <rect key="frame" x="353" y="7" width="51" height="29"/>
                                     <state key="normal" backgroundImage="map_track_datepicker_commit"/>
                                     <connections>

ZhiJi/Classes/Tools/UserInfoManager/ZJUserInfoManager.m

@@ -294,7 +294,7 @@ static ZJUserInfoManager * manager;
         if (status == kCLAuthorizationStatusNotDetermined) {
             if ([[UIDevice currentDevice].systemVersion floatValue] >= 8){
                 locationManager = [[CLLocationManager alloc] init];
-                [locationManager requestAlwaysAuthorization];
+//                [locationManager requestAlwaysAuthorization];
                 [locationManager requestWhenInUseAuthorization];
             }
         } else if (kCLAuthorizationStatusDenied == status) {

ZhiJi/en.lproj/LaunchScreen.strings

+