Fix

JohnWong · Jun 26, 2024 · eda2d67 · eda2d67
1 parent 1689a75
commit eda2d67
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/BusRider.xcodeproj/project.pbxproj b/BusRider.xcodeproj/project.pbxproj
@@ -1339,9 +1339,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				JW_BUILD = 22;
-				JW_VERSION = 3.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				JW_BUILD = 31;
+				JW_VERSION = 3.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1382,9 +1382,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				JW_BUILD = 22;
-				JW_VERSION = 3.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				JW_BUILD = 31;
+				JW_VERSION = 3.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

diff --git a/BusRider/Controller/JWBusLineViewController.m b/BusRider/Controller/JWBusLineViewController.m
@@ -138,7 +138,7 @@ - (void)updateViews
     self.titleLabel.text = [NSString stringWithFormat:@"%@(%@-%@)", lineItem.lineNumber, lineItem.from, lineItem.to];
     self.firstTimeLabel.text = lineItem.firstTime;
     self.lastTimeLabel.text = lineItem.lastTime;
-    self.lineAssist.text = lineItem.hasInfo ? @"" : @"未开通实时信息";
+    self.lineAssist.text = lineItem.assistDesc;
 
     NSInteger count = self.busLineItem ? self.busLineItem.stopItems.count : 0;
     self.contentHeightConstraint.constant = count * kJWButtonHeight;

diff --git a/BusRider/Controller/JWMainViewController.m b/BusRider/Controller/JWMainViewController.m
@@ -96,6 +96,7 @@ - (void)viewDidLoad
 //    self.searchController.searchResultsUpdater = self;
     self.searchController.searchBar.delegate = self;
     self.navigationItem.searchController = self.searchController;
+    [self.searchController setActive:true];
 
 //    [self.searchController.searchResultsTableView registerNib:[UINib nibWithNibName:@"JWSearchTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:JWCellIdSearch];
     self.tableView.backgroundColor = HEXCOLOR(0xefeff6);

diff --git a/Common/Item/BusLine/JWLineItem.h b/Common/Item/BusLine/JWLineItem.h
@@ -44,5 +44,5 @@
 /**
   * 是否有实时信息
  */
-@property (nonatomic, assign) BOOL hasInfo;
+@property (nonatomic, strong) NSString *assistDesc;
 @end
diff --git a/Common/Item/BusLine/JWLineItem.m b/Common/Item/BusLine/JWLineItem.m
@@ -21,7 +21,7 @@ - (void)setFromDictionary:(NSDictionary *)dict
     self.to = lineDict[@"endSn"];
     self.firstTime = lineDict[@"firstTime"];
     self.lastTime = lineDict[@"lastTime"];
-    self.hasInfo = [lineDict[@"hasBusInfo"] boolValue];
+    self.assistDesc = lineDict[@"assistDesc"];
 
     NSArray *otherLines = dict[@"otherlines"];
     if (otherLines.count == 1) {